Enforce root component's enabled value (#6)

keephq · Mar 4, 2024 · bd5f3e8 · bd5f3e8
1 parent 03aa912
commit bd5f3e8
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 6 deletions.
diff --git a/charts/keep/templates/backend-hpa.yaml b/charts/keep/templates/backend-hpa.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.backend.autoscaling.enabled }}
+{{- if and .Values.backend.enabled .Values.backend.autoscaling.enabled }}
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:

diff --git a/charts/keep/templates/backend-ingress.yaml b/charts/keep/templates/backend-ingress.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.backend.ingress.enabled -}}
+{{- if and .Values.backend.enabled .Values.backend.ingress.enabled -}}
 {{- $fullName := include "keep.fullname" . -}}
 {{- $svcPort := .Values.backend.service.port -}}
 {{- if and .Values.backend.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}

diff --git a/charts/keep/templates/backend-route.yaml b/charts/keep/templates/backend-route.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.backend.route.enabled -}}
+{{- if and .Values.backend.enabled .Values.backend.route.enabled -}}
 {{- $fullName := include "keep.fullname" . -}}
 apiVersion: route.openshift.io/v1
 kind: Route

diff --git a/charts/keep/templates/frontend-hpa.yaml b/charts/keep/templates/frontend-hpa.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.frontend.autoscaling.enabled }}
+{{- if and .Values.frontend.enabled .Values.frontend.autoscaling.enabled }}
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:

diff --git a/charts/keep/templates/frontend-ingress.yaml b/charts/keep/templates/frontend-ingress.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.frontend.ingress.enabled -}}
+{{- if and .Values.frontend.enabled .Values.frontend.ingress.enabled -}}
 {{- $fullName := include "keep.fullname" . -}}
 {{- $svcPort := .Values.frontend.service.port -}}
 {{- if and .Values.frontend.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}

diff --git a/charts/keep/templates/frontend-route.yaml b/charts/keep/templates/frontend-route.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.frontend.route.enabled -}}
+{{- if and .Values.frontend.enabled .Values.frontend.route.enabled -}}
 {{- $fullName := include "keep.fullname" . -}}
 apiVersion: route.openshift.io/v1
 kind: Route

diff --git a/charts/keep/templates/keep-backend-service.yaml b/charts/keep/templates/keep-backend-service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.backend.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -15,3 +16,4 @@ spec:
   selector:
     {{- include "keep.selectorLabels" . | nindent 4 }}
     keep-component: backend
+{{- end }}
diff --git a/charts/keep/templates/keep-backend.yaml b/charts/keep/templates/keep-backend.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.backend.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -85,3 +86,4 @@ spec:
       volumes:
         - name: state-volume
           emptyDir: {}
+{{- end }}
diff --git a/charts/keep/templates/keep-db-pv.yaml b/charts/keep/templates/keep-db-pv.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.database.enabled -}}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -11,3 +12,4 @@ spec:
   storageClassName: {{ .Values.database.storageClasss }}
   hostPath:
     path: "/var/lib/mysql"
+{{- end }}
diff --git a/charts/keep/templates/keep-db-pvc.yaml b/charts/keep/templates/keep-db-pvc.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.database.enabled -}}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -9,3 +10,4 @@ spec:
   resources:
     requests:
       storage: 5Gi
+{{- end }}
diff --git a/charts/keep/templates/keep-db-service.yaml b/charts/keep/templates/keep-db-service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.database.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -15,3 +16,4 @@ spec:
   selector:
     {{- include "keep.selectorLabels" . | nindent 4 }}
     keep-component: database
+{{- end }}
diff --git a/charts/keep/templates/keep-db.yaml b/charts/keep/templates/keep-db.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.database.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -66,3 +67,4 @@ spec:
         - name: {{ include "keep.fullname" . }}-pv
           persistentVolumeClaim:
             claimName: {{ include "keep.fullname" . }}-pvc
+{{- end }}
diff --git a/charts/keep/templates/keep-frontend-service.yaml b/charts/keep/templates/keep-frontend-service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.frontend.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -15,3 +16,4 @@ spec:
   selector:
     {{- include "keep.selectorLabels" . | nindent 4 }}
     keep-component: frontend
+{{- end}}
diff --git a/charts/keep/templates/keep-frontend.yaml b/charts/keep/templates/keep-frontend.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.frontend.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -73,3 +74,4 @@ spec:
       volumes:
         - name: state-volume
           emptyDir: {}
+{{- end }}
diff --git a/charts/keep/templates/keep-websocket-server-service.yaml b/charts/keep/templates/keep-websocket-server-service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.websocket.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -15,3 +16,4 @@ spec:
   selector:
     {{- include "keep.selectorLabels" . | nindent 4 }}
     keep-component: websocket
+{{- end}}
diff --git a/charts/keep/templates/keep-websocket-server.yaml b/charts/keep/templates/keep-websocket-server.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.websocket.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -73,3 +74,4 @@ spec:
       volumes:
         - name: state-volume
           emptyDir: {}
+{{- end}}