Merge pull request #4425 from shashankram/v1.0

[backport] crd-conversion: fix webhook port number (#4424)
openservicemesh · Jan 11, 2022 · a7f92b9 · a7f92b9
2 parents edb1d45 + 4e5f574
commit a7f92b9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/charts/osm/templates/osm-bootstrap-deployment.yaml b/charts/osm/templates/osm-bootstrap-deployment.yaml
@@ -45,7 +45,7 @@ spec:
           image: "{{ include "osmBootstrap.image" . }}"
           imagePullPolicy: {{ .Values.osm.image.pullPolicy }}
           ports:
-            - name: "tls"
+            - name: "crdconversion"
               containerPort: 9443
             - name: "metrics"
               containerPort: 9091

diff --git a/charts/osm/templates/osm-bootstrap-service.yaml b/charts/osm/templates/osm-bootstrap-service.yaml
@@ -8,9 +8,8 @@ metadata:
     app: osm-bootstrap
 spec:
   ports:
-    - name: tls
+    - name: crdconversion
       port: 9443
-      targetPort: tls
     - name: health
       port: 9095
   selector:

diff --git a/cmd/osm-bootstrap/osm-bootstrap.go b/cmd/osm-bootstrap/osm-bootstrap.go
@@ -180,7 +180,7 @@ func main() {
 	}
 
 	// Initialize the crd conversion webhook server to support the conversion of OSM's CRDs
-	crdConverterConfig.ListenPort = 9443
+	crdConverterConfig.ListenPort = constants.CRDConversionWebhookPort
 	if err := crdconversion.NewConversionWebhook(crdConverterConfig, kubeClient, crdClient, certManager, osmNamespace, enableReconciler, stop); err != nil {
 		events.GenericEventRecorder().FatalEvent(err, events.InitializationError, "Error creating crd conversion webhook")
 	}

diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
@@ -162,6 +162,9 @@ const (
 
 	// OSMMeshConfig is the name of the OSM MeshConfig
 	OSMMeshConfig = "osm-mesh-config"
+
+	// CRDConversionWebhookPort is the port of the CRD conversion webhook service
+	CRDConversionWebhookPort = 9443
 )
 
 // Annotations used by the control plane

diff --git a/pkg/crdconversion/crdconversion.go b/pkg/crdconversion/crdconversion.go
@@ -12,6 +12,7 @@ import (
 	apiclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/utils/pointer"
 
 	"github.com/openservicemesh/osm/pkg/certificate"
 	"github.com/openservicemesh/osm/pkg/certificate/providers"
@@ -186,6 +187,7 @@ func updateCrdConfiguration(cert certificate.Certificater, crdClient apiclient.A
 				Service: &apiv1.ServiceReference{
 					Namespace: osmNamespace,
 					Name:      constants.OSMBootstrapName,
+					Port:      pointer.Int32(constants.CRDConversionWebhookPort),
 					Path:      &crdConversionPath,
 				},
 				CABundle: cert.GetCertificateChain(),