diff --git a/Jenkinsfile b/Jenkinsfile index 0e0d43a..43287ec 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ jenkinsPipelineSkeleton('json-echo', [ pullAlways: true, helmChart: 'json-echo-helm-chart', helmRepo: 'my-helm-repo', - version: '1.0.6', + version: '1.0.7', useInsecureRegistry: false, port: 8091, checkDependencyPipeline: true, diff --git a/json-echo-helm-chart/json-echo/templates/deployment.yaml b/json-echo-helm-chart/json-echo/templates/deployment.yaml index 5944e58..0ad5016 100644 --- a/json-echo-helm-chart/json-echo/templates/deployment.yaml +++ b/json-echo-helm-chart/json-echo/templates/deployment.yaml @@ -45,3 +45,14 @@ spec: - name: {{ $key }} value: "{{ $value }}" {{- end }} + + - name: QUARKUS_DATASOURCE_USERNAME + valueFrom: + secretKeyRef: + name: auth-api + key: QuarkusDB_Username + - name: QUARKUS_DATASOURCE_PASSWORD + valueFrom: + secretKeyRef: + name: auth-api + key: QuarkusDB_Password diff --git a/json-echo-helm-chart/json-echo/values.yaml b/json-echo-helm-chart/json-echo/values.yaml index 78009e2..86b0dc5 100644 --- a/json-echo-helm-chart/json-echo/values.yaml +++ b/json-echo-helm-chart/json-echo/values.yaml @@ -6,6 +6,6 @@ app: secret: nexus-secret env: QUARKUS_DATASOURCE_DB_KIND: "mysql" - QUARKUS_DATASOURCE_USERNAME: "myuser" - QUARKUS_DATASOURCE_PASSWORD: "mypassword" - QUARKUS_DATASOURCE_JDBC_URL: "jdbc:mysql://localhost:3306/mydatabase" \ No newline at end of file + QUARKUS_DATASOURCE_USERNAME: "{{ .Values.global.k8sSecret.auth-api.QuarkusDB_Username }}" + QUARKUS_DATASOURCE_PASSWORD: "{{ .Values.global.k8sSecret.auth-api.QuarkusDB_Password }}" + QUARKUS_DATASOURCE_JDBC_URL: "jdbc:mysql://localhost:3306/mydatabase"