Fix liveness and readinessreadyness probe

Signed-off-by: Anisur Rahman <anisur@appscode.com>

Author: anisurrahman75

charts/aws-credential-manager/README.md

@@ -67,11 +67,13 @@ The following table lists the configurable parameters of the `aws-credential-man
 | service.port                          |                                                                                                                                                                                                                                                   | <code>8081</code>                                                                                                                                                                              |
 | resources                             |                                                                                                                                                                                                                                                   | <code>{}</code>                                                                                                                                                                                |
 | livenessProbe.httpGet.path            |                                                                                                                                                                                                                                                   | <code>/healthz</code>                                                                                                                                                                          |
-| livenessProbe.httpGet.port            |                                                                                                                                                                                                                                                   | <code>http</code>                                                                                                                                                                              |
+| livenessProbe.httpGet.port            |                                                                                                                                                                                                                                                   | <code>8081</code>                                                                                                                                                                              |
+| livenessProbe.httpGet.scheme          |                                                                                                                                                                                                                                                   | <code>HTTP</code>                                                                                                                                                                              |
 | livenessProbe.initialDelaySeconds     |                                                                                                                                                                                                                                                   | <code>15</code>                                                                                                                                                                                |
 | livenessProbe.periodSeconds           |                                                                                                                                                                                                                                                   | <code>20</code>                                                                                                                                                                                |
 | readinessProbe.httpGet.path           |                                                                                                                                                                                                                                                   | <code>/readyz</code>                                                                                                                                                                           |
-| readinessProbe.httpGet.port           |                                                                                                                                                                                                                                                   | <code>http</code>                                                                                                                                                                              |
+| readinessProbe.httpGet.port           |                                                                                                                                                                                                                                                   | <code>8081</code>                                                                                                                                                                              |
+| readinessProbe.httpGet.scheme         |                                                                                                                                                                                                                                                   | <code>HTTP</code>                                                                                                                                                                              |
 | readinessProbe.initialDelaySeconds    |                                                                                                                                                                                                                                                   | <code>5</code>                                                                                                                                                                                 |
 | readinessProbe.periodSeconds          |                                                                                                                                                                                                                                                   | <code>10</code>                                                                                                                                                                                |
 | volumes                               | Additional volumes on the output Deployment definition.                                                                                                                                                                                           | <code>[]</code>                                                                                                                                                                                |

charts/aws-credential-manager/templates/deployment.yaml

@@ -51,8 +51,8 @@ spec:
             - --aws-max-interval-seconds={{ .Values.bucketAccessor.awsMaxIntervalSeconds }}
             - --aws-max-wait-seconds={{ .Values.bucketAccessor.awsMaxWaitSeconds }}
           ports:
-            - name: http
-              containerPort: {{ .Values.service.port }}
+            - containerPort: 9443
+              name: webhook-server
               protocol: TCP
           livenessProbe:
             {{- toYaml .Values.livenessProbe | nindent 12 }}

charts/aws-credential-manager/templates/mutating-webhook.yaml

@@ -1,8 +1,9 @@
+{{ template "aws-credential-manager.prepare-certs" $ }}
 {{- if .Values.apiserver.enableMutatingWebhook }}
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
-  name: {{ template "aws-credential-manager.fullname" . }}
+  name: {{ include "aws-credential-manager.fullname" . }}
   labels:
     {{- include "aws-credential-manager.labels" . | nindent 4 }}
 webhooks:
@@ -25,7 +26,7 @@ webhooks:
     clientConfig:
       service:
         namespace: {{ .Release.Namespace }}
-        name: {{ include "aws-credential-manager.fullname" . }}
+        name: {{ include "aws-credential-manager.webhookServiceName" . }}
         path: /mutate-batch-v1-job
-      caBundle: {{ .Values.apiserver.ca | b64enc }}
+      caBundle: {{ $._caCrt }}
 {{- end }}

charts/aws-credential-manager/templates/service.yaml

@@ -1,15 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "aws-credential-manager.fullname" . }}
+  name: {{ include "aws-credential-manager.webhookServiceName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "aws-credential-manager.labels" . | nindent 4 }}
 spec:
   ports:
-  - name: https
-    port: 8443
+  - port: 443
     protocol: TCP
-    targetPort: 8443
+    targetPort: 9443
   selector:
     {{- include "aws-credential-manager.labels" . | nindent 4 }}

charts/aws-credential-manager/values.yaml

@@ -56,13 +56,15 @@ resources: {}
 livenessProbe:
   httpGet:
     path: /healthz
-    port: http
+    port: 8081
+    scheme: HTTP
   initialDelaySeconds: 15
   periodSeconds: 20
 readinessProbe:
   httpGet:
     path: /readyz
-    port: http
+    port: 8081
+    scheme: HTTP
   initialDelaySeconds: 5
   periodSeconds: 10
 # Additional volumes on the output Deployment definition.