Skip to content

Commit 9061419

Browse files
authored
Merge pull request #335 from fluxcd/release-v0.12.0
Release v0.12.0
2 parents 2a03b6e + 4efb8b2 commit 9061419

File tree

8 files changed

+35
-19
lines changed

8 files changed

+35
-19
lines changed

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
22

33
All notable changes to this project are documented in this file.
44

5+
## 0.12.0
6+
7+
**Release date:** 2021-04-29
8+
9+
This prerelease comes with support for decrypting Kubernetes
10+
secrets generated with SOPS and
11+
[Kustomize `secretGenerator`](https://github.com/fluxcd/kustomize-controller/blob/v0.12.0/docs/spec/v1beta1/kustomization.md#kustomize-secretgenerator).
12+
13+
Features:
14+
* SOPS: Decrypt Kubernetes secrets generated by kustomize
15+
[#329](https://github.com/fluxcd/kustomize-controller/pull/329)
16+
17+
Improvements:
18+
* Extract validation error from apply server dry run output
19+
[#333](https://github.com/fluxcd/kustomize-controller/pull/333)
20+
521
## 0.11.1
622

723
**Release date:** 2021-04-22

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
IMG ?= fluxcd/kustomize-controller:latest
33
# Produce CRDs that work back to Kubernetes 1.16
44
CRD_OPTIONS ?= crd:crdVersions=v1
5-
SOURCE_VER ?= v0.12.0
5+
SOURCE_VER ?= v0.12.1
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))

config/default/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
namespace: kustomize-system
44
resources:
5-
- https://github.com/fluxcd/source-controller/releases/download/v0.12.0/source-controller.crds.yaml
6-
- https://github.com/fluxcd/source-controller/releases/download/v0.12.0/source-controller.deployment.yaml
5+
- https://github.com/fluxcd/source-controller/releases/download/v0.12.1/source-controller.crds.yaml
6+
- https://github.com/fluxcd/source-controller/releases/download/v0.12.1/source-controller.deployment.yaml
77
- ../crd
88
- ../rbac
99
- ../manager

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ resources:
55
images:
66
- name: fluxcd/kustomize-controller
77
newName: fluxcd/kustomize-controller
8-
newTag: v0.11.1
8+
newTag: v0.12.0

docs/spec/README.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,17 @@ The API design of the controller can be found at [kustomize.toolkit.fluxcd.io/v1
7272

7373
## Backward compatibility
7474

75-
| Feature | Kustomize Controller | Flux |
75+
| Feature | Kustomize Controller | Flux v1 |
7676
| -------------------------------------------- | ----------------------- | ------------------ |
7777
| Plain Kubernetes manifests sync | :heavy_check_mark: | :heavy_check_mark: |
7878
| Kustomize build sync | :heavy_check_mark: | :heavy_check_mark: |
7979
| Garbage collection | :heavy_check_mark: | :heavy_check_mark: |
8080
| Secrets decryption | :heavy_check_mark: | :heavy_check_mark: |
81-
| Container image updates | :x: | :heavy_check_mark: |
8281
| Generate manifests with shell scripts | :x: | :heavy_check_mark: |
8382

8483
Syncing will not support the `.flux.yaml` mechanism as running shell scripts and binaries to
8584
generate manifests is not in the scope of Kustomize controller.
8685

87-
Container registry scanning and automated image updates is not in the scope of Kustomize controller,
88-
could be implemented by a dedicated controller.
89-
9086
## Example
9187

9288
After installing kustomize-controller and its companion source-controller, we
@@ -193,4 +189,3 @@ spec:
193189
validation: server
194190
```
195191
196-

docs/spec/v1beta1/kustomization.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -964,22 +964,27 @@ spec:
964964

965965
### Kustomize secretGenerator
966966

967-
`sops` encrypted data can be stored as a base64 encoded Secret, which enables use of kustomize secretGenerator as follows.
967+
SOPS encrypted data can be stored as a base64 encoded Secret,
968+
which enables the use of Kustomize `secretGenerator` as follows:
968969

969970
```console
970-
$ echo "day=Tuesday" | sops -e /dev/stdin > day.txt.encrypted
971+
$ echo "my-secret-token" | sops -e /dev/stdin > token.encrypted
971972
$ cat <<EOF > kustomization.yaml
972973
apiVersion: kustomize.config.k8s.io/v1beta1
973974
kind: Kustomization
974975
975976
secretGenerator:
976-
- name: day-secret
977+
- name: token
977978
files:
978-
- ./day.txt.encrypted
979+
- token=token.encrypted
979980
EOF
980981
```
981982

982-
Commit and push `day.txt.encrypted` and `kustomization.yaml` to Git.
983+
Commit and push `token.encrypted` and `kustomization.yaml` to Git.
984+
985+
The kustomize-controller scans the values of Kubernetes Secrets, and when it
986+
detects that the values are SOPS encrypted, it decrypts them before applying
987+
them on the cluster.
983988

984989
## Status
985990

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ require (
99
github.com/Microsoft/go-winio v0.4.16 // indirect
1010
github.com/cyphar/filepath-securejoin v0.2.2
1111
github.com/drone/envsubst v1.0.3-0.20200804185402-58bc65f69603
12-
github.com/fluxcd/kustomize-controller/api v0.11.1
12+
github.com/fluxcd/kustomize-controller/api v0.12.0
1313
github.com/fluxcd/pkg/apis/kustomize v0.0.1
1414
github.com/fluxcd/pkg/apis/meta v0.9.0
1515
github.com/fluxcd/pkg/runtime v0.11.0
1616
github.com/fluxcd/pkg/testserver v0.0.2
1717
github.com/fluxcd/pkg/untar v0.0.5
18-
github.com/fluxcd/source-controller/api v0.12.0
18+
github.com/fluxcd/source-controller/api v0.12.1
1919
github.com/go-logr/logr v0.3.0
2020
github.com/hashicorp/go-retryablehttp v0.6.8
2121
github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ github.com/fluxcd/pkg/testserver v0.0.2 h1:SoaMtO9cE5p/wl2zkGudzflnEHd9mk68CGjZO
204204
github.com/fluxcd/pkg/testserver v0.0.2/go.mod h1:pgUZTh9aQ44FSTQo+5NFlh7YMbUfdz1B80DalW7k96Y=
205205
github.com/fluxcd/pkg/untar v0.0.5 h1:UGI3Ch1UIEIaqQvMicmImL1s9npQa64DJ/ozqHKB7gk=
206206
github.com/fluxcd/pkg/untar v0.0.5/go.mod h1:O6V9+rtl8c1mHBafgqFlJN6zkF1HS5SSYn7RpQJ/nfw=
207-
github.com/fluxcd/source-controller/api v0.12.0 h1:ATzWCIXE96Q1iOHElzM0V4xCVEn95QLKpOSmVLiY/lo=
208-
github.com/fluxcd/source-controller/api v0.12.0/go.mod h1:+EPyhxC7Y+hUnq7EwAkkLtfbwCxJxF5yfmiyzDk43KY=
207+
github.com/fluxcd/source-controller/api v0.12.1 h1:ubO3gwGaxnXwayJeDHpdsh96NXwOLpFcbLjZo/pqWCg=
208+
github.com/fluxcd/source-controller/api v0.12.1/go.mod h1:+EPyhxC7Y+hUnq7EwAkkLtfbwCxJxF5yfmiyzDk43KY=
209209
github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk=
210210
github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
211211
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=

0 commit comments

Comments
 (0)