Use k8s ServiceAccount constants

humio · Aug 5, 2024 · d6bfbfa · d6bfbfa
1 parent da0c543
commit d6bfbfa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/controllers/suite/clusters/humiocluster_controller_test.go b/controllers/suite/clusters/humiocluster_controller_test.go
@@ -4105,7 +4105,7 @@ var _ = Describe("HumioCluster Controller", func() {
 					if volume.Name == serviceAccountSecretVolumeName {
 						secret, err := kubernetes.GetSecret(ctx, k8sClient, volume.Secret.SecretName, key.Namespace)
 						Expect(err).ShouldNot(HaveOccurred())
-						Expect(secret.ObjectMeta.Annotations["kubernetes.io/service-account.name"]).To(Equal(toCreate.Spec.InitServiceAccountName))
+						Expect(secret.ObjectMeta.Annotations[corev1.ServiceAccountNameKey]).To(Equal(toCreate.Spec.InitServiceAccountName))
 					}
 				}
 			}
@@ -4123,7 +4123,7 @@ var _ = Describe("HumioCluster Controller", func() {
 					if volume.Name == serviceAccountSecretVolumeName {
 						secret, err := kubernetes.GetSecret(ctx, k8sClient, volume.Secret.SecretName, key.Namespace)
 						Expect(err).ShouldNot(HaveOccurred())
-						Expect(secret.ObjectMeta.Annotations["kubernetes.io/service-account.name"]).To(Equal(toCreate.Spec.AuthServiceAccountName))
+						Expect(secret.ObjectMeta.Annotations[corev1.ServiceAccountNameKey]).To(Equal(toCreate.Spec.AuthServiceAccountName))
 					}
 				}
 			}
@@ -4163,7 +4163,7 @@ var _ = Describe("HumioCluster Controller", func() {
 					if volume.Name == serviceAccountSecretVolumeName {
 						secret, err := kubernetes.GetSecret(ctx, k8sClient, volume.Secret.SecretName, key.Namespace)
 						Expect(err).ShouldNot(HaveOccurred())
-						Expect(secret.ObjectMeta.Annotations["kubernetes.io/service-account.name"]).To(Equal(toCreate.Spec.InitServiceAccountName))
+						Expect(secret.ObjectMeta.Annotations[corev1.ServiceAccountNameKey]).To(Equal(toCreate.Spec.InitServiceAccountName))
 					}
 				}
 			}
@@ -4181,7 +4181,7 @@ var _ = Describe("HumioCluster Controller", func() {
 					if volume.Name == serviceAccountSecretVolumeName {
 						secret, err := kubernetes.GetSecret(ctx, k8sClient, volume.Secret.SecretName, key.Namespace)
 						Expect(err).ShouldNot(HaveOccurred())
-						Expect(secret.ObjectMeta.Annotations["kubernetes.io/service-account.name"]).To(Equal(toCreate.Spec.AuthServiceAccountName))
+						Expect(secret.ObjectMeta.Annotations[corev1.ServiceAccountNameKey]).To(Equal(toCreate.Spec.AuthServiceAccountName))
 					}
 				}
 			}

diff --git a/pkg/kubernetes/secrets.go b/pkg/kubernetes/secrets.go
@@ -65,9 +65,9 @@ func ConstructServiceAccountSecret(humioClusterName, humioClusterNamespace, secr
 			Name:        fmt.Sprintf("%s-%s", secretName, RandomString()),
 			Namespace:   humioClusterNamespace,
 			Labels:      LabelsForSecret(humioClusterName, secretName, nil),
-			Annotations: map[string]string{"kubernetes.io/service-account.name": serviceAccountName},
+			Annotations: map[string]string{corev1.ServiceAccountNameKey: serviceAccountName},
 		},
-		Type: "kubernetes.io/service-account-token",
+		Type: corev1.SecretTypeServiceAccountToken,
 	}
 }