more ci tweaking

colearendt · May 12, 2022 · 56bc0a4 · 56bc0a4
1 parent c45e3c7
commit 56bc0a4
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 13 deletions.
diff --git a/charts/generic/ci/all-values.yaml b/charts/generic/ci/all-values.yaml
@@ -1,7 +1,7 @@
 replicaCount: 1
 
 image:
-  repository: ubuntu
+  repository: nginx
   pullPolicy: IfNotPresent
   # -- Overrides the image tag whose default is the chart appVersion.
   tag: ""
@@ -23,11 +23,8 @@ pod:
   securityContext: {}
     # fsGroup: 2000
 
-command:
-  - "sh"
-  - "-c"
-args:
-  - "'echo hi'"
+command: []
+args: []
 
 serviceAccount:
   # -- Specifies whether a service account should be created
@@ -104,10 +101,7 @@ extraObjects:
       something: {{ printf "special" }}
 
 readinessProbe: null
-livenessProbe:
-  httpGet:
-    path: /
-    port: http
+livenessProbe: null
 startupProbe:
   httpGet:
     path: /

diff --git a/charts/postgrest/ci/complex-values.yaml b/charts/postgrest/ci/complex-values.yaml
@@ -6,6 +6,8 @@ ingress:
   hosts:
     - host: chart-example.local
       paths: [/]
+postgrest:
+  dbAnonRole: someRole
 extraObjects:
   - apiVersion: v1
     kind: ConfigMap

diff --git a/charts/postgrest/ci/empty-values.yaml b/charts/postgrest/ci/empty-values.yaml
@@ -0,0 +1,2 @@
+postgrest:
+  dbAnonRole: someRole
diff --git a/charts/postgrest/ci/simple-values.yaml b/charts/postgrest/ci/simple-values.yaml
@@ -1,6 +1,7 @@
 postgrest:
   dbUri: some-secret
   jwtSecret: another-secret
+  dbAnonRole: someRole
 pod:
   env:
     - name: TEST

diff --git a/charts/postgrest/templates/deployment.yaml b/charts/postgrest/templates/deployment.yaml
@@ -135,12 +135,18 @@ spec:
             - name: http
               containerPort: {{ .Values.pod.containerPort }}
               protocol: TCP
+          {{- with .Values.pod.readinessProbe }}
           readinessProbe:
-            {{- toYaml .Values.pod.readinessProbe | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.pod.livenessProbe }}
           livenessProbe:
-            {{- toYaml .Values.pod.livenessProbe | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.pod.startupProbe }}
           startupProbe:
-            {{- toYaml .Values.pod.startupProbe | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:

diff --git a/charts/traefik-forward-auth/ci/empty-values.yaml b/charts/traefik-forward-auth/ci/empty-values.yaml
@@ -0,0 +1,5 @@
+config:
+  secret: something-secret
+  providers.oidc.issuer-url: https://demo.okta.com
+  providers.oidc.client-id: auth
+  providers.oidc.client-secret: super-secret
diff --git a/charts/traefik-forward-auth/ci/simple-values.yaml b/charts/traefik-forward-auth/ci/simple-values.yaml
@@ -1,2 +1,7 @@
 ingress:
   enabled: true
+config:
+  secret: secrety-secret
+  providers.oidc.issuer-url: https://demo.okta.com
+  providers.oidc.client-id: auth
+  providers.oidc.client-secret: super-secret