fix(chart)!: move policy catalogue values from root into thymus conta…

…iner (#26) Signed-off-by: Sven Trieflinger <[email protected]>
carbynestack · Nov 13, 2024 · 43ed16f · 43ed16f
1 parent 053d3bd
commit 43ed16f
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 36 deletions.
diff --git a/charts/thymus/templates/access-control/catalogue/deployment.yaml b/charts/thymus/templates/access-control/catalogue/deployment.yaml
@@ -17,7 +17,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
 spec:
-  replicas: {{ .Values.policyCatalogue.replicaCount }}
+  replicas: {{ .Values.thymus.policyCatalogue.replicaCount }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "thymus.name" . }}-policy-catalogue
@@ -28,16 +28,16 @@ spec:
         app.kubernetes.io/name: {{ include "thymus.name" . }}-policy-catalogue
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
-      {{- if .Values.policyCatalogue.image.pullSecrets }}
+      {{- if .Values.thymus.policyCatalogue.image.pullSecrets }}
       imagePullSecrets:
-        {{- range .Values.policyCatalogue.image.pullSecrets }}
+        {{- range .Values.thymus.policyCatalogue.image.pullSecrets }}
         - name: {{ . }}
         {{- end}}
       {{- end}}
       containers:
       - name: "{{ .Chart.Name }}-policy-catalogue"
-        image: "{{ .Values.policyCatalogue.image.registry }}/{{ .Values.policyCatalogue.image.repository }}:{{ .Values.policyCatalogue.image.tag }}"
-        imagePullPolicy: {{ .Values.policyCatalogue.image.pullPolicy }}
+        image: "{{ .Values.thymus.policyCatalogue.image.registry }}/{{ .Values.thymus.policyCatalogue.image.repository }}:{{ .Values.thymus.policyCatalogue.image.tag }}"
+        imagePullPolicy: {{ .Values.thymus.policyCatalogue.image.pullPolicy }}
         env:
           # OPA service URL provided as configmap by OPA operator
           - name: OPA_SERVICE_URL
@@ -53,13 +53,13 @@ spec:
           httpGet:
             path: /health
             port: 8080
-          periodSeconds: {{ .Values.policyCatalogue.probes.liveness.period }}
-          initialDelaySeconds: {{ .Values.policyCatalogue.probes.liveness.initialDelay }}
-          failureThreshold: {{ .Values.policyCatalogue.probes.liveness.failureThreshold }}
+          periodSeconds: {{ .Values.thymus.policyCatalogue.probes.liveness.period }}
+          initialDelaySeconds: {{ .Values.thymus.policyCatalogue.probes.liveness.initialDelay }}
+          failureThreshold: {{ .Values.thymus.policyCatalogue.probes.liveness.failureThreshold }}
         readinessProbe:
           httpGet:
             path: /health
             port: 8080
-          periodSeconds: {{ .Values.policyCatalogue.probes.readiness.period }}
-          initialDelaySeconds: {{ .Values.policyCatalogue.probes.readiness.initialDelay }}
-          failureThreshold: {{ .Values.policyCatalogue.probes.readiness.failureThreshold }}
+          periodSeconds: {{ .Values.thymus.policyCatalogue.probes.readiness.period }}
+          initialDelaySeconds: {{ .Values.thymus.policyCatalogue.probes.readiness.initialDelay }}
+          failureThreshold: {{ .Values.thymus.policyCatalogue.probes.readiness.failureThreshold }}
diff --git a/charts/thymus/templates/access-control/catalogue/service.yaml b/charts/thymus/templates/access-control/catalogue/service.yaml
@@ -11,9 +11,9 @@ kind: Service
 metadata:
   name: {{ include "thymus.fullname" . }}-policy-catalogue
   namespace: {{ .Release.Namespace }}
-  {{- if .Values.policyCatalogue.service.annotations }}
+  {{- if .Values.thymus.policyCatalogue.service.annotations }}
   annotations:
-{{ .Values.policyCatalogue.service.annotations | toYaml | trim | indent 4 }}
+{{ .Values.thymus.policyCatalogue.service.annotations | toYaml | trim | indent 4 }}
   {{- end}}
 spec:
   selector:
@@ -22,5 +22,5 @@ spec:
   ports:
     - name: http
       protocol: TCP
-      port: {{ .Values.policyCatalogue.service.port }}
+      port: {{ .Values.thymus.policyCatalogue.service.port }}
       targetPort: http
diff --git a/charts/thymus/templates/virtual-service.yaml b/charts/thymus/templates/virtual-service.yaml
@@ -71,7 +71,7 @@ spec:
       route:
         - destination:
             port:
-              number: {{ .Values.policyCatalogue.service.port }}
+              number: {{ .Values.thymus.policyCatalogue.service.port }}
             host: {{ include "thymus.fullname" . }}-policy-catalogue
     - name: "Kratos Public API route"
       match:

diff --git a/charts/thymus/values.yaml b/charts/thymus/values.yaml
@@ -28,27 +28,27 @@ thymus:
         email: [email protected]
         password: "86KIo6<]!/V="
 
-# Policy Catalogue configuration
-policyCatalogue:
-  replicaCount: 1
-  service:
-    port: 8080
-    annotations: []
-  image:
-    registry: ghcr.io
-    repository: carbynestack/thymus/policy-catalogue
-    tag: latest
-    pullPolicy: "IfNotPresent"
-    pullSecrets: []
-  probes:
-    liveness:
-        period: 10
-        initialDelay: 10
-        failureThreshold: 3
-    readiness:
-        period: 10
-        initialDelay: 10
-        failureThreshold: 3
+  # Policy Catalogue configuration
+  policyCatalogue:
+    replicaCount: 1
+    service:
+      port: 8080
+      annotations: []
+    image:
+      registry: ghcr.io
+      repository: carbynestack/thymus/policy-catalogue
+      tag: latest
+      pullPolicy: "IfNotPresent"
+      pullSecrets: []
+    probes:
+      liveness:
+          period: 10
+          initialDelay: 10
+          failureThreshold: 3
+      readiness:
+          period: 10
+          initialDelay: 10
+          failureThreshold: 3
 
 # Overrides for the Kratos subchart
 kratos: