diff --git a/helm/osdu-infra-onprem/templates/file-secret.yaml b/helm/osdu-infra-onprem/templates/file-secret.yaml index 623b7ed02e83ba58eee42f3e1247802915cf670f..d9bc8a9ee6a0d8b5542c898325f1ab24b60fc6dd 100644 --- a/helm/osdu-infra-onprem/templates/file-secret.yaml +++ b/helm/osdu-infra-onprem/templates/file-secret.yaml @@ -1,7 +1,7 @@ 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 @@ -12,7 +12,7 @@ data: 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,7 +24,7 @@ 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 diff --git a/helm/osdu-infra-onprem/templates/keycloak-bootstrap-deployment.yaml b/helm/osdu-infra-onprem/templates/keycloak-bootstrap-deployment.yaml index 7b267a269634fa69ed9c22bb520beab5acc7539f..03f5ec1be490e7847648ee9452cea12caa3fa4cb 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 c78f5fab733a7ea90884015bea2bd185cb0fd797..a4b544fe386a17be7e63433d2fd30712b15b884f 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 363cca664ae7d228fa4b79edba3eabf6999b96ef..4b3c2dfff3b86cf2ca1be214738f5f81ad063726 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 eeaa6db89d5b25549818bde967a2ad087fa1c175..2def24247c1788bd55a28c2650cd1eef231edaa0 100644 --- a/helm/osdu-infra-onprem/values.yaml +++ b/helm/osdu-infra-onprem/values.yaml @@ -640,9 +640,9 @@ gcp_workflow_deploy: gcp_file_configmap: enabled: true data: - spring_profiles_active: "anthos" + springProfilesActive: "anthos" conf: - on_prem_enabled: true + onPremEnabled: true gcp_file_deploy: enabled: true @@ -650,11 +650,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 --- # diff --git a/modules/osdu/helm-file.tf b/modules/osdu/helm-file.tf index 7501b2262b71114b2bfec838c224f8b2a6f850ee..b76f8525fb21164ae3aa079105d35ee25ba67cf2 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 {