From d980d08111b785e878871c29bc2d304bf03090f0 Mon Sep 17 00:00:00 2001 From: Philip <42116482+PhilipAbed@users.noreply.github.com> Date: Wed, 4 Oct 2023 11:04:14 +0300 Subject: [PATCH 1/4] Update deployment.yaml --- .../templates/deployment.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/helm-charts/whitesource-renovate/templates/deployment.yaml b/helm-charts/whitesource-renovate/templates/deployment.yaml index b0729a6c..951b5a58 100644 --- a/helm-charts/whitesource-renovate/templates/deployment.yaml +++ b/helm-charts/whitesource-renovate/templates/deployment.yaml @@ -39,22 +39,22 @@ spec: {{- toYaml . | nindent 12 }} {{- end }} {{- if .Values.renovate.acceptWhiteSourceTos }} - - name: ACCEPT_WHITESOURCE_TOS + - name: MEND_RNV_ACCEPT_TOS value: {{ .Values.renovate.acceptWhiteSourceTos | quote }} {{- end }} {{- if or .Values.renovate.licenseKey .Values.renovate.existingSecret }} - - name: LICENSE_KEY + - name: MEND_RNV_LICENSE_KEY valueFrom: secretKeyRef: name: {{ include "whitesource-renovate.secret-name" . }} key: licenseKey {{- end }} {{- if .Values.renovate.renovatePlatform }} - - name: RENOVATE_PLATFORM + - name: MEND_RNV_PLATFORM value: {{ .Values.renovate.renovatePlatform | quote }} {{- end }} {{- if .Values.renovate.renovateEndpoint }} - - name: RENOVATE_ENDPOINT + - name: MEND_RNV_ENDPOINT value: {{ .Values.renovate.renovateEndpoint | quote }} {{- end }} {{- if or .Values.renovate.renovateToken .Values.renovate.existingSecret }} @@ -66,7 +66,7 @@ spec: optional: true {{- end }} {{- if or .Values.renovate.githubAppId .Values.renovate.existingSecret }} - - name: GITHUB_APP_ID + - name: MEND_RNV_GITHUB_APP_ID valueFrom: secretKeyRef: name: {{ include "whitesource-renovate.secret-name" . }} @@ -74,7 +74,7 @@ spec: optional: true {{- end }} {{- if or .Values.renovate.githubAppKey .Values.renovate.existingSecret }} - - name: GITHUB_APP_KEY + - name: MEND_RNV_GITHUB_APP_KEY valueFrom: secretKeyRef: name: {{ include "whitesource-renovate.secret-name" . }} @@ -90,7 +90,7 @@ spec: optional: true {{- end }} {{- if or .Values.renovate.webhookSecret .Values.renovate.existingSecret }} - - name: WEBHOOK_SECRET + - name: MEND_RNV_WEBHOOK_SECRET valueFrom: secretKeyRef: name: {{ include "whitesource-renovate.secret-name" . }} @@ -98,7 +98,7 @@ spec: optional: true {{- end }} {{- if .Values.renovate.schedulerCron }} - - name: SCHEDULER_CRON + - name: MEND_RNV_CRON_JOB_SCHEDULER value: {{ .Values.renovate.schedulerCron | quote }} {{- end }} {{- if or .Values.renovate.pipIndexUrl .Values.renovate.existingSecret }} From 9481ec76776d2b1cdce0a278cbcaae618f9ad00f Mon Sep 17 00:00:00 2001 From: Philip <42116482+PhilipAbed@users.noreply.github.com> Date: Wed, 4 Oct 2023 11:05:26 +0300 Subject: [PATCH 2/4] Update deployment.yaml --- helm-charts/whitesource-renovate/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-charts/whitesource-renovate/templates/deployment.yaml b/helm-charts/whitesource-renovate/templates/deployment.yaml index 951b5a58..9972352a 100644 --- a/helm-charts/whitesource-renovate/templates/deployment.yaml +++ b/helm-charts/whitesource-renovate/templates/deployment.yaml @@ -58,7 +58,7 @@ spec: value: {{ .Values.renovate.renovateEndpoint | quote }} {{- end }} {{- if or .Values.renovate.renovateToken .Values.renovate.existingSecret }} - - name: RENOVATE_TOKEN + - name: MEND_RNV_GITLAB_PAT valueFrom: secretKeyRef: name: {{ include "whitesource-renovate.secret-name" . }} From 690f56bd3d52bc9e4597b9689868d064e061c8dd Mon Sep 17 00:00:00 2001 From: Philip <42116482+PhilipAbed@users.noreply.github.com> Date: Wed, 4 Oct 2023 11:12:15 +0300 Subject: [PATCH 3/4] Update deployment.yaml --- .../templates/deployment.yaml | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/helm-charts/whitesource-renovate/templates/deployment.yaml b/helm-charts/whitesource-renovate/templates/deployment.yaml index 9972352a..f4de445f 100644 --- a/helm-charts/whitesource-renovate/templates/deployment.yaml +++ b/helm-charts/whitesource-renovate/templates/deployment.yaml @@ -38,47 +38,47 @@ spec: {{- with .Values.renovate.extraEnvVars }} {{- toYaml . | nindent 12 }} {{- end }} - {{- if .Values.renovate.acceptWhiteSourceTos }} + {{- if .Values.renovate.mendRnvAcceptTos }} - name: MEND_RNV_ACCEPT_TOS - value: {{ .Values.renovate.acceptWhiteSourceTos | quote }} + value: {{ .Values.renovate.mendRnvAcceptTos | quote }} {{- end }} - {{- if or .Values.renovate.licenseKey .Values.renovate.existingSecret }} + {{- if or .Values.renovate.mendRnvLicenseKey .Values.renovate.existingSecret }} - name: MEND_RNV_LICENSE_KEY valueFrom: secretKeyRef: name: {{ include "whitesource-renovate.secret-name" . }} - key: licenseKey + key: mendRnvLicenseKey {{- end }} - {{- if .Values.renovate.renovatePlatform }} + {{- if .Values.renovate.mendRnvPlatform }} - name: MEND_RNV_PLATFORM - value: {{ .Values.renovate.renovatePlatform | quote }} + value: {{ .Values.renovate.mendRnvPlatform | quote }} {{- end }} - {{- if .Values.renovate.renovateEndpoint }} + {{- if .Values.renovate.mendRnvEndpoint }} - name: MEND_RNV_ENDPOINT - value: {{ .Values.renovate.renovateEndpoint | quote }} + value: {{ .Values.renovate.mendRnvEndpoint | quote }} {{- end }} - {{- if or .Values.renovate.renovateToken .Values.renovate.existingSecret }} + {{- if or .Values.renovate.mendRnvGitlabPat .Values.renovate.existingSecret }} - name: MEND_RNV_GITLAB_PAT valueFrom: secretKeyRef: name: {{ include "whitesource-renovate.secret-name" . }} - key: renovateToken + key: mendRnvGitlabPat optional: true {{- end }} - {{- if or .Values.renovate.githubAppId .Values.renovate.existingSecret }} + {{- if or .Values.renovate.mendRnvGithubAppId .Values.renovate.existingSecret }} - name: MEND_RNV_GITHUB_APP_ID valueFrom: secretKeyRef: name: {{ include "whitesource-renovate.secret-name" . }} - key: githubAppId + key: mendRnvGithubAppId optional: true {{- end }} - {{- if or .Values.renovate.githubAppKey .Values.renovate.existingSecret }} + {{- if or .Values.renovate.mendRnvGithubAppKey .Values.renovate.existingSecret }} - name: MEND_RNV_GITHUB_APP_KEY valueFrom: secretKeyRef: name: {{ include "whitesource-renovate.secret-name" . }} - key: githubAppKey + key: mendRnvGithubAppKey optional: true {{- end }} {{- if or .Values.renovate.githubComToken .Values.renovate.existingSecret }} @@ -89,12 +89,12 @@ spec: key: githubComToken optional: true {{- end }} - {{- if or .Values.renovate.webhookSecret .Values.renovate.existingSecret }} + {{- if or .Values.renovate.mendRnvWebhookSecret .Values.renovate.existingSecret }} - name: MEND_RNV_WEBHOOK_SECRET valueFrom: secretKeyRef: name: {{ include "whitesource-renovate.secret-name" . }} - key: webhookSecret + key: mendRnvWebhookSecret optional: true {{- end }} {{- if .Values.renovate.schedulerCron }} From 5477ba70ec94938d825544c6a0f70750171afb1c Mon Sep 17 00:00:00 2001 From: Philip <42116482+PhilipAbed@users.noreply.github.com> Date: Wed, 4 Oct 2023 11:56:59 +0300 Subject: [PATCH 4/4] Update deployment.yaml --- .../templates/deployment.yaml | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/helm-charts/whitesource-renovate/templates/deployment.yaml b/helm-charts/whitesource-renovate/templates/deployment.yaml index f4de445f..52fa9189 100644 --- a/helm-charts/whitesource-renovate/templates/deployment.yaml +++ b/helm-charts/whitesource-renovate/templates/deployment.yaml @@ -81,6 +81,14 @@ spec: key: mendRnvGithubAppKey optional: true {{- end }} + {{- if or .Values.renovate.mendRnvSqliteFilePath .Values.renovate.existingSecret }} + - name: MEND_RNV_SQLITE_FILE_PATH + valueFrom: + secretKeyRef: + name: {{ include "whitesource-renovate.secret-name" . }} + key: mendRnvSqliteFilePath + optional: true + {{- end }} {{- if or .Values.renovate.githubComToken .Values.renovate.existingSecret }} - name: GITHUB_COM_TOKEN valueFrom: @@ -97,9 +105,13 @@ spec: key: mendRnvWebhookSecret optional: true {{- end }} - {{- if .Values.renovate.schedulerCron }} + {{- if .Values.renovate.mendRnvCronJobScheduler }} - name: MEND_RNV_CRON_JOB_SCHEDULER - value: {{ .Values.renovate.schedulerCron | quote }} + value: {{ .Values.renovate.mendRnvCronJobScheduler | quote }} + {{- end }} + {{- if .Values.renovate.mendRnvCronAppSync }} + - name: MEND_RNV_CRON_APP_SYNC + value: {{ .Values.renovate.mendRnvCronAppSync | quote }} {{- end }} {{- if or .Values.renovate.pipIndexUrl .Values.renovate.existingSecret }} - name: PIP_INDEX_URL @@ -121,10 +133,30 @@ spec: - name: RENOVATE_USER_AGENT value: {{ .Values.renovate.renovateUserAgent | quote }} {{- end }} + {{- if .Values.renovate.mendRnvUserAgent }} + - name: MEND_RNV_USER_AGENT + value: {{ .Values.renovate.mendRnvUserAgent | quote }} + {{- end }} {{- if .Values.renovate.logLevel }} - name: LOG_LEVEL value: {{ .Values.renovate.logLevel | quote }} {{- end }} + {{- if or .Values.renovate.mendRnvAdminApiEnabled .Values.renovate.existingSecret }} + - name: MEND_RNV_ADMIN_API_ENABLED + valueFrom: + secretKeyRef: + name: {{ include "whitesource-renovate.secret-name" . }} + key: mendRnvAdminApiEnabled + optional: true + {{- end }} + {{- if or .Values.renovate.mendRnvServerApiSecret .Values.renovate.existingSecret }} + - name: MEND_RNV_SERVER_API_SECRET + valueFrom: + secretKeyRef: + name: {{ include "whitesource-renovate.secret-name" . }} + key: mendRnvServerApiSecret + optional: true + {{- end }} ports: - name: http containerPort: 8080