From bd5f3e86a8b5303ba49010ef75c21321679fd22d Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 4 Mar 2024 11:02:14 -0800 Subject: [PATCH] Enforce root component's enabled value (#6) --- charts/keep/templates/backend-hpa.yaml | 2 +- charts/keep/templates/backend-ingress.yaml | 2 +- charts/keep/templates/backend-route.yaml | 2 +- charts/keep/templates/frontend-hpa.yaml | 2 +- charts/keep/templates/frontend-ingress.yaml | 2 +- charts/keep/templates/frontend-route.yaml | 2 +- charts/keep/templates/keep-backend-service.yaml | 2 ++ charts/keep/templates/keep-backend.yaml | 2 ++ charts/keep/templates/keep-db-pv.yaml | 2 ++ charts/keep/templates/keep-db-pvc.yaml | 2 ++ charts/keep/templates/keep-db-service.yaml | 2 ++ charts/keep/templates/keep-db.yaml | 2 ++ charts/keep/templates/keep-frontend-service.yaml | 2 ++ charts/keep/templates/keep-frontend.yaml | 2 ++ charts/keep/templates/keep-websocket-server-service.yaml | 2 ++ charts/keep/templates/keep-websocket-server.yaml | 2 ++ 16 files changed, 26 insertions(+), 6 deletions(-) diff --git a/charts/keep/templates/backend-hpa.yaml b/charts/keep/templates/backend-hpa.yaml index d73cdb5..dba8202 100644 --- 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 index 45c17d7..9f6d08d 100644 --- 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 index 96b4d42..682f8e8 100644 --- 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 index 16bc5aa..290685c 100644 --- 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 index 7054cba..be3736c 100644 --- 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 index 75e6b0e..23e986e 100644 --- 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 index fd20451..570b4f3 100644 --- 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 index 1c8f636..6d79e08 100644 --- 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 index 49e8536..eed270f 100644 --- 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 index d941fc2..9594af2 100644 --- 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 index 7e1d0e5..38ba5ed 100644 --- 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 index 547540d..89a8d04 100644 --- 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 index 774de3e..6a2b2d1 100644 --- 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 index bbe04e6..4db77e3 100644 --- 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 index 4911495..d8734f7 100644 --- 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 index 1744ea7..bf9709b 100644 --- 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}}