Merge pull request #5 from perfana/improve-perfana-auth-proxy

Improve perfana auth proxy

Author: andrejvanderzee

charts/perfana-auth-proxy/Chart.yaml

@@ -7,7 +7,7 @@ keywords:
 - mTLS
 - authentication
 - proxy
-version: 0.1.6
+version: 0.1.7
 appVersion: 1.23.3-alpine
 maintainers:
 - name: Andrej van der Zee

charts/perfana-auth-proxy/templates/tests/smoketest.yaml

@@ -13,18 +13,18 @@ spec:
   - name: smoketest
     securityContext:
       {{- toYaml .Values.securityContext | nindent 10 }}
-    image: frapsoft/openssl
+    image: alpine/openssl
     command: 
     - sh 
     - -ec
     args: 
     - | 
       echo Checking connectivity service http://{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}
-      wget -O- -q http://{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}
+      wget -O- -q --timeout=2 g--tries=2 http://{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}
       echo
 
       echo Checking connectivity {{ .Values.perfanaURL }}/api/status
-      wget -O- -q {{ .Values.perfanaURL }}/api/status
+      wget -O- -q --timeout=2 g--tries=2 {{ .Values.perfanaURL }}/api/status
       echo
 
       echo Checking matching certificate and private key
@@ -46,29 +46,29 @@ spec:
       export BASIC_AUTH_USERNAME={{ .Values.basicAuthSecret.username }}
       export BASIC_AUTH_PASSWORD={{ .Values.basicAuthSecret.password }}
       echo Checking connectivity to http://$BASIC_AUTH_USERNAME:*****@{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}/api/status
-      wget -O- -q http://$BASIC_AUTH_USERNAME:$BASIC_AUTH_PASSWORD@{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}/api/status
+      wget -O- -q --timeout=2 g--tries=2 http://$BASIC_AUTH_USERNAME:$BASIC_AUTH_PASSWORD@{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}/api/status
       echo
 
       echo Checking connectivity to http://$BASIC_AUTH_USERNAME:*****@{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}/mimir/api/v1/status/buildinfo
-      wget -O- -q http://$BASIC_AUTH_USERNAME:$BASIC_AUTH_PASSWORD@{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}/mimir/api/v1/status/buildinfo > /dev/null
+      wget -O- -q --timeout=2 g--tries=2 http://$BASIC_AUTH_USERNAME:$BASIC_AUTH_PASSWORD@{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}/mimir/api/v1/status/buildinfo > /dev/null
       echo OK
 
       echo Checking connectivity to http://$BASIC_AUTH_USERNAME:*****@{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}/influxdb/ping
-      wget -O- -q http://$BASIC_AUTH_USERNAME:$BASIC_AUTH_PASSWORD@{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}/influxdb/ping
+      wget -O- -q --timeout=2 g--tries=2 http://$BASIC_AUTH_USERNAME:$BASIC_AUTH_PASSWORD@{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}/influxdb/ping
       echo OK
 
       {{- else if not .Values.basicAuth.enabled }}
 
       echo Checking connectivity to http://{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}/api/status
-      wget -O- -q http://{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}/api/status
+      wget -O- -q --timeout=2 g--tries=2 http://{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}/api/status
       echo
 
       echo Checking connectivity to http://{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}/mimir/api/v1/status/buildinfo
-      wget -O- -q http://{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}/mimir/api/v1/status/buildinfo > /dev/null
+      wget -O- -q --timeout=2 g--tries=2 http://{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}/mimir/api/v1/status/buildinfo > /dev/null
       echo OK
 
       echo Checking connectivity to http://{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}/influxdb/ping
-      wget -O- -q http://{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}/influxdb/ping
+      wget -O- -q --timeout=2 g--tries=2 http://{{ include "perfana-auth-proxy.fullname" . }}:{{ .Values.service.port }}/influxdb/ping
       echo OK
       {{- end }}