fix: disallow override of resources if opendj is not installed

GluuFederation · Jul 7, 2022 · 7f3ae75 · 7f3ae75
1 parent 17cebec
commit 7f3ae75
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/admin-ui/templates/deployment.yml b/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/admin-ui/templates/deployment.yml
@@ -95,7 +95,7 @@ spec:
 {{- toYaml .Values.livenessProbe | nindent 10 }}
         readinessProbe:
 {{- toYaml .Values.readinessProbe | nindent 10 }}
-        {{- if or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath") }}
+        {{- if and ( .Values.global.opendj.enabled ) (or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath")) }}
         resources: {}
         {{- else if .Values.global.cloud.testEnviroment }}
         resources: {}

diff --git a/...uu/kubernetes/templates/helm/gluu/charts/auth-server-key-rotation/templates/cronjobs.yaml b/...uu/kubernetes/templates/helm/gluu/charts/auth-server-key-rotation/templates/cronjobs.yaml
@@ -67,7 +67,7 @@ spec:
                 - configMapRef:
                     name: {{ .Release.Name }}-global-user-custom-envs
                 {{- end }}
-              {{- if or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath") }}
+              {{- if and ( .Values.global.opendj.enabled ) (or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath")) }}
               resources: {}
               {{- else if .Values.global.cloud.testEnviroment }}
               resources: {}

diff --git a/...n-setup/pygluu/kubernetes/templates/helm/gluu/charts/auth-server/templates/deployment.yml b/...n-setup/pygluu/kubernetes/templates/helm/gluu/charts/auth-server/templates/deployment.yml
@@ -135,7 +135,7 @@ spec:
 {{- toYaml .Values.livenessProbe | nindent 10 }}
         readinessProbe:
 {{- toYaml .Values.readinessProbe | nindent 10 }}
-        {{- if or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath") }}
+        {{- if and ( .Values.global.opendj.enabled ) (or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath")) }}
         resources: {}
         {{- else if .Values.global.cloud.testEnviroment }}
         resources: {}

diff --git a/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/casa/templates/deployment.yaml b/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/casa/templates/deployment.yaml
@@ -104,7 +104,7 @@ spec:
 {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
 {{- toYaml .Values.readinessProbe | nindent 12 }}
-          {{- if or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath") }}
+          {{- if and ( .Values.global.opendj.enabled ) (or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath")) }}
           resources: {}
           {{- else if .Values.global.cloud.testEnviroment }}
           resources: {}

diff --git a/...n-setup/pygluu/kubernetes/templates/helm/gluu/charts/client-api/templates/deployment.yaml b/...n-setup/pygluu/kubernetes/templates/helm/gluu/charts/client-api/templates/deployment.yaml
@@ -101,7 +101,7 @@ spec:
             - name: {{ include "client-api.name" . }}-updatelbip
               mountPath: /scripts
             {{- end }}
-          {{- if or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath") }}
+          {{- if and ( .Values.global.opendj.enabled ) (or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath")) }}
           resources: {}
           {{- else if .Values.global.cloud.testEnviroment }}
           resources: {}

diff --git a/...n-setup/pygluu/kubernetes/templates/helm/gluu/charts/config-api/templates/deployment.yaml b/...n-setup/pygluu/kubernetes/templates/helm/gluu/charts/config-api/templates/deployment.yaml
@@ -88,7 +88,7 @@ spec:
             - name: {{ include "config-api.name" . }}-updatelbip
               mountPath: /scripts
             {{- end }}
-          {{- if or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath") }}
+          {{- if and ( .Values.global.opendj.enabled ) (or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath")) }}
           resources: {}
           {{- else if .Values.global.cloud.testEnviroment }}
           resources: {}

diff --git a/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/fido2/templates/deployment.yml b/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/fido2/templates/deployment.yml
@@ -100,7 +100,7 @@ spec:
 {{- toYaml .Values.livenessProbe | nindent 10 }}
         readinessProbe:
 {{- toYaml .Values.readinessProbe | nindent 10 }}
-        {{- if or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath") }}
+        {{- if and ( .Values.global.opendj.enabled ) (or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath")) }}
         resources: {}
         {{- else if .Values.global.cloud.testEnviroment }}
         resources: {}

diff --git a/...n-setup/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/templates/deployment.yaml b/...n-setup/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/templates/deployment.yaml
@@ -96,7 +96,7 @@ spec:
 {{- toYaml .Values.livenessProbe | nindent 10 }}
         readinessProbe:
 {{- toYaml .Values.readinessProbe | nindent 10 }}
-        {{- if or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath") }}
+        {{- if and ( .Values.global.opendj.enabled ) (or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath")) }}
         resources: {}
         {{- else if .Values.global.cloud.testEnviroment }}
         resources: {}

diff --git a/...etup/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/templates/statefulset.yaml b/...etup/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/templates/statefulset.yaml
@@ -95,7 +95,7 @@ spec:
 {{- toYaml .Values.livenessProbe | nindent 10 }}
         readinessProbe:
 {{- toYaml .Values.readinessProbe | nindent 10 }}
-        {{- if or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath") }}
+        {{- if and ( .Values.global.opendj.enabled ) (or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath")) }}
         resources: {}
         {{- else if .Values.global.cloud.testEnviroment }}
         resources: {}

diff --git a/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/scim/templates/deployment.yml b/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/scim/templates/deployment.yml
@@ -56,7 +56,7 @@ spec:
               /usr/bin/python3 /scripts/updatelbip.py &
               /app/scripts/entrypoint.sh
         {{- end}}
-        {{- if or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath") }}
+        {{- if and ( .Values.global.opendj.enabled ) (or (eq .Values.global.storageClass.provisioner "microk8s.io/hostpath" ) (eq .Values.global.storageClass.provisioner "k8s.io/minikube-hostpath")) }}
         resources: {}
         {{- else if .Values.global.cloud.testEnviroment }}
         resources: {}