Merge pull request #577 from fluxcd/release-v0.21.1

Release v0.21.1

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this project are documented in this file.
 
+## 0.21.1
+
+**Release date:** 2022-02-23
+
+This prerelease comes with a workaround for an
+[upstream bug in Kubernetes](https://github.com/kubernetes/kubernetes/issues/108008),
+where the keys set in a Secret with `stringData` are not removed from the cluster
+when the keys are deleted from the manifest.
+
+Improvements:
+- Convert `stringData` to `data` before applying Secrets
+  [#576](https://github.com/fluxcd/kustomize-controller/pull/576)
+- Update dependencies
+  [#574](https://github.com/fluxcd/kustomize-controller/pull/574)
+
 ## 0.21.0
 
 **Release date:** 2022-02-16

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ resources:
 images:
   - name: fluxcd/kustomize-controller
     newName: fluxcd/kustomize-controller
-    newTag: v0.21.0
+    newTag: v0.21.1

docs/spec/v1beta2/kustomization.md

@@ -368,10 +368,18 @@ Note that when the `kustomize.toolkit.fluxcd.io/reconcile` annotation is set to
 the controller will no longer apply changes from source, nor will it prune the resource.
 To resume reconciliation, set the annotation to `enabled` or remove it.
 
-Note that due to the way [Kubernetes server-side apply](https://kubernetes.io/docs/reference/using-api/server-side-apply/)
-works, the kustomize-controller can only revert
-changes made to fields it manages. This means that `kubectl edit` changes will only be reverted if
-those fields are present in git.
+If you use kubectl to edit an object managed by Flux,
+all changes will be undone when kustomize-controller reconciles a
+Flux Kustomization containing that object.
+n order for kustomize-controller to preserve fields added with kubectl,
+you have to specify a field manager named `flux-client-side-apply` e.g.:
+
+```sh
+kubectl apply --field-manager=flux-client-side-apply
+```
+
+Note that the fields defined in manifests will always be overridden,
+the above procedure works only for adding new fields that don’t overlap with the desired state.
 
 ## Garbage collection
 

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/ProtonMail/go-crypto v0.0.0-20211112122917-428f8eabeeb3
 	github.com/cyphar/filepath-securejoin v0.2.2
 	github.com/drone/envsubst v1.0.3-0.20200804185402-58bc65f69603
-	github.com/fluxcd/kustomize-controller/api v0.21.0
+	github.com/fluxcd/kustomize-controller/api v0.21.1
 	github.com/fluxcd/pkg/apis/acl v0.0.3
 	github.com/fluxcd/pkg/apis/kustomize v0.3.1
 	github.com/fluxcd/pkg/apis/meta v0.10.2