Merge branch 'okosse' into 'master'

[GONRG-6649] Define global vars in notification

See merge request !359

devops/gc/deploy/README.md

@@ -27,6 +27,13 @@ Packages are only needed for installation from a local computer.
 Before installing deploy Helm chart you need to install [configmap Helm chart](../configmap).
 First you need to set variables in **values.yaml** file using any code editor. Some of the values are prefilled, but you need to specify some values as well. You can find more information about them below.
 
+### Global variables
+
+| Name | Description | Type | Default |Required |
+|------|-------------|------|---------|---------|
+**global.domain** | your domain for the external endpoint, ex `example.com` | string | - | yes
+**global.onPremEnabled** | whether on-prem is enabled | boolean | false | yes
+
 ### Configmap variables
 
 | Name | Description | Type | Default |Required |
@@ -61,8 +68,6 @@ First you need to set variables in **values.yaml** file using any code editor. S
 **conf.rabbitmqSecretName** | secret for rabbitmq | string | `rabbitmq-secret` | yes
 **conf.openidSecretName** | secret for openid | string | `notification-keycloak-secret` | yes
 **conf.notificationRedisSecretName** | Notification redis secret | string | `notification-redis-secret` | yes
-**conf.onPremEnabled** | whether on-prem is enabled | boolean | false | yes
-**conf.domain** | your domain, ex `example.com` | string | - | yes
 **conf.redisSSL** | Redis  host ssl config. External redis configuration only if true | string | false | no
 
 ### Istio variables

devops/gc/deploy/templates/configmap.yaml

@@ -18,5 +18,5 @@ data:
   {{- else }}
   REDIS_HOST: {{ printf "redis-%s" .Values.conf.appName | quote }}
   {{- end }}
-  {{- if not .Values.conf.onPremEnabled }}
+  {{- if not .Values.global.onPremEnabled }}
   {{- end }}

devops/gc/deploy/templates/deployment.yaml

@@ -30,7 +30,7 @@ spec:
               name: {{ .Values.conf.configmap  | quote}}
           - secretRef:
               name: {{ .Values.conf.notificationRedisSecretName | quote }}
-          {{- if .Values.conf.onPremEnabled }}
+          {{- if .Values.global.onPremEnabled }}
           - secretRef:
               name: {{ .Values.conf.rabbitmqSecretName  | quote}}
           - secretRef:

devops/gc/deploy/templates/service-account.yaml

-{{- if .Values.conf.onPremEnabled }}
+{{- if .Values.global.onPremEnabled }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:

devops/gc/deploy/templates/service.yaml

@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: {{ .Values.conf.appName  | quote}}
   annotations:
-  {{- if not .Values.conf.onPremEnabled }}
+  {{- if not .Values.global.onPremEnabled }}
     cloud.google.com/neg: '{"ingress": true}'
   {{- end }}
   namespace: {{ .Release.Namespace  | quote}}

devops/gc/deploy/templates/virtual-service.yaml

@@ -5,10 +5,10 @@ metadata:
   namespace: {{ .Release.Namespace  | quote}}
 spec:
   hosts:
-    {{- if and .Values.conf.domain .Values.conf.onPremEnabled }}
-    - {{ printf "osdu.%s" .Values.conf.domain | quote }}
-    {{- else if .Values.conf.domain }}
-    - {{ .Values.conf.domain | quote }}
+    {{- if and .Values.global.domain .Values.global.onPremEnabled }}
+    - {{ printf "osdu.%s" .Values.global.domain | quote }}
+    {{- else if .Values.global.domain }}
+    - {{ .Values.global.domain | quote }}
     {{- else }}
     - "*"
     {{- end }}

devops/gc/deploy/values.yaml

+global:
+  domain: ""
+  onPremEnabled: false
+
 data:
   #Configmaps
   logLevel: "ERROR"
@@ -24,8 +28,6 @@ conf:
   rabbitmqSecretName: "rabbitmq-secret"
   openidSecretName: "notification-keycloak-secret"
   notificationRedisSecretName: "notification-redis-secret"
-  onPremEnabled: false
-  domain: ""
   redisSSL: false
 
 istio: