Skip to content

allow to add multiple owners to cm/secret #999

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
ibm-ci-bot merged 2 commits into from
Nov 28, 2023
Merged

allow to add multiple owners to cm/secret #999

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0456ce
allow to add multiple owners to cm/secret
Nov 24, 2023
8e044f9
split the line to reduce its length
Nov 27, 2023
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
Prev Previous commit
split the line to reduce its length 
Signed-off-by: YuChen <[email protected]>
  • Loading branch information
YuChen committed Nov 27, 2023
commit 8e044f98cd9e194e4cbe46b7409082a72675a59a
11 changes: 9 additions & 2 deletions controllers/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,11 +282,18 @@ func EnsureLabelsForService(s *corev1.Service, labels map[string]string) {
}

func CompareSecret(secret *corev1.Secret, existingSecret *corev1.Secret) (needUpdate bool) {
return !equality.Semantic.DeepEqual(secret.GetLabels(), existingSecret.GetLabels()) || !equality.Semantic.DeepEqual(secret.Type, existingSecret.Type) || !equality.Semantic.DeepEqual(secret.Data, existingSecret.Data) || !equality.Semantic.DeepEqual(secret.StringData, existingSecret.StringData) || !equality.Semantic.DeepEqual(secret.GetOwnerReferences(), existingSecret.GetOwnerReferences())
return !equality.Semantic.DeepEqual(secret.GetLabels(), existingSecret.GetLabels()) ||
!equality.Semantic.DeepEqual(secret.Type, existingSecret.Type) ||
!equality.Semantic.DeepEqual(secret.Data, existingSecret.Data) ||
!equality.Semantic.DeepEqual(secret.StringData, existingSecret.StringData) ||
!equality.Semantic.DeepEqual(secret.GetOwnerReferences(), existingSecret.GetOwnerReferences())
}

func CompareConfigMap(configMap *corev1.ConfigMap, existingConfigMap *corev1.ConfigMap) (needUpdate bool) {
return !equality.Semantic.DeepEqual(configMap.GetLabels(), existingConfigMap.GetLabels()) || !equality.Semantic.DeepEqual(configMap.Data, existingConfigMap.Data) || !equality.Semantic.DeepEqual(configMap.BinaryData, existingConfigMap.BinaryData) || !equality.Semantic.DeepEqual(configMap.GetOwnerReferences(), existingConfigMap.GetOwnerReferences())
return !equality.Semantic.DeepEqual(configMap.GetLabels(), existingConfigMap.GetLabels()) ||
!equality.Semantic.DeepEqual(configMap.Data, existingConfigMap.Data) ||
!equality.Semantic.DeepEqual(configMap.BinaryData, existingConfigMap.BinaryData) ||
!equality.Semantic.DeepEqual(configMap.GetOwnerReferences(), existingConfigMap.GetOwnerReferences())
}

// SanitizeObjectString takes a string, i.e. .metadata.namespace, and a K8s object
Expand Down