From 5d4f7144128362effc5e6f36ce99cea1dc8dcbf4 Mon Sep 17 00:00:00 2001 From: "Yauheni Rykhter (EPAM)" Date: Tue, 24 May 2022 18:49:54 +0300 Subject: [PATCH 1/6] GONRG-5023: update helm vars for file service --- .../osdu-infra-onprem/templates/file-secret.yaml | 10 +++++----- helm/osdu-infra-onprem/values.yaml | 16 +++++++++------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/helm/osdu-infra-onprem/templates/file-secret.yaml b/helm/osdu-infra-onprem/templates/file-secret.yaml index 623b7ed0..5efd581c 100644 --- a/helm/osdu-infra-onprem/templates/file-secret.yaml +++ b/helm/osdu-infra-onprem/templates/file-secret.yaml @@ -1,18 +1,18 @@ apiVersion: v1 kind: Secret metadata: - name: "{{ .Values.gcp_file_deploy.conf.file_minio_secret_name }}" + name: "{{ .Values.gcp_file_deploy.conf.fileMinioSecretName }}" annotations: "helm.sh/resource-policy": no-upgrade-existing type: Opaque data: MINIO_ACCESS_KEY: {{ print "fileUser" | b64enc | quote }} - MINIO_SECRET_KEY: {{ randAlphaNum 16 | b64enc | quote }} + MINIOSECRET_KEY: {{ randAlphaNum 16 | b64enc | quote }} --- apiVersion: v1 kind: Secret metadata: - name: "{{ .Values.gcp_file_deploy.conf.file_postgres_secret_name }}" + name: "{{ .Values.gcp_file_deploy.conf.filePostgresSecretName }}" annotations: "helm.sh/resource-policy": no-upgrade-existing type: Opaque @@ -24,11 +24,11 @@ data: apiVersion: v1 kind: Secret metadata: - name: "{{ .Values.gcp_file_deploy.conf.file_keycloak_secret_name }}" + name: "{{ .Values.gcp_file_deploy.conf.fileKeycloakSecretName }}" annotations: "helm.sh/resource-policy": no-upgrade-existing type: Opaque data: OPENID_PROVIDER_URL: {{ printf "http://keycloak/auth/realms/%s" .Values.bootstrap.keycloak.secret.keycloakRealmName | b64enc | quote }} OPENID_PROVIDER_CLIENT_ID: {{ print "file" | b64enc | quote }} - OPENID_PROVIDER_CLIENT_SECRET: {{ randAlphaNum 16 | b64enc | quote }} + OPENID_PROVIDER_CLIENTSECRET: {{ randAlphaNum 16 | b64enc | quote }} diff --git a/helm/osdu-infra-onprem/values.yaml b/helm/osdu-infra-onprem/values.yaml index 4a62045b..71f1b9bd 100644 --- a/helm/osdu-infra-onprem/values.yaml +++ b/helm/osdu-infra-onprem/values.yaml @@ -649,9 +649,11 @@ gcp_workflow_deploy: gcp_file_configmap: enabled: true data: - spring_profiles_active: "anthos" + springProfilesActive: "anthos" + gcpFileLocationKind: "file_locations_osm" + obmMinioPartitionPropertiesPrefix: "file.minio" conf: - on_prem_enabled: true + onPremEnabled: true gcp_file_deploy: enabled: true @@ -659,11 +661,11 @@ gcp_file_deploy: serviceAccountName: "file" image: "community.opengroup.org:5555/osdu/platform/system/file/osdu-gcp-file:latest" conf: - rabbitmq_secret_name: "rabbitmq-secret" - file_minio_secret_name: "minio-file-secret" - file_keycloak_secret_name: "keycloak-file-secret" - file_postgres_secret_name: "postgres-file-secret" - on_prem_enabled: true + rabbitmqSecretName: "rabbitmq-secret" + fileMinioSecretName: "minio-file-secret" + fileKeycloakSecretName: "keycloak-file-secret" + filePostgresSecretName: "postgres-file-secret" + onPremEnabled: true # --- End of File values --- # # --- Wks values --- # -- GitLab From 255c0ad7036d07d075d8a3f4ccaff8f80435b771 Mon Sep 17 00:00:00 2001 From: "Yauheni Rykhter (EPAM)" Date: Wed, 25 May 2022 11:39:14 +0300 Subject: [PATCH 2/6] GONRG-5023: terraform fmt --- modules/osdu/helm-crs-catalog.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/osdu/helm-crs-catalog.tf b/modules/osdu/helm-crs-catalog.tf index 5c8272b0..5a739cd2 100644 --- a/modules/osdu/helm-crs-catalog.tf +++ b/modules/osdu/helm-crs-catalog.tf @@ -42,7 +42,7 @@ resource "helm_release" "crs_catalog_config" { } set { name = "data.crs_catalog_host_name" - value = "${local.crs_catalog_name}" + value = local.crs_catalog_name } set { name = "data.audiences" -- GitLab From 5a826413bcbc4441299a72b7170caa14d7e7bb1d Mon Sep 17 00:00:00 2001 From: "Yauheni Rykhter (EPAM)" Date: Wed, 25 May 2022 22:49:41 +0300 Subject: [PATCH 3/6] GONRG-5023: update secrets for file --- helm/osdu-infra-onprem/templates/file-secret.yaml | 4 ++-- .../templates/keycloak-bootstrap-deployment.yaml | 2 +- .../templates/minio-bootstrap-deployment.yaml | 4 ++-- .../templates/postgres-bootstrap-deployment.yaml | 4 ++-- helm/osdu-infra-onprem/values.yaml | 2 -- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/helm/osdu-infra-onprem/templates/file-secret.yaml b/helm/osdu-infra-onprem/templates/file-secret.yaml index 5efd581c..d9bc8a9e 100644 --- a/helm/osdu-infra-onprem/templates/file-secret.yaml +++ b/helm/osdu-infra-onprem/templates/file-secret.yaml @@ -7,7 +7,7 @@ metadata: type: Opaque data: MINIO_ACCESS_KEY: {{ print "fileUser" | b64enc | quote }} - MINIOSECRET_KEY: {{ randAlphaNum 16 | b64enc | quote }} + MINIO_SECRET_KEY: {{ randAlphaNum 16 | b64enc | quote }} --- apiVersion: v1 kind: Secret @@ -31,4 +31,4 @@ type: Opaque data: OPENID_PROVIDER_URL: {{ printf "http://keycloak/auth/realms/%s" .Values.bootstrap.keycloak.secret.keycloakRealmName | b64enc | quote }} OPENID_PROVIDER_CLIENT_ID: {{ print "file" | b64enc | quote }} - OPENID_PROVIDER_CLIENTSECRET: {{ randAlphaNum 16 | b64enc | quote }} + OPENID_PROVIDER_CLIENT_SECRET: {{ randAlphaNum 16 | b64enc | quote }} diff --git a/helm/osdu-infra-onprem/templates/keycloak-bootstrap-deployment.yaml b/helm/osdu-infra-onprem/templates/keycloak-bootstrap-deployment.yaml index 7b267a26..03f5ec1b 100644 --- a/helm/osdu-infra-onprem/templates/keycloak-bootstrap-deployment.yaml +++ b/helm/osdu-infra-onprem/templates/keycloak-bootstrap-deployment.yaml @@ -88,7 +88,7 @@ spec: - name: KEYCLOAK_FILE_SECRET valueFrom: secretKeyRef: - name: "{{ .Values.gcp_file_deploy.conf.file_keycloak_secret_name }}" + name: "{{ .Values.gcp_file_deploy.conf.fileKeycloakSecretName }}" key: OPENID_PROVIDER_CLIENT_SECRET - name: KEYCLOAK_SEISMIC_SECRET valueFrom: diff --git a/helm/osdu-infra-onprem/templates/minio-bootstrap-deployment.yaml b/helm/osdu-infra-onprem/templates/minio-bootstrap-deployment.yaml index c10dd039..c8976710 100644 --- a/helm/osdu-infra-onprem/templates/minio-bootstrap-deployment.yaml +++ b/helm/osdu-infra-onprem/templates/minio-bootstrap-deployment.yaml @@ -55,12 +55,12 @@ spec: - name: MINIO_FILE_USERNAME valueFrom: secretKeyRef: - name: "{{ .Values.gcp_file_deploy.conf.file_minio_secret_name }}" + name: "{{ .Values.gcp_file_deploy.conf.fileMinioSecretName }}" key: MINIO_ACCESS_KEY - name: MINIO_FILE_PASSWORD valueFrom: secretKeyRef: - name: "{{ .Values.gcp_file_deploy.conf.file_minio_secret_name }}" + name: "{{ .Values.gcp_file_deploy.conf.fileMinioSecretName }}" key: MINIO_SECRET_KEY # Infra - name: DEBUG diff --git a/helm/osdu-infra-onprem/templates/postgres-bootstrap-deployment.yaml b/helm/osdu-infra-onprem/templates/postgres-bootstrap-deployment.yaml index 363cca66..4b3c2dff 100644 --- a/helm/osdu-infra-onprem/templates/postgres-bootstrap-deployment.yaml +++ b/helm/osdu-infra-onprem/templates/postgres-bootstrap-deployment.yaml @@ -91,12 +91,12 @@ spec: - name: FILE_POSTGRESQL_USERNAME valueFrom: secretKeyRef: - name: "{{ .Values.gcp_file_deploy.conf.file_postgres_secret_name }}" + name: "{{ .Values.gcp_file_deploy.conf.filePostgresSecretName }}" key: POSTGRES_DB_USERNAME_{{ upper .Values.bootstrap.infra.secret.dataPartitionId }} - name: FILE_POSTGRESQL_PASSWORD valueFrom: secretKeyRef: - name: "{{ .Values.gcp_file_deploy.conf.file_postgres_secret_name }}" + name: "{{ .Values.gcp_file_deploy.conf.filePostgresSecretName }}" key: POSTGRES_DB_PASSWORD_{{ upper .Values.bootstrap.infra.secret.dataPartitionId }} # Infra - name: DEBUG diff --git a/helm/osdu-infra-onprem/values.yaml b/helm/osdu-infra-onprem/values.yaml index 71f1b9bd..57ce89b9 100644 --- a/helm/osdu-infra-onprem/values.yaml +++ b/helm/osdu-infra-onprem/values.yaml @@ -650,8 +650,6 @@ gcp_file_configmap: enabled: true data: springProfilesActive: "anthos" - gcpFileLocationKind: "file_locations_osm" - obmMinioPartitionPropertiesPrefix: "file.minio" conf: onPremEnabled: true -- GitLab From 61b6ab37b5041e3e8a18baa545eaf7bb7e890652 Mon Sep 17 00:00:00 2001 From: "Yauheni Rykhter (EPAM)" Date: Thu, 26 May 2022 10:30:22 +0300 Subject: [PATCH 4/6] GONRG-5023: update tf vars for file --- modules/osdu/helm-file.tf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/osdu/helm-file.tf b/modules/osdu/helm-file.tf index 7501b226..b76f8525 100644 --- a/modules/osdu/helm-file.tf +++ b/modules/osdu/helm-file.tf @@ -31,20 +31,20 @@ resource "helm_release" "file-config" { recreate_pods = true set { - name = "data.log_level" + name = "data.logLevel" value = var.log_level } set { - name = "data.osdu_entitlements_url" + name = "data.osduEntitlementsUrl" value = "http://${local.ent_name}/api/entitlements/v2/" } # bucket name is used for single combined data and service project - should be updated to support multi- data projects implementation set { - name = "data.file_location_bucket_name" + name = "data.fileLocationBucketName" value = module.buckets_for_all_projects[var.service_google_project].buckets["${var.service_google_project}-file"].name } set { - name = "data.partition_api" + name = "data.partitionApi" value = "http://${local.partition_name}/api/partition/v1/" } set { @@ -52,19 +52,19 @@ resource "helm_release" "file-config" { value = var.audiences } set { - name = "data.spring_cloud_gcp_datastore_namespace" + name = "data.springCloudGcpDatastoreNamespace" value = "${var.data_partition_id}-namespace" } set { - name = "data.file_location_user_id" + name = "data.fileLocationUserId" value = "common-user" } set { - name = "data.storage_api" + name = "data.storageApi" value = "http://${local.storage_name}/api/storage/v2/" } set { - name = "data.gcp_records_url" + name = "data.gcpRecordsUrl" value = "http://${local.storage_name}/api/storage/v2/" } } @@ -93,7 +93,7 @@ resource "helm_release" "file-deploy" { value = module.file_workload_identity.service_account } set { - name = "conf.app_name" + name = "conf.appName" value = local.file_name } set { -- GitLab From 52b81dcf7ecea2e64bbb7e6ae14fd0a36cf7f9a1 Mon Sep 17 00:00:00 2001 From: "Yauheni Rykhter (EPAM)" Date: Thu, 26 May 2022 13:18:09 +0300 Subject: [PATCH 5/6] GONRG-5023: add new var fo file service in tf --- modules/osdu/helm-file.tf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/osdu/helm-file.tf b/modules/osdu/helm-file.tf index b76f8525..dc4617a3 100644 --- a/modules/osdu/helm-file.tf +++ b/modules/osdu/helm-file.tf @@ -67,6 +67,10 @@ resource "helm_release" "file-config" { name = "data.gcpRecordsUrl" value = "http://${local.storage_name}/api/storage/v2/" } + set { + name = "data.serverServletContextpath" + value = "/api/file" + } } # Apply deploy from helm chart -- GitLab From ea8c48e43d8ef23226e80cc6e74c95c86bdc8bae Mon Sep 17 00:00:00 2001 From: "Yauheni Rykhter (EPAM)" Date: Thu, 26 May 2022 14:01:38 +0300 Subject: [PATCH 6/6] GONRG-5023: remove var --- modules/osdu/helm-file.tf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/osdu/helm-file.tf b/modules/osdu/helm-file.tf index dc4617a3..b76f8525 100644 --- a/modules/osdu/helm-file.tf +++ b/modules/osdu/helm-file.tf @@ -67,10 +67,6 @@ resource "helm_release" "file-config" { name = "data.gcpRecordsUrl" value = "http://${local.storage_name}/api/storage/v2/" } - set { - name = "data.serverServletContextpath" - value = "/api/file" - } } # Apply deploy from helm chart -- GitLab