From 8ba665db7f43431ad4707ef3f90bb92007a2df31 Mon Sep 17 00:00:00 2001
From: Oleksandr Kosse <oleksandr_kosse@epam.com>
Date: Sun, 19 Mar 2023 14:11:53 +0100
Subject: [PATCH] [GONRG-6649] Define global vars in registry
---
devops/gc/deploy/README.md | 9 +++++++--
devops/gc/deploy/templates/register-deploy.yml | 2 +-
devops/gc/deploy/templates/register-service-account.yml | 2 +-
devops/gc/deploy/templates/register-service.yml | 2 +-
devops/gc/deploy/templates/register-variables.yml | 2 +-
devops/gc/deploy/templates/register-virtual-service.yml | 8 ++++----
devops/gc/deploy/values.yaml | 6 ++++--
7 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md
index 53bbc9c1d..f9e34e367 100644
--- a/devops/gc/deploy/README.md
+++ b/devops/gc/deploy/README.md
@@ -27,6 +27,13 @@ Packages are only needed for installation from a local computer.
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 |
@@ -65,8 +72,6 @@ First you need to set variables in **values.yaml** file using any code editor. S
**conf.registerKeycloakSecretName** | secret for keycloak | string | register-keycloak-secret | yes
**conf.registerKmsSecretName** | secret for kms | string | "register-kms-secret" | yes
**conf.rabbitmqSecretName** | secret for rabbitmq | string | rabbitmq-secret | yes
-**conf.onPremEnabled** | whether on-prem is enabled | boolean | false | yes
-**conf.domain** | your domain | string | - | yes
### ISTIO variables
diff --git a/devops/gc/deploy/templates/register-deploy.yml b/devops/gc/deploy/templates/register-deploy.yml
index 7d8363484..4287b1170 100644
--- a/devops/gc/deploy/templates/register-deploy.yml
+++ b/devops/gc/deploy/templates/register-deploy.yml
@@ -28,7 +28,7 @@ spec:
envFrom:
- configMapRef:
name: {{ .Values.conf.configmap | quote }}
- {{- if .Values.conf.onPremEnabled }}
+ {{- if .Values.global.onPremEnabled }}
- secretRef:
name: {{ .Values.conf.rabbitmqSecretName | quote }}
- secretRef:
diff --git a/devops/gc/deploy/templates/register-service-account.yml b/devops/gc/deploy/templates/register-service-account.yml
index f0771985c..eec72f128 100644
--- a/devops/gc/deploy/templates/register-service-account.yml
+++ b/devops/gc/deploy/templates/register-service-account.yml
@@ -1,4 +1,4 @@
-{{- if .Values.conf.onPremEnabled }}
+{{- if .Values.global.onPremEnabled }}
apiVersion: v1
kind: ServiceAccount
metadata:
diff --git a/devops/gc/deploy/templates/register-service.yml b/devops/gc/deploy/templates/register-service.yml
index 6535489d6..1bbb4ee44 100644
--- a/devops/gc/deploy/templates/register-service.yml
+++ b/devops/gc/deploy/templates/register-service.yml
@@ -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 }}
diff --git a/devops/gc/deploy/templates/register-variables.yml b/devops/gc/deploy/templates/register-variables.yml
index 1ba8f4585..5ff4cf9c1 100644
--- a/devops/gc/deploy/templates/register-variables.yml
+++ b/devops/gc/deploy/templates/register-variables.yml
@@ -9,7 +9,7 @@ data:
LOG_LEVEL: {{ .Values.data.logLevel | quote }}
SPRING_PROFILES_ACTIVE: {{ .Values.data.springProfilesActive | quote }}
SUBSCRIBER_PRIVATE_KEY_ID: {{ .Values.data.subscriberPrivateKeyId | quote }}
- {{- if not .Values.conf.onPremEnabled }}
+ {{- if not .Values.global.onPremEnabled }}
GOOGLE_CLOUD_PROJECT: {{ .Values.data.googleCloudProject | quote }}
ENTITLEMENTS_HOST: {{ .Values.data.entitlementsHost | quote }}
RECORDS_CHANGE_PUBSUB_ENDPOINT: "{{ .Values.data.recordsChangePubsubEndpoint}}"
diff --git a/devops/gc/deploy/templates/register-virtual-service.yml b/devops/gc/deploy/templates/register-virtual-service.yml
index 6b6167201..756ac77bc 100644
--- a/devops/gc/deploy/templates/register-virtual-service.yml
+++ b/devops/gc/deploy/templates/register-virtual-service.yml
@@ -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 }}
diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml
index 96d60e2a8..9136489c6 100644
--- a/devops/gc/deploy/values.yaml
+++ b/devops/gc/deploy/values.yaml
@@ -2,6 +2,10 @@
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
+global:
+ domain: ""
+ onPremEnabled: false
+
data:
#Configmap
logLevel: "ERROR"
@@ -31,8 +35,6 @@ conf:
registerKeycloakSecretName: "register-keycloak-secret"
registerKmsSecretName: "register-kms-secret"
appName: "register"
- onPremEnabled: false
- domain: ""
istio:
proxyCPU: "10m"
--
GitLab