diff --git a/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl b/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl index cc54a9b1..acd7f5e1 100644 --- a/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl +++ b/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl @@ -36,27 +36,18 @@ {{- define "livenessProbeTemplate" -}} -exec: - command: - - /bin/bash - - -c - - |- - kubectl get nodes ${NODENAME} | grep ${NODENAME} - exit $? +httpGet: + path: /livez + port: {{ .Values.network.kubernetes_apiserver.port }} + scheme: HTTPS {{- end -}} {{- define "readinessProbeTemplate" -}} -exec: - command: - - /bin/bash - - -c - - |- - if [ ! -f /etc/kubernetes/apiserver/pki/apiserver-both.pem ]; then - cat /etc/kubernetes/apiserver/pki/apiserver-key.pem <(echo) /etc/kubernetes/apiserver/pki/apiserver.pem > /etc/kubernetes/apiserver/pki/apiserver-both.pem - fi - echo -e 'GET /healthz HTTP/1.0\r\n' | socat - openssl:localhost:{{ .Values.network.kubernetes_apiserver.port }},cert=/etc/kubernetes/apiserver/pki/apiserver-both.pem,cafile=/etc/kubernetes/apiserver/pki/cluster-ca.pem | grep '200 OK' - exit $? +httpGet: + path: /readyz + port: {{ .Values.network.kubernetes_apiserver.port }} + scheme: HTTPS {{- end -}} diff --git a/charts/apiserver/values.yaml b/charts/apiserver/values.yaml index 0dc94f21..0549111e 100644 --- a/charts/apiserver/values.yaml +++ b/charts/apiserver/values.yaml @@ -22,7 +22,7 @@ const: - kube-apiserver - --advertise-address=$(POD_IP) - --allow-privileged=true - - --anonymous-auth=false + - --anonymous-auth=true - --bind-address=0.0.0.0 - --client-ca-file=/etc/kubernetes/apiserver/pki/cluster-ca.pem - --etcd-cafile=/etc/kubernetes/apiserver/pki/etcd-client-ca.pem