Move the GC checksum from labels to annotations#362
Merged
stefanprodan merged 1 commit intofluxcd:mainfrom Jun 14, 2021
JaneLiuL:main
Merged
Move the GC checksum from labels to annotations#362stefanprodan merged 1 commit intofluxcd:mainfrom JaneLiuL:main
stefanprodan merged 1 commit intofluxcd:mainfrom
JaneLiuL:main
Conversation
JaneLiuL
changed the title
Member
|
@JaneLiuL I found some serious issues with |
JaneLiuL
changed the title
| // --- /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 { |
Member
There was a problem hiding this comment.
Please remove this as it's unrelated to this PR.
| "crypto/sha1" | ||
| "encoding/json" | ||
| "fmt" | ||
| "github.com/fluxcd/pkg/apis/kustomize" |
Member
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) |
Member
There was a problem hiding this comment.
Please remove these commented lines.
| } | ||
| } | ||
|
|
||
| changeSet := "" |
Member
There was a problem hiding this comment.
This change is unrelated to this PR please undo it.
| return changeSet, true | ||
| } | ||
|
|
||
| // We can't drop the label check in this version. |
Member
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 |
Member
There was a problem hiding this comment.
This has been lost, please restore it for the annotions
| return err | ||
| } | ||
|
|
||
| labelsFile := filepath.Join(dirPath, transformerAnnotationFileName) |
Member
There was a problem hiding this comment.
Suggested change
| 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" |
Member
There was a problem hiding this comment.
Suggested change
| transformerAnnotationFileName = "kustomization-annotation-labels.yaml" | |
| transformerAnnotationFileName = "kustomization-gc-annotations.yaml" |
Signed-off-by: Jane Liu L <jane.l.liu@ericsson.com>
stefanprodan
approved these changes
Jun 14, 2021
stefanprodan
added
area/kustomize
This was referenced Jun 14, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.