Remove health endpoint config

Signed-off-by: Edvin Norling <edvin.norling@xenit.se>
open-policy-agent · Jul 14, 2021 · e3c1c7f · e3c1c7f
1 parent 16593c7
commit e3c1c7f
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 13 deletions.
diff --git a/cmd/build/helmify/kustomization.yaml b/cmd/build/helmify/kustomization.yaml
@@ -82,5 +82,3 @@ patchesJson6902:
         path: /spec/template/spec/containers/0/ports/3
       - op: remove
         path: /spec/template/spec/containers/0/ports/3
-      - op: remove
-        path: /spec/template/spec/containers/0/ports/3
diff --git a/cmd/build/helmify/kustomize-for-helm.yaml b/cmd/build/helmify/kustomize-for-helm.yaml
@@ -64,7 +64,6 @@ spec:
         - name: manager
           args:
             - --port=HELMSUBST_DEPLOYMENT_CONTROLLER_MANAGER_PORT
-            - --health-addr=HELMSUBST_DEPLOYMENT_CONTROLLER_MANAGER_HEALTH_ADDR
             - --prometheus-port=HELMSUBST_DEPLOYMENT_CONTROLLER_MANAGER_PROMETHEUS_PORT
             - --logtostderr
             - --log-denies={{ .Values.logDenies }}
@@ -84,9 +83,6 @@ spec:
           - containerPort: HELMSUBST_DEPLOYMENT_CONTROLLER_MANAGER_PROMETHEUS_PORT
             name: metrics
             protocol: TCP
-          - containerPort: HELMSUBST_DEPLOYMENT_CONTROLLER_MANAGER_HEALTH_ADDR
-            name: healthz
-            protocol: TCP
           resources:
             HELMSUBST_DEPLOYMENT_CONTROLLER_MANAGER_CONTAINER_RESOURCES: ""
       nodeSelector:

diff --git a/cmd/build/helmify/replacements.go b/cmd/build/helmify/replacements.go
@@ -9,8 +9,6 @@ var replacements = map[string]string{
 
 	"HELMSUBST_DEPLOYMENT_CONTROLLER_MANAGER_PORT": `{{ .Values.controllerManager.port }}`,
 
-	"HELMSUBST_DEPLOYMENT_CONTROLLER_MANAGER_HEALTH_ADDR": `{{ .Values.controllerManager.healthAddr }}`,
-
 	"HELMSUBST_DEPLOYMENT_CONTROLLER_MANAGER_PROMETHEUS_PORT": `{{ .Values.controllerManager.prometheusPort }}`,
 
 	"HELMSUBST_DEPLOYMENT_AUDIT_HOST_NETWORK": `{{ .Values.audit.hostNetwork }}`,

diff --git a/cmd/build/helmify/static/README.md b/cmd/build/helmify/static/README.md
@@ -92,7 +92,6 @@ _See [Exempting Namespaces](https://open-policy-agent.github.io/gatekeeper/websi
 | nodeSelector                                 | The node selector to use for pod scheduling                                            | `kubernetes.io/os: linux`                                                 |
 | affinity                                     | The node affinity to use for pod scheduling                                            | `{}`                                                                      |
 | tolerations                                  | The tolerations to use for pod scheduling                                              | `[]`                                                                      |
-| controllerManager.healthAddr                 | Health address for controller manager                                                  | `:9090`                                                                   |
 | controllerManager.port                       | Webhook-server port for controller manager                                             | `8443`                                                                    |
 | controllerManager.prometheusPort             | Metrics port for controller manager                                                    | `8888`                                                                    |
 | controllerManager.priorityClassName          | Priority class name for controller manager                                             | `system-cluster-critical`                                                 |

diff --git a/manifest_staging/charts/gatekeeper/README.md b/manifest_staging/charts/gatekeeper/README.md
@@ -92,7 +92,6 @@ _See [Exempting Namespaces](https://open-policy-agent.github.io/gatekeeper/websi
 | nodeSelector                                 | The node selector to use for pod scheduling                                            | `kubernetes.io/os: linux`                                                 |
 | affinity                                     | The node affinity to use for pod scheduling                                            | `{}`                                                                      |
 | tolerations                                  | The tolerations to use for pod scheduling                                              | `[]`                                                                      |
-| controllerManager.healthAddr                 | Health address for controller manager                                                  | `:9090`                                                                   |
 | controllerManager.port                       | Webhook-server port for controller manager                                             | `8443`                                                                    |
 | controllerManager.prometheusPort             | Metrics port for controller manager                                                    | `8888`                                                                    |
 | controllerManager.priorityClassName          | Priority class name for controller manager                                             | `system-cluster-critical`                                                 |

diff --git a/manifest_staging/charts/gatekeeper/templates/gatekeeper-controller-manager-deployment.yaml b/manifest_staging/charts/gatekeeper/templates/gatekeeper-controller-manager-deployment.yaml
@@ -42,7 +42,6 @@ spec:
       containers:
       - args:
         - --port={{ .Values.controllerManager.port }}
-        - --health-addr={{ .Values.controllerManager.healthAddr }}
         - --prometheus-port={{ .Values.controllerManager.prometheusPort }}
         - --logtostderr
         - --log-denies={{ .Values.logDenies }}
@@ -85,8 +84,8 @@ spec:
         - containerPort: {{ .Values.controllerManager.prometheusPort }}
           name: metrics
           protocol: TCP
-        - containerPort: {{ .Values.controllerManager.healthAddr }}
-          name: healthz
+        - containerPort: 8443
+          name: webhook-server
           protocol: TCP
         readinessProbe:
           httpGet: