Merge pull request #88 from stakater/update-service

Update Service
stakater · May 13, 2022 · d3fe226 · d3fe226
2 parents 0f3775f + 60bd68f
commit d3fe226
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -136,7 +136,7 @@ install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~
 
 .PHONY: uninstall
 uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config.
-	$(KUSTOMIZE) build config/crd | sh kubectl delete --ignore-not-found=$(ignore-not-found) -f -
+	$(KUSTOMIZE) build config/crd | kubectl delete --ignore-not-found=$(ignore-not-found) -f -
 
 .PHONY: deploy
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
@@ -145,7 +145,7 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
 
 .PHONY: undeploy
 undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
-	$(KUSTOMIZE) build config/default | sh kubectl delete --ignore-not-found=$(ignore-not-found) -f -
+	$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(ignore-not-found) -f -
 
 ifndef ignore-not-found
   ignore-not-found = false

diff --git a/bundle/manifests/jira-service-desk-operator-webhook-service_v1_service.yaml b/bundle/manifests/jira-service-desk-operator-webhook-service_v1_service.yaml
@@ -5,7 +5,7 @@ metadata:
   name: jira-service-desk-operator-webhook-service
 spec:
   ports:
-  - port: 0
+  - port: 443
     protocol: TCP
     targetPort: 9443
   selector:

diff --git a/bundle/manifests/jira-service-desk-operator.clusterserviceversion.yaml b/bundle/manifests/jira-service-desk-operator.clusterserviceversion.yaml
@@ -188,7 +188,7 @@ spec:
                 image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
                 name: kube-rbac-proxy
                 ports:
-                - containerPort: 0
+                - containerPort: 8443
                   name: https
                   protocol: TCP
                 resources:
@@ -273,6 +273,7 @@ spec:
   webhookdefinitions:
   - admissionReviewVersions:
     - v1
+    containerPort: 443
     deploymentName: jira-service-desk-operator-controller-manager
     failurePolicy: Fail
     generateName: mcustomer.kb.io
@@ -287,10 +288,12 @@ spec:
       resources:
       - customers
     sideEffects: None
+    targetPort: 9443
     type: MutatingAdmissionWebhook
     webhookPath: /mutate-jiraservicedesk-stakater-com-v1alpha1-customer
   - admissionReviewVersions:
     - v1
+    containerPort: 443
     deploymentName: jira-service-desk-operator-controller-manager
     failurePolicy: Fail
     generateName: mproject.kb.io
@@ -305,10 +308,12 @@ spec:
       resources:
       - projects
     sideEffects: None
+    targetPort: 9443
     type: MutatingAdmissionWebhook
     webhookPath: /mutate-jiraservicedesk-stakater-com-v1alpha1-project
   - admissionReviewVersions:
     - v1
+    containerPort: 443
     deploymentName: jira-service-desk-operator-controller-manager
     failurePolicy: Fail
     generateName: vcustomer.kb.io
@@ -323,10 +328,12 @@ spec:
       resources:
       - customers
     sideEffects: None
+    targetPort: 9443
     type: ValidatingAdmissionWebhook
     webhookPath: /validate-jiraservicedesk-stakater-com-v1alpha1-customer
   - admissionReviewVersions:
     - v1
+    containerPort: 443
     deploymentName: jira-service-desk-operator-controller-manager
     failurePolicy: Fail
     generateName: vproject.kb.io
@@ -341,5 +348,6 @@ spec:
       resources:
       - projects
     sideEffects: None
+    targetPort: 9443
     type: ValidatingAdmissionWebhook
     webhookPath: /validate-jiraservicedesk-stakater-com-v1alpha1-project
diff --git a/charts/jira-service-desk-operator/templates/deployment.yaml b/charts/jira-service-desk-operator/templates/deployment.yaml
@@ -39,6 +39,7 @@ spec:
         name: kube-rbac-proxy
         ports:
         - protocol: TCP
+          containerPort: 8443
           name: https
       - args:
         - --health-probe-bind-address=:8081
@@ -74,7 +75,7 @@ spec:
         ports:
         - containerPort: 9443
           name: webhook-server
-          protocol: TCP
+          port: 443
         resources:
           {{- toYaml .Values.resources | nindent 12 }}
         volumeMounts:

diff --git a/charts/jira-service-desk-operator/values.yaml b/charts/jira-service-desk-operator/values.yaml
@@ -18,6 +18,7 @@ webhook:
 
 service:
   type: ClusterIP
+  port: 443
   protocol: TCP
 
 # Monitoring Configuration

diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
@@ -24,7 +24,8 @@ spec:
         - "--logtostderr=true"
         - "--v=0"
         ports:
-        - protocol: TCP
+        - containerPort: 8443
+          protocol: TCP
           name: https
       - name: manager
         args:

diff --git a/config/webhook/service.yaml b/config/webhook/service.yaml
@@ -6,7 +6,8 @@ metadata:
   namespace: system
 spec:
   ports:
-    - protocol: TCP
+    - port: 443
+      protocol: TCP
       targetPort: 9443
   selector:
     control-plane: controller-manager