Skip to content

Commit 556e4db

Browse files
anisurrahman75anisurrahman75
committed
Fix liveness and readinessreadyness probe
Signed-off-by: Anisur Rahman <anisur@appscode.com>
1 parent ac9d414 commit 556e4db

File tree

7 files changed

+73
-17
lines changed

7 files changed

+73
-17
lines changed

‎apis/installer/v1alpha1/aws_credential_manager_types.go‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ type AwsCredentialManagerSpec struct {
8585
VolumeMounts []core.VolumeMount `json:"volumeMounts"`
8686
// +optional
8787
Distro shared.DistroSpec `json:"distro"`
88+
// +optional
89+
Apiserver AwsCredentialManagerApiserver `json:"apiserver"`
90+
// +optional
91+
BucketAccessor BucketAccessor `json:"bucketAccessor"`
8892
}
8993

9094
type ImageReference struct {
@@ -99,6 +103,23 @@ type ServiceSpec struct {
99103
Port int `json:"port"`
100104
}
101105

106+
type AwsCredentialManagerApiserver struct {
107+
GroupPriorityMinimum int `json:"groupPriorityMinimum"`
108+
VersionPriority int `json:"versionPriority"`
109+
EnableMutatingWebhook bool `json:"enableMutatingWebhook"`
110+
EnableValidatingWebhook bool `json:"enableValidatingWebhook"`
111+
Ca string `json:"ca"`
112+
BypassValidatingWebhookXray bool `json:"bypassValidatingWebhookXray"`
113+
UseKubeapiserverFqdnForAks bool `json:"useKubeapiserverFqdnForAks"`
114+
Healthcheck HealthcheckSpec `json:"healthcheck"`
115+
ServingCerts ServingCerts `json:"servingCerts"`
116+
}
117+
118+
type BucketAccessor struct {
119+
AwsMaxIntervalSeconds string `json:"awsMaxIntervalSeconds"`
120+
AwsMaxWaitSeconds string `json:"awsMaxWaitSeconds"`
121+
}
122+
102123
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
103124

104125
// AwsCredentialManagerList is a list of AwsCredentialManagers

‎apis/installer/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 34 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎charts/aws-credential-manager/README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,13 @@ The following table lists the configurable parameters of the `aws-credential-man
6767
| service.port | | <code>8081</code> |
6868
| resources | | <code>{}</code> |
6969
| livenessProbe.httpGet.path | | <code>/healthz</code> |
70-
| livenessProbe.httpGet.port | | <code>http</code> |
70+
| livenessProbe.httpGet.port | | <code>8081</code> |
71+
| livenessProbe.httpGet.scheme | | <code>HTTP</code> |
7172
| livenessProbe.initialDelaySeconds | | <code>15</code> |
7273
| livenessProbe.periodSeconds | | <code>20</code> |
7374
| readinessProbe.httpGet.path | | <code>/readyz</code> |
74-
| readinessProbe.httpGet.port | | <code>http</code> |
75+
| readinessProbe.httpGet.port | | <code>8081</code> |
76+
| readinessProbe.httpGet.scheme | | <code>HTTP</code> |
7577
| readinessProbe.initialDelaySeconds | | <code>5</code> |
7678
| readinessProbe.periodSeconds | | <code>10</code> |
7779
| volumes | Additional volumes on the output Deployment definition. | <code>[]</code> |
@@ -95,7 +97,6 @@ The following table lists the configurable parameters of the `aws-credential-man
9597
| apiserver.servingCerts.caCrt | CA certficate used by serving certificate of webhook server. | <code>""</code> |
9698
| apiserver.servingCerts.serverCrt | Serving certficate used by webhook server. | <code>""</code> |
9799
| apiserver.servingCerts.serverKey | Private key for the serving certificate used by webhook server. | <code>""</code> |
98-
| apiserver.webhook.failurePolicy | | <code>Ignore</code> |
99100

100101

101102
Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ spec:
5151
- --aws-max-interval-seconds={{ .Values.bucketAccessor.awsMaxIntervalSeconds }}
5252
- --aws-max-wait-seconds={{ .Values.bucketAccessor.awsMaxWaitSeconds }}
5353
ports:
54-
- name: http
55-
containerPort: {{ .Values.service.port }}
54+
- containerPort: 9443
55+
name: webhook-server
5656
protocol: TCP
5757
livenessProbe:
5858
{{- toYaml .Values.livenessProbe | nindent 12 }}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
{{ template "aws-credential-manager.prepare-certs" $ }}
12
{{- if .Values.apiserver.enableMutatingWebhook }}
23
apiVersion: admissionregistration.k8s.io/v1
34
kind: MutatingWebhookConfiguration
45
metadata:
5-
name: {{ template "aws-credential-manager.fullname" . }}
6+
name: {{ include "aws-credential-manager.fullname" . }}
67
labels:
78
{{- include "aws-credential-manager.labels" . | nindent 4 }}
89
webhooks:
@@ -25,7 +26,7 @@ webhooks:
2526
clientConfig:
2627
service:
2728
namespace: {{ .Release.Namespace }}
28-
name: {{ include "aws-credential-manager.fullname" . }}
29+
name: {{ include "aws-credential-manager.webhookServiceName" . }}
2930
path: /mutate-batch-v1-job
30-
caBundle: {{ .Values.apiserver.ca | b64enc }}
31+
caBundle: {{ $._caCrt }}
3132
{{- end }}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4-
name: {{ include "aws-credential-manager.fullname" . }}
4+
name: {{ include "aws-credential-manager.webhookServiceName" . }}
55
namespace: {{ .Release.Namespace }}
66
labels:
77
{{- include "aws-credential-manager.labels" . | nindent 4 }}
88
spec:
99
ports:
10-
- name: https
11-
port: 8443
10+
- port: 443
1211
protocol: TCP
13-
targetPort: 8443
12+
targetPort: 9443
1413
selector:
1514
{{- include "aws-credential-manager.labels" . | nindent 4 }}

‎charts/aws-credential-manager/values.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,15 @@ resources: {}
5656
livenessProbe:
5757
httpGet:
5858
path: /healthz
59-
port: http
59+
port: 8081
60+
scheme: HTTP
6061
initialDelaySeconds: 15
6162
periodSeconds: 20
6263
readinessProbe:
6364
httpGet:
6465
path: /readyz
65-
port: http
66+
port: 8081
67+
scheme: HTTP
6668
initialDelaySeconds: 5
6769
periodSeconds: 10
6870
# Additional volumes on the output Deployment definition.
@@ -123,6 +125,4 @@ apiserver:
123125
# Serving certficate used by webhook server.
124126
serverCrt: ""
125127
# Private key for the serving certificate used by webhook server.
126-
serverKey: ""
127-
webhook:
128-
failurePolicy: Ignore
128+
serverKey: ""

0 commit comments

Comments
 (0)