Merge pull request kubevirt#6730 from zhhray/feat/change-cert-secret-…

…type change kubevrit cert secret type from Opaque to kubernetes.io/tls
lyarwood · Nov 15, 2021 · e622b99 · e622b99
2 parents aaa7286 + fa50cb3
commit e622b99
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/pkg/virt-operator/resource/generate/components/secrets.go b/pkg/virt-operator/resource/generate/components/secrets.go
@@ -154,7 +154,7 @@ func NewCACertSecret(operatorNamespace string) *k8sv1.Secret {
 				v1.ManagedByLabel: v1.ManagedByLabelOperatorValue,
 			},
 		},
-		Type: "Opaque",
+		Type: k8sv1.SecretTypeTLS,
 	}
 }
 
@@ -189,7 +189,7 @@ func NewCertSecrets(installNamespace string, operatorNamespace string) []*k8sv1.
 					v1.ManagedByLabel: v1.ManagedByLabelOperatorValue,
 				},
 			},
-			Type: "Opaque",
+			Type: k8sv1.SecretTypeTLS,
 		},
 		{
 			TypeMeta: metav1.TypeMeta{
@@ -203,7 +203,7 @@ func NewCertSecrets(installNamespace string, operatorNamespace string) []*k8sv1.
 					v1.ManagedByLabel: v1.ManagedByLabelOperatorValue,
 				},
 			},
-			Type: "Opaque",
+			Type: k8sv1.SecretTypeTLS,
 		},
 		{
 			TypeMeta: metav1.TypeMeta{
@@ -217,7 +217,7 @@ func NewCertSecrets(installNamespace string, operatorNamespace string) []*k8sv1.
 					v1.ManagedByLabel: v1.ManagedByLabelOperatorValue,
 				},
 			},
-			Type: "Opaque",
+			Type: k8sv1.SecretTypeTLS,
 		},
 		{
 			TypeMeta: metav1.TypeMeta{
@@ -231,7 +231,7 @@ func NewCertSecrets(installNamespace string, operatorNamespace string) []*k8sv1.
 					v1.ManagedByLabel: v1.ManagedByLabelOperatorValue,
 				},
 			},
-			Type: "Opaque",
+			Type: k8sv1.SecretTypeTLS,
 		},
 		{
 			TypeMeta: metav1.TypeMeta{
@@ -245,7 +245,7 @@ func NewCertSecrets(installNamespace string, operatorNamespace string) []*k8sv1.
 					v1.ManagedByLabel: v1.ManagedByLabelOperatorValue,
 				},
 			},
-			Type: "Opaque",
+			Type: k8sv1.SecretTypeTLS,
 		},
 	}
 	return secrets

diff --git a/tests/infra_test.go b/tests/infra_test.go
@@ -258,7 +258,8 @@ var _ = Describe("[Serial][sig-compute]Infrastructure", func() {
 				secret, err := virtClient.CoreV1().Secrets(flags.KubeVirtInstallNamespace).Get(context.Background(), components.KubeVirtCASecretName, metav1.GetOptions{})
 				Expect(err).ToNot(HaveOccurred())
 				secret.Data = map[string][]byte{
-					"random": []byte("nonsense"),
+					"tls.crt": []byte(""),
+					"tls.key": []byte(""),
 				}
 
 				_, err = virtClient.CoreV1().Secrets(flags.KubeVirtInstallNamespace).Update(context.Background(), secret, metav1.UpdateOptions{})
@@ -344,7 +345,8 @@ var _ = Describe("[Serial][sig-compute]Infrastructure", func() {
 					return err
 				}
 				secret.Data = map[string][]byte{
-					"random": []byte("nonsense"),
+					"tls.crt": []byte(""),
+					"tls.key": []byte(""),
 				}
 				_, err = virtClient.CoreV1().Secrets(flags.KubeVirtInstallNamespace).Update(context.Background(), secret, metav1.UpdateOptions{})