Move the GC checksum from labels to annotations #362
Conversation
JaneLiuL
changed the title
|
@JaneLiuL I found some serious issues with |
JaneLiuL
changed the title
controllers/utils.go
Outdated
| // --- /tmp/LIVE-656588208/kustomize.toolkit.fluxcd.io.v1beta1.Kustomization.namespace.name 2021-06-07 12:58:20.738794982 +0200 | ||
| // +++ /tmp/MERGED-532750671/kustomize.toolkit.fluxcd.io.v1beta1.Kustomization.namespace.name 2021-06-07 12:58:20.798795908 +0200 | ||
| // @@ -0,0 +1,36 @@ | ||
| func parseDiffOutput(in []byte) map[string]string { |
There was a problem hiding this comment.
Please remove this as it's unrelated to this PR.
| @@ -21,12 +21,10 @@ import ( | |||
| "crypto/sha1" | |||
| "encoding/json" | |||
| "fmt" | |||
| "github.com/fluxcd/pkg/apis/kustomize" | |||
There was a problem hiding this comment.
This needs to be added further down, the first import section is for Go std lib.
| } | ||
| } | ||
| if !exists { | ||
| //kus.Transformers = append(kus.Transformers, transformerFileName) |
There was a problem hiding this comment.
Please remove these commented lines.
| @@ -648,6 +649,9 @@ func (r *KustomizationReconciler) apply(ctx context.Context, kustomization kusto | |||
| } | |||
| } | |||
|
|
|||
| changeSet := "" | |||
There was a problem hiding this comment.
This change is unrelated to this PR please undo it.
There was a problem hiding this comment.
Please update the GC docs here https://github.com/fluxcd/kustomize-controller/blob/main/docs/spec/v1beta1/kustomization.md#garbage-collection
controllers/kustomization_gc.go
Outdated
| @@ -137,9 +137,25 @@ func (kgc *KustomizeGarbageCollector) Prune(timeout time.Duration, name string, | |||
| return changeSet, true | |||
| } | |||
|
|
|||
| // We can't drop the label check in this version. | |||
There was a problem hiding this comment.
Please replace this with:
Check both labels and annotations for the checksum to preserve backwards compatibility
| func (kg *KustomizeGenerator) generateLabelTransformer(checksum, dirPath string) error { | ||
| labels := selectorLabels(kg.kustomization.GetName(), kg.kustomization.GetNamespace()) | ||
|
|
||
| // add checksum label only if GC is enabled |
There was a problem hiding this comment.
This has been lost, please restore it for the annotions
| return err | ||
| } | ||
|
|
||
| labelsFile := filepath.Join(dirPath, transformerAnnotationFileName) |
There was a problem hiding this comment.
| labelsFile := filepath.Join(dirPath, transformerAnnotationFileName) | |
| annotationsFile := filepath.Join(dirPath, transformerAnnotationFileName) |
| ) | ||
|
|
||
| const ( | ||
| transformerFileName = "kustomization-gc-labels.yaml" | ||
| transformerFileName = "kustomization-gc-labels.yaml" | ||
| transformerAnnotationFileName = "kustomization-annotation-labels.yaml" |
There was a problem hiding this comment.
| transformerAnnotationFileName = "kustomization-annotation-labels.yaml" | |
| transformerAnnotationFileName = "kustomization-gc-annotations.yaml" |
Signed-off-by: Jane Liu L <jane.l.liu@ericsson.com>
stefanprodan
added
area/kustomize
This PR moves the
kustomize.toolkit.fluxcd.io/checksumfrom labels to annotations. This should fix any conflicts with 3rd party controllers like Stash (fix: #315) that are copying the labels from their custom resources to generated objects.