Skip to content

Commit 5734b76

Browse files
author
Chanwit Kaewkasi
authored
Merge pull request #368 from weaveworks/release-v0.13.0-rc.2
prepare for v0.13.0-rc.2
2 parents 817e573 + 977f260 commit 5734b76

8 files changed

Lines changed: 42 additions & 20 deletions

File tree

‎charts/tf-controller/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: tf-controller
33
description: The Helm chart for Weave GitOps Terraform Controller
44
type: application
5-
version: 0.7.1
6-
appVersion: "v0.13.0-rc.1"
5+
version: 0.8.0
6+
appVersion: "v0.13.0-rc.2"

‎charts/tf-controller/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Weave GitOps Terraform Controller
22

3-
![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.13.0-rc.1](https://img.shields.io/badge/AppVersion-v0.13.0--rc.1-informational?style=flat-square)
3+
![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.13.0-rc.2](https://img.shields.io/badge/AppVersion-v0.13.0--rc.2-informational?style=flat-square)
44

55
The Helm chart for Weave GitOps Terraform Controller
66

@@ -52,7 +52,7 @@ __Note__: If you need to use the `imagePullSecrets` it would be best to set `ser
5252
| rbac.create | bool | `true` | If `true`, create and use RBAC resources |
5353
| replicaCount | int | `1` | Number of TF-Controller pods to deploy, more than one is not desirable. |
5454
| resources | object | `{"limits":{"cpu":"1000m","memory":"1Gi"},"requests":{"cpu":"200m","memory":"64Mi"}}` | Resource limits and requests |
55-
| runner | object | `{"creationTimeout":"5m0s","grpc":{"maxMessageSize":4},"image":{"repository":"ghcr.io/weaveworks/tf-runner","tag":"v0.13.0-rc.1"},"serviceAccount":{"annotations":{},"create":true,"name":""}}` | Runner-specific configurations |
55+
| runner | object | `{"creationTimeout":"5m0s","grpc":{"maxMessageSize":4},"image":{"repository":"ghcr.io/weaveworks/tf-runner","tag":"v0.13.0-rc.2"},"serviceAccount":{"annotations":{},"create":true,"name":""}}` | Runner-specific configurations |
5656
| runner.creationTimeout | string | `"5m0s"` | Timeout for runner-creation (Controller) |
5757
| runner.grpc.maxMessageSize | int | `4` | Maximum GRPC message size (Controller) |
5858
| runner.image.repository | string | `"ghcr.io/weaveworks/tf-runner"` | Runner image repository |

‎charts/tf-controller/templates/crds.yaml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3094,11 +3094,11 @@ spec:
30943094
forceUnlock:
30953095
default: "no"
30963096
description: "ForceUnlock a Terraform state if it has become locked
3097-
for any reason. \n This is an Enum and has the expected values
3098-
of: \n - auto - yes - no \n WARNING: Only use `auto` in the
3099-
cases where you are absolutely certain that no other system
3100-
is using this state, you could otherwise end up in a bad place
3101-
See https://www.terraform.io/language/state/locking#force-unlock
3097+
for any reason. Defaults to `no`. \n This is an Enum and has
3098+
the expected values of: \n - auto - yes - no \n WARNING: Only
3099+
use `auto` in the cases where you are absolutely certain that
3100+
no other system is using this state, you could otherwise end
3101+
up in a bad place See https://www.terraform.io/language/state/locking#force-unlock
31023102
for more information on the terraform state lock and force unlock."
31033103
enum:
31043104
- "yes"
@@ -3115,6 +3115,13 @@ spec:
31153115
force unlock the state."
31163116
type: string
31173117
type: object
3118+
values:
3119+
description: Values map to the Terraform variable "values", which
3120+
is an object of arbitrary values. It is a convenient way to pass
3121+
values to Terraform resources without having to define a variable
3122+
for each value. To use this feature, your Terraform file must define
3123+
the variable "values".
3124+
x-kubernetes-preserve-unknown-fields: true
31183125
vars:
31193126
description: List of input variables to set for the Terraform program.
31203127
items:

‎charts/tf-controller/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ image:
2727
pullPolicy: IfNotPresent
2828
# -- Overrides the image tag whose default is the chart appVersion.
2929
# @default -- `.Chart.AppVersion`
30-
tag: "v0.13.0-rc.1"
30+
tag: "v0.13.0-rc.2"
3131
# -- Controller image pull secret
3232
imagePullSecrets: []
3333
# -- Resource limits and requests
@@ -97,7 +97,7 @@ runner:
9797
repository: ghcr.io/weaveworks/tf-runner
9898
# -- Runner image tag
9999
# @default -- `.Chart.AppVersion`
100-
tag: "v0.13.0-rc.1"
100+
tag: "v0.13.0-rc.2"
101101
grpc:
102102
# -- Maximum GRPC message size (Controller)
103103
maxMessageSize: 4

‎config/manager/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ generatorOptions:
88
images:
99
- name: weaveworks/tf-controller
1010
newName: ghcr.io/weaveworks/tf-controller
11-
newTag: v0.13.0-rc.1
11+
newTag: v0.13.0-rc.2

‎docs/getting_started.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Getting Started
22

3+
## Preflight Checks
4+
5+
Before you begin, make sure you have the following installed:
6+
1. Flux v0.32.0 or later (not only the CLI, but also the controllers on the cluster). If you are not sure about the Flux version on your cluster, please re-bootstrap your cluster.
7+
2. TF-controller uses **the Controller/Runner architecture**. The Controller acts as a client, and talks to each Runner's Pod via gRPC. Please make sure
8+
1. Each Runner's Pod in each Namespace is allowed to open, and serve at port *30000* (the gRPC port of a Runner), and the Controller can connect to it.
9+
2. The Controller needs to download tar.gz BLOBs from the Flux's Source controller via port *80*.
10+
3. The Controller needs to post the events to the Flux's Notification controller via port *80*.
11+
312
## Installation
413

514
Before using TF-controller, you have to install Flux by using either `flux install` or `flux bootstrap` command.
@@ -73,7 +82,7 @@ metadata:
7382
namespace: flux-system
7483
spec:
7584
interval: 1m
76-
approvePlan: "auto"
85+
approvePlan: auto
7786
path: ./
7887
sourceRef:
7988
kind: GitRepository

‎docs/index.md‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,16 @@ To get started, follow the [getting started](/tf-controller/getting_started) gui
4141
You make change to the field `.spec.approvePlan`, commit and push to tell the TF-controller to apply the plan for you.
4242
With this GitOps workflow, you can optionally create and push this change to a new branch for your team member to
4343
review and approve too. _This feature is available since v0.6.0._
44+
* **First-class YAML-based Terraform**: The `Terraform` object in v0.13.0+ allows you to better configure your
45+
Terraform resources via YAMLs, but without introducing any extra CRDs to your cluster. Together with a new generator
46+
called **Tofu-Jet**, we'll now be able to ship pre-generated primitive Terraform modules for all major cloud providers.
47+
A primitive Terraform module is a module that only contains a single primitive resource, like `aws_iam_role`, or `aws_iam_policy`.
48+
With this concept, we would be able to use Terraform without writing Terraform codes, and make it more GitOps-friendly at the same time.
49+
_This feature is available since v0.13.0._
4450

4551
## Dependencies
4652

47-
| Version | Terraform | Source Controller | Flux v2 |
48-
|:----------:|:---------:|:-----------------:|:-------:|
49-
| **v0.9.5** | v1.1.9 | v0.21.2 | v0.27.x |
50-
| v0.8.0 | v1.1.4 | v0.20.1 | v0.25.x |
53+
| Version | Terraform | Source Controller | Flux v2 |
54+
|:-----------:|:---------:|:-----------------:|:-------:|
55+
| v0.13.0-rc | v1.3.1 | v0.26.1 | v0.34.x |
56+
| **v0.12.0** | v1.1.9 | v0.26.1 | v0.32.x |

‎docs/rc.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
sourceRef:
2121
kind: HelmRepository
2222
name: tf-controller
23-
version: '>=0.6.4'
23+
version: '>=0.8.0'
2424
interval: 1h0s
2525
releaseName: tf-controller
2626
targetNamespace: flux-system
@@ -41,7 +41,7 @@ spec:
4141
caCertValidityDuration: 24h
4242
certRotationCheckFrequency: 30m
4343
image:
44-
tag: v0.12.0
44+
tag: v0.13.0-rc.2
4545
runner:
4646
image:
47-
tag: v0.12.0
47+
tag: v0.13.0-rc.2

0 commit comments

Comments
 (0)