From ca55f4e3223663cd1fcb52fc36ad63fe56ed7424 Mon Sep 17 00:00:00 2001
From: "Volodymyr Pienskoi [EPAM / GCP]" <volodymyr_pienskoi@epam.com>
Date: Wed, 1 Feb 2023 13:53:08 +0000
Subject: [PATCH] GONRG-6337: Remove audiences from GC Helm chart
---
devops/gc/deploy/README.md | 7 -------
devops/gc/deploy/templates/configmap-bootstrap.yaml | 3 ---
devops/gc/deploy/templates/legal-configmap.yaml | 3 ---
devops/gc/deploy/values.yaml | 1 -
4 files changed, 14 deletions(-)
diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md
index 37f32b343..874072805 100644
--- a/devops/gc/deploy/README.md
+++ b/devops/gc/deploy/README.md
@@ -99,18 +99,11 @@ First you need to set variables in **values.yaml** file using any code editor. S
**logLevel** | logging level | string | ERROR | yes
**springProfilesActive** | active spring profile | string | gcp | yes
**acceptHttp** | accept Http traffic | string | true | yes
-**googleAudiences** | your Google Cloud client id | string | - | yes
**dataPartitionId** | data partition id | string | - | yes
**entitlementsHost** | Entitlements host URL | string | <http://entitlements> | yes
**defaultLegalTag** | Default legal tag | string | default-data-tag| yes
**legalHost** | Legal host URL | string | <http://legal> | yes
-> googleAudiences: If you are connected to Google Cloud console with `gcloud auth application-default login --no-browser` from your terminal, you can get your client_id using the command:
-
-```console
-cat ~/.config/gcloud/application_default_credentials.json | grep client_id
-```
-
### Deployment variables
| Name | Description | Type | Default |Required |
diff --git a/devops/gc/deploy/templates/configmap-bootstrap.yaml b/devops/gc/deploy/templates/configmap-bootstrap.yaml
index 69d88aabc..da2680a45 100644
--- a/devops/gc/deploy/templates/configmap-bootstrap.yaml
+++ b/devops/gc/deploy/templates/configmap-bootstrap.yaml
@@ -12,7 +12,4 @@ data:
LEGAL_HOST: {{ .Values.data.legalHost | quote }}
DEFAULT_LEGAL_TAG: {{ .Values.data.defaultLegalTag | quote }}
ONPREM_ENABLED: {{ .Values.conf.onPremEnabled | quote }}
- {{- if not .Values.conf.onPremEnabled }}
- GOOGLE_AUDIENCES: {{ .Values.data.googleAudiences | quote }}
- {{- end }}
{{- end }}
diff --git a/devops/gc/deploy/templates/legal-configmap.yaml b/devops/gc/deploy/templates/legal-configmap.yaml
index 5c27439a6..63eed68ca 100644
--- a/devops/gc/deploy/templates/legal-configmap.yaml
+++ b/devops/gc/deploy/templates/legal-configmap.yaml
@@ -9,6 +9,3 @@ data:
ACCEPT_HTTP: {{ .Values.data.acceptHttp | quote }}
LOG_LEVEL: {{ .Values.data.logLevel | quote }}
SPRING_PROFILES_ACTIVE: {{ .Values.data.springProfilesActive | quote }}
- {{- if not .Values.conf.onPremEnabled }}
- GOOGLE_AUDIENCES: {{ .Values.data.googleAudiences | quote }}
- {{- end }}
diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml
index bfe48ff56..0c5ed8fb6 100644
--- a/devops/gc/deploy/values.yaml
+++ b/devops/gc/deploy/values.yaml
@@ -7,7 +7,6 @@ data:
logLevel: "ERROR"
springProfilesActive: "gcp"
acceptHttp: "true"
- googleAudiences: ""
dataPartitionId: ""
entitlementsHost: "http://entitlements"
defaultLegalTag: "default-data-tag"
--
GitLab