Skip to content

fix: compare labels and annotations in EnsureSecretExist #3191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knative-prow merged 1 commit into from
Nov 25, 2025
Merged

fix: compare labels and annotations in EnsureSecretExist #3191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions pkg/k8s/secrets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,35 @@ func EnsureSecretExist(ctx context.Context, secret corev1.Secret, namespaceOverr
secretNotFound = true
}

// TODO we should also compare labels and annotations
if secretNotFound || !equality.Semantic.DeepDerivative(existingSecret.Data, secret.Data) {
// Decide whether create or update
labelsEqual := true
annotationsEqual := true
dataEqual := true

if !secretNotFound {
dataEqual = equality.Semantic.DeepDerivative(existingSecret.Data, secret.Data)

existingLabels := existingSecret.Labels
if existingLabels == nil {
existingLabels = map[string]string{}
}
desiredLabels := secret.Labels
if desiredLabels == nil {
desiredLabels = map[string]string{}
}
labelsEqual = equality.Semantic.DeepEqual(existingLabels, desiredLabels)

existingAnnotations := existingSecret.Annotations
if existingAnnotations == nil {
existingAnnotations = map[string]string{}
}
desiredAnnotations := secret.Annotations
if desiredAnnotations == nil {
desiredAnnotations = map[string]string{}
}
annotationsEqual = equality.Semantic.DeepEqual(existingAnnotations, desiredAnnotations)
}

if secretNotFound || !dataEqual || !labelsEqual || !annotationsEqual {
if secretNotFound {
_, err = client.CoreV1().Secrets(namespace).Create(ctx, &secret, metav1.CreateOptions{})
} else {
Expand Down
Loading