From 124a1116282c400a196afd25540726c65257b2d3 Mon Sep 17 00:00:00 2001 From: tkuzynow Date: Wed, 8 Nov 2023 13:00:21 +0100 Subject: [PATCH 1/3] fix: add possibility to adjust public plan technical user --- .../templates/migrationservice-configmap.yaml | 6 ---- .../migrationservice-deployment.yaml | 30 +++++++++++++++++++ .../templates/migrationservice-secret.yaml | 6 ++++ 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/templates/migration/templates/migrationservice-configmap.yaml b/templates/migration/templates/migrationservice-configmap.yaml index f6926ba4..00fe34b8 100644 --- a/templates/migration/templates/migrationservice-configmap.yaml +++ b/templates/migration/templates/migrationservice-configmap.yaml @@ -11,13 +11,7 @@ data: SPRING_DATASOURCE_CONSULTINGTYPESERVICE_URL: "jdbc:mariadb://mariadb.{{ .Release.Namespace }}:3306/consultingtypeservice" MIGRATION_SPRING_PROFILE: "{{ .Values.migrationToolSpringProfile }}" - USERS_JITSI_TECHNICAL_PASSWORD: "{{ .Values.jitsiTechnicalPassword }}" - USERS_JITSI_TECHNICAL_EMAIL: "{{ .Values.jitsiTechnicalEmail }}" - USERS_JITSI_TECHNICAL_TENANTID: "{{ .Values.jitsiTechnicalTenantId }}" - USERS_PUBLIC_PLAN_TECHNICAL_PASSWORD: "{{ .Values.publicPlanTechnicalPassword }}" - USERS_PUBLIC_PLAN_TECHNICAL_EMAIL: "{{ .Values.publicPlanTechnicalEmail }}" - USERS_PUBLIC_PLAN_TECHNICAL_TENANTID: "{{ .Values.publicPlanTechnicalTenantId }}" metadata: labels: io.kompose.service: migrationtool-{{ .Release.Name }}-env diff --git a/templates/migration/templates/migrationservice-deployment.yaml b/templates/migration/templates/migrationservice-deployment.yaml index e42ca180..08d6cc24 100644 --- a/templates/migration/templates/migrationservice-deployment.yaml +++ b/templates/migration/templates/migrationservice-deployment.yaml @@ -128,6 +128,36 @@ spec: secretKeyRef: key: SPRING_DATA_MONGODB_URI name: migrationtool-secret-{{ .Release.Name }}-env + - name: USERS_JITSI_TECHNICAL_PASSWORD + valueFrom: + secretKeyRef: + key: USERS_JITSI_TECHNICAL_PASSWORD + name: migrationtool-secret-{{ .Release.Name }}-env + - name: USERS_JITSI_TECHNICAL_EMAIL + valueFrom: + secretKeyRef: + key: USERS_JITSI_TECHNICAL_EMAIL + name: migrationtool-secret-{{ .Release.Name }}-env + - name: USERS_JITSI_TECHNICAL_TENANTID + valueFrom: + secretKeyRef: + key: USERS_JITSI_TECHNICAL_TENANTID + name: migrationtool-secret-{{ .Release.Name }}-env + - name: USERS_PUBLIC_PLAN_TECHNICAL_PASSWORD + valueFrom: + secretKeyRef: + key: USERS_PUBLIC_PLAN_TECHNICAL_PASSWORD + name: migrationtool-secret-{{ .Release.Name }}-env + - name: USERS_PUBLIC_PLAN_TECHNICAL_EMAIL + valueFrom: + secretKeyRef: + key: USERS_PUBLIC_PLAN_TECHNICAL_EMAIL + name: migrationtool-secret-{{ .Release.Name }}-env + - name: USERS_PUBLIC_PLAN_TECHNICAL_TENANTID + valueFrom: + secretKeyRef: + key: USERS_PUBLIC_PLAN_TECHNICAL_TENANTID + name: migrationtool-secret-{{ .Release.Name }}-env restartPolicy: OnFailure imagePullSecrets: - name: registry-secret diff --git a/templates/migration/templates/migrationservice-secret.yaml b/templates/migration/templates/migrationservice-secret.yaml index ea6ad8ad..0dddacec 100644 --- a/templates/migration/templates/migrationservice-secret.yaml +++ b/templates/migration/templates/migrationservice-secret.yaml @@ -21,4 +21,10 @@ data: SPRING_DATASOURCE_AGENCYSERVICE_PASSWORD: {{ .Values.global.springLiquibasePassword | b64enc | quote }} SPRING_DATASOURCE_CONSULTINGTYPESERVICE_USERNAME: {{ .Values.global.springLiquibaseUser | b64enc | quote }} SPRING_DATASOURCE_CONSULTINGTYPESERVICE_PASSWORD: {{ .Values.global.springLiquibasePassword | b64enc | quote }} + USERS_JITSI_TECHNICAL_PASSWORD: {{ .Values.global.jitsiTechnicalPassword | b64enc | quote }} + USERS_JITSI_TECHNICAL_EMAIL: {{ .Values.global.jitsiTechnicalEmail | b64enc | quote }} + USERS_JITSI_TECHNICAL_TENANTID: {{ .Values.global.jitsiTechnicalTenantId | b64enc | quote }} + USERS_PUBLIC_PLAN_TECHNICAL_PASSWORD: {{ .Values.global.publicPlanTechnicalPassword | b64enc | quote }} + USERS_PUBLIC_PLAN_TECHNICAL_EMAIL: {{ .Values.global.publicPlanTechnicalEmail | b64enc | quote }} + USERS_PUBLIC_PLAN_TECHNICAL_TENANTID: {{ .Values.global.publicPlanTechnicalTenantId | b64enc | quote }} {{- end }} \ No newline at end of file From bcb1bff06dda2baa5011a5727085060cdab73bef Mon Sep 17 00:00:00 2001 From: tkuzynow Date: Wed, 8 Nov 2023 13:05:30 +0100 Subject: [PATCH 2/3] fix: add possibility to adjust public plan technical user --- .../migration/templates/migrationservice-secret.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/migration/templates/migrationservice-secret.yaml b/templates/migration/templates/migrationservice-secret.yaml index 0dddacec..6041da16 100644 --- a/templates/migration/templates/migrationservice-secret.yaml +++ b/templates/migration/templates/migrationservice-secret.yaml @@ -21,10 +21,10 @@ data: SPRING_DATASOURCE_AGENCYSERVICE_PASSWORD: {{ .Values.global.springLiquibasePassword | b64enc | quote }} SPRING_DATASOURCE_CONSULTINGTYPESERVICE_USERNAME: {{ .Values.global.springLiquibaseUser | b64enc | quote }} SPRING_DATASOURCE_CONSULTINGTYPESERVICE_PASSWORD: {{ .Values.global.springLiquibasePassword | b64enc | quote }} - USERS_JITSI_TECHNICAL_PASSWORD: {{ .Values.global.jitsiTechnicalPassword | b64enc | quote }} - USERS_JITSI_TECHNICAL_EMAIL: {{ .Values.global.jitsiTechnicalEmail | b64enc | quote }} - USERS_JITSI_TECHNICAL_TENANTID: {{ .Values.global.jitsiTechnicalTenantId | b64enc | quote }} - USERS_PUBLIC_PLAN_TECHNICAL_PASSWORD: {{ .Values.global.publicPlanTechnicalPassword | b64enc | quote }} - USERS_PUBLIC_PLAN_TECHNICAL_EMAIL: {{ .Values.global.publicPlanTechnicalEmail | b64enc | quote }} - USERS_PUBLIC_PLAN_TECHNICAL_TENANTID: {{ .Values.global.publicPlanTechnicalTenantId | b64enc | quote }} + USERS_JITSI_TECHNICAL_PASSWORD: {{ .Values.jitsiTechnicalPassword | b64enc | quote }} + USERS_JITSI_TECHNICAL_EMAIL: {{ .Values.jitsiTechnicalEmail | b64enc | quote }} + USERS_JITSI_TECHNICAL_TENANTID: {{ .Values.jitsiTechnicalTenantId | b64enc | quote }} + USERS_PUBLIC_PLAN_TECHNICAL_PASSWORD: {{ .Values.publicPlanTechnicalPassword | b64enc | quote }} + USERS_PUBLIC_PLAN_TECHNICAL_EMAIL: {{ .Values.publicPlanTechnicalEmail | b64enc | quote }} + USERS_PUBLIC_PLAN_TECHNICAL_TENANTID: {{ .Values.publicPlanTechnicalTenantId | b64enc | quote }} {{- end }} \ No newline at end of file From 63bd96469b01d4f9dfcaaa4ae3b1c67ba326cda4 Mon Sep 17 00:00:00 2001 From: tkuzynow Date: Wed, 15 Nov 2023 09:22:57 +0100 Subject: [PATCH 3/3] fix: adjust values for jitsi technical user --- templates/migration/templates/migrationservice-secret.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/migration/templates/migrationservice-secret.yaml b/templates/migration/templates/migrationservice-secret.yaml index 6041da16..00bb4bdb 100644 --- a/templates/migration/templates/migrationservice-secret.yaml +++ b/templates/migration/templates/migrationservice-secret.yaml @@ -21,7 +21,7 @@ data: SPRING_DATASOURCE_AGENCYSERVICE_PASSWORD: {{ .Values.global.springLiquibasePassword | b64enc | quote }} SPRING_DATASOURCE_CONSULTINGTYPESERVICE_USERNAME: {{ .Values.global.springLiquibaseUser | b64enc | quote }} SPRING_DATASOURCE_CONSULTINGTYPESERVICE_PASSWORD: {{ .Values.global.springLiquibasePassword | b64enc | quote }} - USERS_JITSI_TECHNICAL_PASSWORD: {{ .Values.jitsiTechnicalPassword | b64enc | quote }} + USERS_JITSI_TECHNICAL_PASSWORD: {{ .Values.jitsiTechnicalUserPassword | b64enc | quote }} USERS_JITSI_TECHNICAL_EMAIL: {{ .Values.jitsiTechnicalEmail | b64enc | quote }} USERS_JITSI_TECHNICAL_TENANTID: {{ .Values.jitsiTechnicalTenantId | b64enc | quote }} USERS_PUBLIC_PLAN_TECHNICAL_PASSWORD: {{ .Values.publicPlanTechnicalPassword | b64enc | quote }}