Allow configuration of armada-api/tiller probes
Allows to configure the probes via values.yaml in both the armada charts, which includes armada and tiller containers, and in the standalone tiller chart Also bumps the osh sha in tools/helm_tk.sh to latest 22ef25ab295d6b7c6797cfffaa77cf181c673e9b Change-Id: I0bb0acf00ecc0b61f8d324fe9b6a8507c361e9fc
This commit is contained in:
parent
d593bdbffe
commit
d90eb125ed
|
@ -14,6 +14,26 @@ See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/}}
|
*/}}
|
||||||
|
|
||||||
|
{{- define "armadaApiProbeTemplate" }}
|
||||||
|
httpGet:
|
||||||
|
path: /api/v1.0/health
|
||||||
|
port: {{ tuple "armada" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{- define "tillerReadinessProbeTemplate" }}
|
||||||
|
httpGet:
|
||||||
|
path: /readiness
|
||||||
|
port: 44135
|
||||||
|
scheme: HTTP
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{- define "tillerLivenessProbeTemplate" }}
|
||||||
|
httpGet:
|
||||||
|
path: /liveness
|
||||||
|
port: 44135
|
||||||
|
scheme: HTTP
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
{{- if .Values.manifests.deployment_api }}
|
{{- if .Values.manifests.deployment_api }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $mounts_armada_api := .Values.pod.mounts.armada_api.armada_api }}
|
{{- $mounts_armada_api := .Values.pod.mounts.armada_api.armada_api }}
|
||||||
|
@ -109,19 +129,8 @@ spec:
|
||||||
ports:
|
ports:
|
||||||
- name: armada-api
|
- name: armada-api
|
||||||
containerPort: {{ tuple "armada" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
containerPort: {{ tuple "armada" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||||
livenessProbe:
|
{{ dict "envAll" $envAll "component" "armada" "container" "api" "type" "readiness" "probeTemplate" (include "armadaApiProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | trim | indent 10 }}
|
||||||
httpGet:
|
{{ dict "envAll" $envAll "component" "armada" "container" "api" "type" "liveness" "probeTemplate" (include "armadaApiProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | trim | indent 10 }}
|
||||||
path: /api/v1.0/health
|
|
||||||
port: {{ tuple "armada" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
|
||||||
initialDelaySeconds: 15
|
|
||||||
periodSeconds: 10
|
|
||||||
readinessProbe:
|
|
||||||
httpGet:
|
|
||||||
scheme: HTTP
|
|
||||||
path: /api/v1.0/health
|
|
||||||
port: {{ tuple "armada" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
|
||||||
initialDelaySeconds: 15
|
|
||||||
periodSeconds: 10
|
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: pod-tmp
|
- name: pod-tmp
|
||||||
mountPath: /tmp
|
mountPath: /tmp
|
||||||
|
@ -175,26 +184,8 @@ spec:
|
||||||
- name: tiller
|
- name: tiller
|
||||||
containerPort: {{ .Values.conf.tiller.port }}
|
containerPort: {{ .Values.conf.tiller.port }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
readinessProbe:
|
{{ dict "envAll" $envAll "component" "armada" "container" "tiller" "type" "readiness" "probeTemplate" (include "tillerReadinessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | trim | indent 10 }}
|
||||||
failureThreshold: 3
|
{{ dict "envAll" $envAll "component" "armada" "container" "tiller" "type" "liveness" "probeTemplate" (include "tillerLivenessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | trim | indent 10 }}
|
||||||
httpGet:
|
|
||||||
path: /readiness
|
|
||||||
port: 44135
|
|
||||||
scheme: HTTP
|
|
||||||
initialDelaySeconds: 1
|
|
||||||
periodSeconds: 10
|
|
||||||
successThreshold: 1
|
|
||||||
timeoutSeconds: 1
|
|
||||||
livenessProbe:
|
|
||||||
failureThreshold: 3
|
|
||||||
httpGet:
|
|
||||||
path: /liveness
|
|
||||||
port: 44135
|
|
||||||
scheme: HTTP
|
|
||||||
initialDelaySeconds: 1
|
|
||||||
periodSeconds: 10
|
|
||||||
successThreshold: 1
|
|
||||||
timeoutSeconds: 1
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{ if $mounts_armada_api.volumeMounts }}{{ toYaml $mounts_armada_api.volumeMounts | indent 12 }}{{ end }}
|
{{ if $mounts_armada_api.volumeMounts }}{{ toYaml $mounts_armada_api.volumeMounts | indent 12 }}{{ end }}
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
@ -225,6 +225,36 @@ monitoring:
|
||||||
port: 8000
|
port: 8000
|
||||||
|
|
||||||
pod:
|
pod:
|
||||||
|
probes:
|
||||||
|
armada:
|
||||||
|
api:
|
||||||
|
readiness:
|
||||||
|
enabled: true
|
||||||
|
params:
|
||||||
|
initialDelaySeconds: 15
|
||||||
|
periodSeconds: 10
|
||||||
|
liveness:
|
||||||
|
enabled: true
|
||||||
|
params:
|
||||||
|
initialDelaySeconds: 15
|
||||||
|
periodSeconds: 10
|
||||||
|
tiller:
|
||||||
|
readiness:
|
||||||
|
enabled: true
|
||||||
|
params:
|
||||||
|
failureThreshold: 3
|
||||||
|
initialDelaySeconds: 1
|
||||||
|
periodSeconds: 10
|
||||||
|
successThreshold: 1
|
||||||
|
timeoutSeconds: 1
|
||||||
|
liveness:
|
||||||
|
enabled: true
|
||||||
|
params:
|
||||||
|
failureThreshold: 3
|
||||||
|
initialDelaySeconds: 1
|
||||||
|
periodSeconds: 10
|
||||||
|
successThreshold: 1
|
||||||
|
timeoutSeconds: 1
|
||||||
security_context:
|
security_context:
|
||||||
armada:
|
armada:
|
||||||
pod:
|
pod:
|
||||||
|
|
|
@ -14,6 +14,20 @@ See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/}}
|
*/}}
|
||||||
|
|
||||||
|
{{- define "tillerReadinessProbeTemplate" }}
|
||||||
|
httpGet:
|
||||||
|
scheme: HTTP
|
||||||
|
path: /readiness
|
||||||
|
port: 44135
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{- define "tillerLivenessProbeTemplate" }}
|
||||||
|
httpGet:
|
||||||
|
scheme: HTTP
|
||||||
|
path: /liveness
|
||||||
|
port: 44135
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
{{- if .Values.manifests.deployment_tiller }}
|
{{- if .Values.manifests.deployment_tiller }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $serviceAccountName := "tiller-deploy" }}
|
{{- $serviceAccountName := "tiller-deploy" }}
|
||||||
|
@ -98,25 +112,7 @@ spec:
|
||||||
- name: tiller
|
- name: tiller
|
||||||
containerPort: 44134
|
containerPort: 44134
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
readinessProbe:
|
{{ dict "envAll" $envAll "component" "tiller" "container" "tiller" "type" "readiness" "probeTemplate" (include "tillerReadinessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | trim | indent 10 }}
|
||||||
failureThreshold: 3
|
{{ dict "envAll" $envAll "component" "tiller" "container" "tiller" "type" "liveness" "probeTemplate" (include "tillerLivenessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | trim | indent 10 }}
|
||||||
httpGet:
|
|
||||||
path: /readiness
|
|
||||||
port: 44135
|
|
||||||
scheme: HTTP
|
|
||||||
initialDelaySeconds: 1
|
|
||||||
periodSeconds: 10
|
|
||||||
successThreshold: 1
|
|
||||||
timeoutSeconds: 1
|
|
||||||
livenessProbe:
|
|
||||||
failureThreshold: 3
|
|
||||||
httpGet:
|
|
||||||
path: /liveness
|
|
||||||
port: 44135
|
|
||||||
scheme: HTTP
|
|
||||||
initialDelaySeconds: 1
|
|
||||||
periodSeconds: 10
|
|
||||||
successThreshold: 1
|
|
||||||
timeoutSeconds: 1
|
|
||||||
status: {}
|
status: {}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
|
@ -51,6 +51,25 @@ conf:
|
||||||
prestop_sleep: 30
|
prestop_sleep: 30
|
||||||
|
|
||||||
pod:
|
pod:
|
||||||
|
probes:
|
||||||
|
tiller:
|
||||||
|
tiller:
|
||||||
|
readiness:
|
||||||
|
enabled: true
|
||||||
|
params:
|
||||||
|
failureThreshold: 3
|
||||||
|
initialDelaySeconds: 1
|
||||||
|
periodSeconds: 10
|
||||||
|
successThreshold: 1
|
||||||
|
timeoutSeconds: 1
|
||||||
|
liveness:
|
||||||
|
enabled: true
|
||||||
|
params:
|
||||||
|
failureThreshold: 3
|
||||||
|
initialDelaySeconds: 1
|
||||||
|
periodSeconds: 10
|
||||||
|
successThreshold: 1
|
||||||
|
timeoutSeconds: 1
|
||||||
resources:
|
resources:
|
||||||
enabled: false
|
enabled: false
|
||||||
tiller:
|
tiller:
|
||||||
|
|
|
@ -22,7 +22,7 @@ HELM=${1}
|
||||||
HELM_PIDFILE=${2}
|
HELM_PIDFILE=${2}
|
||||||
SERVE_DIR=$(mktemp -d)
|
SERVE_DIR=$(mktemp -d)
|
||||||
|
|
||||||
HTK_STABLE_COMMIT=${HTK_COMMIT:-"200b5e902b3a176fbfbe669b6a10a254c9b50f5d"}
|
HTK_STABLE_COMMIT=${HTK_COMMIT:-"22ef25ab295d6b7c6797cfffaa77cf181c673e9b"}
|
||||||
|
|
||||||
${HELM} init --client-only
|
${HELM} init --client-only
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue