diff --git a/helm-chart/environments/values-dev.yaml b/helm-chart/environments/values-dev.yaml index 1a8746f9..a8a226a3 100644 --- a/helm-chart/environments/values-dev.yaml +++ b/helm-chart/environments/values-dev.yaml @@ -43,11 +43,8 @@ objectStore: resource_template_path: RESOURCE/files/[RESOURCE_TYPE] cdn: + resourceBasePath: "https://resources.dev.atmlayer-pagopa.it" offset_path: RESOURCE/ - credentialsSecretEnabled: true - credentialsSecretName: "pagopa-dev-atm-layer-model-cdn-base-path" - credentialsSecretKeys: - cdn_base_path: CDN_BASE_PATH secretProviderClass: enabled: true diff --git a/helm-chart/environments/values-prod.yaml b/helm-chart/environments/values-prod.yaml index a6c2f97c..7c56972c 100644 --- a/helm-chart/environments/values-prod.yaml +++ b/helm-chart/environments/values-prod.yaml @@ -43,11 +43,8 @@ objectStore: resource_template_path: RESOURCE/files/[RESOURCE_TYPE] cdn: + resourceBasePath: "https://resources.atmlayer-pagopa.it" offset_path: RESOURCE/ - credentialsSecretEnabled: true - credentialsSecretName: "pagopa-prod-atm-layer-model-cdn-base-path" - credentialsSecretKeys: - cdn_base_path: CDN_BASE_PATH secretProviderClass: enabled: true diff --git a/helm-chart/environments/values-uat.yaml b/helm-chart/environments/values-uat.yaml index 26b57162..0e5f1276 100644 --- a/helm-chart/environments/values-uat.yaml +++ b/helm-chart/environments/values-uat.yaml @@ -43,11 +43,9 @@ objectStore: resource_template_path: RESOURCE/files/[RESOURCE_TYPE] cdn: + resourceBasePath: "https://resources.uat.atmlayer-pagopa.it" offset_path: RESOURCE/ - credentialsSecretEnabled: true - credentialsSecretName: "pagopa-uat-atm-layer-model-cdn-base-path" - credentialsSecretKeys: - cdn_base_path: CDN_BASE_PATH + secretProviderClass: enabled: true diff --git a/helm-chart/templates/deployment.yaml b/helm-chart/templates/deployment.yaml index dd1e8f91..3b31d355 100644 --- a/helm-chart/templates/deployment.yaml +++ b/helm-chart/templates/deployment.yaml @@ -78,13 +78,9 @@ spec: value: "{{ .Values.tracing.endpointBasePath }}" - name: TRACING_ENABLE_JDBC_MONITORING value: "{{ .Values.tracing.enableJDBCMonitoring }}" - {{- if .Values.cdn.credentialsSecretEnabled }} - - name: CDN_BASE_PATH - valueFrom: - secretKeyRef: - name: {{ .Values.cdn.credentialsSecretName }} - key: {{ .Values.cdn.credentialsSecretKeys.cdn_base_path }} - {{- end }} + - name: RESOURCES_BASE_PATH + value: "{{ .Values.cdn.resourceBasePath }}" + volumeMounts: {{- if .Values.secretProviderClass.enabled }} - name: secrets-store-inline diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index c06ea972..2eac9c1c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -71,7 +71,7 @@ quarkus.rest-client.process-deploy.url=${MODEL_PROCESS_BASE_PATH:http://pagopa-d ################### # CDN ################### -cdn.base-url=${CDN_BASE_PATH} +cdn.base-url=${RESOURCES_BASE_PATH} cdn.offset-path=${CDN_OFFSET_PATH:RESOURCE/} #quarkus.log.console.format=%d{HH:mm:ss} %-5p traceId=%X{traceId}, parentId=%X{parentId}, spanId=%X{spanId}, sampled=%X{sampled} [%c{2.}] (%t) %s%e%n ###################