Use vmware-system-csi namespace when generating certs for CSI webhooks (

#2374) Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com> Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com> Co-authored-by: Marko Mudrinić <mudrinic.mare@gmail.com>
kubermatic · Sep 24, 2022 · 23afc68 · 23afc68
1 parent 3115519
commit 23afc68
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/addons/applier.go b/pkg/addons/applier.go
@@ -282,7 +282,7 @@ func csiWebhookCerts(s *state.State, data *templateData, csiMigration bool, kube
 		if err := webhookCerts(data.Certificates,
 			webhookCertsCSI,
 			resources.GenericCSIWebhookName,
-			resources.GenericCSIWebhookNamespace,
+			resources.VsphereCSIWebhookNamespace,
 			s.Cluster.ClusterNetwork.ServiceDomainName,
 			kubeCAPrivateKey,
 			kubeCACert,
@@ -293,7 +293,7 @@ func csiWebhookCerts(s *state.State, data *templateData, csiMigration bool, kube
 			if err := webhookCerts(data.Certificates,
 				"CSIMigration",
 				resources.VsphereCSIWebhookName,
-				resources.GenericCSIWebhookNamespace,
+				resources.VsphereCSIWebhookNamespace,
 				s.Cluster.ClusterNetwork.ServiceDomainName,
 				kubeCAPrivateKey,
 				kubeCACert,
@@ -317,7 +317,7 @@ func csiWebhookCerts(s *state.State, data *templateData, csiMigration bool, kube
 	return nil
 }
 
-func webhookCerts(certs map[string]string, prefix, webhookName, webhookNamespace, serviceDomainName string, kubeCAPrivateKey *rsa.PrivateKey, kubeCACert *x509.Certificate) error { //nolint:unparam
+func webhookCerts(certs map[string]string, prefix, webhookName, webhookNamespace, serviceDomainName string, kubeCAPrivateKey *rsa.PrivateKey, kubeCACert *x509.Certificate) error {
 	certsMap, err := certificate.NewSignedTLSCert(
 		webhookName,
 		webhookNamespace,

diff --git a/pkg/templates/resources/resources.go b/pkg/templates/resources/resources.go
@@ -95,6 +95,7 @@ const (
 	MetricsServerNamespace = metav1.NamespaceSystem
 
 	VsphereCSIWebhookName      = "vsphere-webhook-svc"
+	VsphereCSIWebhookNamespace = "vmware-system-csi"
 	NutanixCSIWebhookName      = "csi-snapshot-webhook"
 	GenericCSIWebhookName      = "snapshot-validation-service"
 	GenericCSIWebhookNamespace = metav1.NamespaceSystem