diff --git a/Makefile b/Makefile deleted file mode 100644 index c894ba4..0000000 --- a/Makefile +++ /dev/null @@ -1,5 +0,0 @@ - -package: - cd charts/statping && helm package . - helm repo index ./charts --merge index.yaml - rm -rf charts/statping/*.tgz diff --git a/charts/statping/Chart.yaml b/charts/statping/Chart.yaml index f485f21..821df03 100644 --- a/charts/statping/Chart.yaml +++ b/charts/statping/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 appVersion: "0.90.74" -version: 0.0.2 +version: 0.0.3 icon: https://statping.github.io/charts/statping/assets/images/icon.png name: statping description: Statping for Kubernetes diff --git a/charts/statping/templates/configmap.yaml b/charts/statping/templates/configmap.yaml index b78f002..60d6a85 100644 --- a/charts/statping/templates/configmap.yaml +++ b/charts/statping/templates/configmap.yaml @@ -5,3 +5,12 @@ metadata: data: PORT: {{ .Values.service.port | quote }} DB_CONN: {{ .Values.database.connection | quote }} + DB_HOST: {{ .Values.database.host | quote }} + DB_PORT: {{ .Values.database.port | quote }} + DB_USER: {{ .Values.database.username | quote }} + DB_PASS: {{ .Values.database.password | quote }} + DB_DATABASE: {{ .Values.database.database | quote }} + POSTGRES_SSLMODE: {{ .Values.database.sslMode | quote }} + READ_ONLY: {{ .Values.database.readOnly | quote }} + DISABLE_COLORS: {{ .Values.disableColors | quote }} + DEBUG: {{ .Values.debugMode | quote }} diff --git a/charts/statping/templates/deployment.yaml b/charts/statping/templates/deployment.yaml index 16f7426..a8c2650 100644 --- a/charts/statping/templates/deployment.yaml +++ b/charts/statping/templates/deployment.yaml @@ -41,10 +41,6 @@ spec: livenessProbe: httpGet: path: {{ .Values.livenessProbe.httpGet.path }} - {{- if .Values.livenessProbe.httpGet.httpHeaders }} - httpHeaders: -{{ toYaml .Values.livenessProbe.httpGet.httpHeaders | indent 16 }} - {{- end }} port: http initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.livenessProbe.periodSeconds }} diff --git a/charts/statping/values.yaml b/charts/statping/values.yaml index 166286a..8ff0b9e 100644 --- a/charts/statping/values.yaml +++ b/charts/statping/values.yaml @@ -3,6 +3,16 @@ replicaCount: 1 database: connection: sqlite + host: localhost + port: 5432 + username: root + password: password123 + database: statping_db + sslMode: "ssl_mode=disable" + readOnly: false + +disableColors: true +debugMode: 1 image: # image.repository -- https://hub.docker.com/r/statping/statping @@ -54,10 +64,7 @@ affinity: {} livenessProbe: httpGet: - path: /health - httpHeaders: - - name: x-echo-code - value: "200" + path: /api initialDelaySeconds: 5 periodSeconds: 10 timeoutSeconds: 2