Patch the metrics Service to point to the correct port

3scale-ops · Oct 19, 2021 · b7ab920 · b7ab920
1 parent cec006e
commit b7ab920
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 5 deletions.
diff --git a/bundle/manifests/marin3r-controller-manager-metrics-service_v1_service.yaml b/bundle/manifests/marin3r-controller-manager-metrics-service_v1_service.yaml
@@ -7,10 +7,10 @@ metadata:
   name: marin3r-controller-manager-metrics-service
 spec:
   ports:
-  - name: https
-    port: 8443
+  - name: metrics
+    port: 8080
     protocol: TCP
-    targetPort: https
+    targetPort: metrics
   selector:
     control-plane: controller-manager
 status:

diff --git a/bundle/manifests/marin3r.clusterserviceversion.yaml b/bundle/manifests/marin3r.clusterserviceversion.yaml
@@ -685,6 +685,10 @@ spec:
                   initialDelaySeconds: 15
                   periodSeconds: 20
                 name: manager
+                ports:
+                - containerPort: 8080
+                  name: metrics
+                  protocol: TCP
                 readinessProbe:
                   httpGet:
                     path: /readyz

diff --git a/config/default/custom/metrics_service_patch.yaml b/config/default/custom/metrics_service_patch.yaml
@@ -0,0 +1,7 @@
+- op: replace
+  path: /spec/ports
+  value:
+    - name: metrics
+      port: 8080
+      protocol: TCP
+      targetPort: metrics
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -43,8 +43,15 @@ patchesStrategicMerge:
 # 'CERTMANAGER' needs to be enabled to use ca injection
 - webhookcainjection_patch.yaml
 
+patches:
+# [CUSTOM] Change the port to http for the metrics Service
+- path: custom/metrics_service_patch.yaml
+  target:
+    group: ""
+    kind: Service
+    name: controller-manager-metrics-service
+    version: v1
 # [CUSTOM: cluster scope] Uncomment this for cluster scoped installations
-patches: []
 # - path: custom/clusterrole_patch.yaml
 #   target:
 #     group: rbac.authorization.k8s.io

diff --git a/config/manager/custom/manager_patch.yaml b/config/manager/custom/manager_patch.yaml
@@ -1,5 +1,5 @@
 # This patch injects custom arguments required by marin3r operator
-# to run in the controller manager main container
+# to run in the controller manager main container. Also adds metrics port.
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -20,3 +20,7 @@ spec:
             requests:
               cpu: 50m
               memory: 100Mi
+          ports:
+            - containerPort: 8080
+              protocol: TCP
+              name: metrics
diff --git a/config/olm/kustomization.yaml b/config/olm/kustomization.yaml
@@ -16,3 +16,9 @@ patches:
     kind: Deployment
     name: controller-webhook
     version: v1
+- path: metrics_service_patch.yaml
+  target:
+    group: ""
+    kind: Service
+    name: controller-manager-metrics-service
+    version: v1
diff --git a/config/olm/metrics_service_patch.yaml b/config/olm/metrics_service_patch.yaml
@@ -0,0 +1,7 @@
+- op: replace
+  path: /spec/ports
+  value:
+    - name: metrics
+      port: 8080
+      protocol: TCP
+      targetPort: metrics