djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small refactors in impersonator_config.go suggested by @mattmoyer

Browse Source
This commit is contained in:
Ryan Richard 2021-07-26 17:46:06 -07:00
parent 54c5bcc9a1
commit f17f7c0c6a
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/controller/impersonatorconfig/impersonator_config.go
View File

@ -532,7 +532,7 @@ func (c *impersonatorConfigController) createOrUpdateService(ctx context.Context
// to be able to detect that the missing key means that we should remove the key. This is needed to // to be able to detect that the missing key means that we should remove the key. This is needed to
// differentiate it from a key that was added by another actor, which we should not remove. // differentiate it from a key that was added by another actor, which we should not remove.
// But don't bother recording the requested annotations if there were no annotations requested. // But don't bother recording the requested annotations if there were no annotations requested.
desiredAnnotationKeys := []string{} desiredAnnotationKeys := make([]string, 0, len(desiredService.Annotations))
for k := range desiredService.Annotations { for k := range desiredService.Annotations {
desiredAnnotationKeys = append(desiredAnnotationKeys, k) desiredAnnotationKeys = append(desiredAnnotationKeys, k)
} }
@ -543,9 +543,6 @@ func (c *impersonatorConfigController) createOrUpdateService(ctx context.Context
if err != nil { if err != nil {
return err // This shouldn't really happen. We should always be able to marshal an array of strings. return err // This shouldn't really happen. We should always be able to marshal an array of strings.
} }
if desiredService.Annotations == nil {
desiredService.Annotations = map[string]string{}
}
// Save the desired annotations to a bookkeeping annotation. // Save the desired annotations to a bookkeeping annotation.
desiredService.Annotations[annotationKeysKey] = string(keysJSONArray) desiredService.Annotations[annotationKeysKey] = string(keysJSONArray)
} }
@ -593,9 +590,8 @@ func (c *impersonatorConfigController) createOrUpdateService(ctx context.Context
// Check if any annotations which were previously in the CredentialIssuer spec are now gone from the spec, // Check if any annotations which were previously in the CredentialIssuer spec are now gone from the spec,
// which means that those now-missing annotations should get deleted. // which means that those now-missing annotations should get deleted.
// Nested loops are not efficient here, but these lists of annotations should be small.
for _, oldKey := range oldDesiredAnnotationKeys { for _, oldKey := range oldDesiredAnnotationKeys {
if !stringSliceContains(desiredAnnotationKeys, oldKey) { if _, existsInDesired := desiredService.Annotations[oldKey]; !existsInDesired {
delete(updatedService.Annotations, oldKey) delete(updatedService.Annotations, oldKey)
} }
} }
@ -618,15 +614,6 @@ func (c *impersonatorConfigController) createOrUpdateService(ctx context.Context
return err return err
} }
func stringSliceContains(haystack []string, needle string) bool {
for _, s := range haystack {
if s == needle {
return true
}
}
return false
}
func (c *impersonatorConfigController) ensureTLSSecret(ctx context.Context, nameInfo *certNameInfo, ca *certauthority.CA) error { func (c *impersonatorConfigController) ensureTLSSecret(ctx context.Context, nameInfo *certNameInfo, ca *certauthority.CA) error {
secretFromInformer, err := c.secretsInformer.Lister().Secrets(c.namespace).Get(c.tlsSecretName) secretFromInformer, err := c.secretsInformer.Lister().Secrets(c.namespace).Get(c.tlsSecretName)
notFound := k8serrors.IsNotFound(err) notFound := k8serrors.IsNotFound(err)