weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: do not create secret labels if template is empty

Browse Source 
Signed-off-by: jonathansp <jonathansimonprates@gmail.com>
This commit is contained in:
Jonathan Prates 2021-06-29 16:20:30 +01:00
parent 9f36f8984b
commit 811069cac7
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/controller/certificates/internal/secretsmanager/secret.go
View File

@ -213,18 +213,24 @@ func (s *SecretsManager) setValues(crt *cmapi.Certificate, secret *corev1.Secret
delete(secret.Data, cmmeta.TLSCAKey)
}
if secret.Labels == nil {
secret.Labels = make(map[string]string)
}
for k, v := range crt.Spec.SecretTemplate.Labels {
secret.Labels[k] = v
}
if secret.Annotations == nil {
secret.Annotations = make(map[string]string)
}
for k, v := range crt.Spec.SecretTemplate.Annotations {
secret.Annotations[k] = v
if crt.Spec.SecretTemplate != nil {
// Only initialise Labels map if crt.Spec.SecretTemplate.Labels
// contains data. Otherwise keep it nil.
if len(crt.Spec.SecretTemplate.Labels) > 0 && secret.Labels == nil {
secret.Labels = make(map[string]string)
}
for k, v := range crt.Spec.SecretTemplate.Labels {
secret.Labels[k] = v
}
for k, v := range crt.Spec.SecretTemplate.Annotations {
secret.Annotations[k] = v
}
}
secret.Annotations[cmapi.CertificateNameKey] = crt.Name