conditionals for templates and error messages

Author: elai-shalev

charts/backstage/templates/network-policies.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.orchestrator.serverlessLogicOperator.enabled }}
+{{- if and .Values.orchestrator.enabled .Values.orchestrator.serverlessLogicOperator.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
@@ -52,7 +52,7 @@ spec:
 
 {{- end }}
 ---
-{{- if .Values.orchestrator.sonataflowPlatform.monitoring.enabled }}
+{{- if and .Values.orchestrator.enabled .Values.orchestrator.sonataflowPlatform.monitoring.enabled }}
 # NetworkPolicy to allow openshift-user-workload-monitoring pods to access all pods within the workflow's namespace
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy

charts/backstage/templates/sonataflows.yaml

@@ -1,6 +1,6 @@
 {{- if and (default false .Values.orchestrator.enabled) (default false .Values.orchestrator.serverlessLogicOperator.enabled) }}
 {{- $sonataflowplatformExists := lookup "sonataflow.org/v1alpha08" "SonataFlowPlatform" .Release.Namespace "sonataflow-platform" }}
-{{- if $sonataflowplatformExists }}
+{{- if and .Release.IsInstall $sonataflowplatformExists }}
 {{- fail "Cannot create multiple sonataflowplatform in the same namespace, one already exists." }}
 {{- end }}
 
@@ -113,14 +113,14 @@ spec:
               key: password
         command: [ "sh", "-c" ]
         args:
-          - "psql -h {{ .Release.Name }}-postgresql -U postgres -c 'CREATE DATABASE sonataflow;'"
+          - "psql -h {{ .Release.Name }}-postgresql -U postgres -c 'CREATE DATABASE sonataflow;' || echo WARNING: Could not create database"
 {{- else }}
             secretKeyRef:
               name: {{ .Values.orchestrator.sonataflowPlatform.externalDBsecretRef}}
               key: POSTGRES_PASSWORD
         command: [ "sh", "-c" ]
         args:
-          - "psql -h {{ .Values.upstream.backstage.appConfig.backend.database.connection.host }} -U {{ .Values.upstream.backstage.appConfig.backend.database.connection.user }} -d {{ .Values.orchestrator.sonataflowPlatform.externalDBName }} -c 'CREATE DATABASE sonataflow;'"
+          - "psql -h {{ .Values.upstream.backstage.appConfig.backend.database.connection.host }} -U {{ .Values.upstream.backstage.appConfig.backend.database.connection.user }} -d {{ .Values.orchestrator.sonataflowPlatform.externalDBName }} -c 'CREATE DATABASE sonataflow;' || echo WARNING: Could not create database"
 {{- end }}
       restartPolicy: Never
   backoffLimit: 2