Skip to content

Commit

Permalink
chore(charts): remove SECRET_FILE_* vars
Browse files Browse the repository at this point in the history
These are no longer used, and the only service left that even could find
them is the file-server, which doesn't actually look for any.
  • Loading branch information
stevepentland committed Mar 1, 2024
1 parent 53a5791 commit 9d1c867
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 47 deletions.
2 changes: 1 addition & 1 deletion charts/nx-cloud/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: nx-cloud
description: Nx Cloud Helm Chart
type: application
version: 0.13.0-rc.1
version: 0.13.0
maintainers:
- name: nx
url: "https://nx.app/"
Expand Down
3 changes: 0 additions & 3 deletions charts/nx-cloud/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@ Below are various little env snippets that multiple mainifests make use of
secretKeyRef:
name: {{ .Values.secret.name }}
key: {{ .Values.secret.nxCloudMongoServerEndpoint }}
{{- else }}
- name: SECRET_FILE_NX_CLOUD_MONGO_SERVER_ENDPOINT
value: {{ .Values.secret.nxCloudMongoServerEndpoint }}
{{- end }}
{{- end }}

Expand Down
25 changes: 2 additions & 23 deletions charts/nx-cloud/templates/_scm-helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,8 @@
secretKeyRef:
name: {{ .Values.secret.name }}
key: {{ .Values.secret.githubAuthToken }}
{{- else }}
- name: SECRET_FILE_GITHUB_WEBHOOK_SECRET
value: {{ .Values.secret.githubWebhookSecret }}
- name: SECRET_FILE_GITHUB_AUTH_TOKEN
value: {{ .Values.secret.githubAuthToken }}
{{- end }}
{{- if .Values.github.pr.defaultWorkspaceId }}
{{- end }}
{{- if .Values.github.pr.defaultWorkspaceId }}
- name: NX_CLOUD_INTEGRATION_DEFAULT_WORKSPACE_ID
value: {{ .Values.github.pr.defaultWorkspaceId }}
{{- end }}
Expand Down Expand Up @@ -68,9 +63,6 @@
name: {{ .Values.secret.name }}
key: {{ .Values.secret.gitlabAccessToken }}
{{- end }}
{{- else }}
- name: SECRET_FILE_NX_CLOUD_GITLAB_ACCESS_TOKEN
value: {{ .Values.secret.gitlabAccessToken }}
{{- end }}
{{- end }}
{{- end }}
Expand Down Expand Up @@ -107,18 +99,5 @@
name: {{ .Values.secret.name }}
key: {{ .Values.secret.githubPrivateKey }}
{{- end }}
{{- else }}
{{- if .Values.secret.githubAuthToken }}
- name: SECRET_FILE_NX_CLOUD_GITHUB_AUTH_TOKEN
value: {{ .Values.secret.githubAuthToken }}
{{- end }}
{{- if .Values.secret.githubAppId }}
- name: SECRET_FILE_NX_CLOUD_GITHUB_APP_ID
value: {{ .Values.secret.githubAppId }}
{{- end }}
{{- if .Values.secret.githubPrivateKey }}
- name: SECRET_FILE_NX_CLOUD_GITHUB_PRIVATE_KEY
value: {{ .Values.secret.githubPrivateKey }}
{{- end }}
{{- end }}
{{- end }}
3 changes: 0 additions & 3 deletions charts/nx-cloud/templates/nx-cloud-aggregator-cron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ spec:
secretKeyRef:
name: {{ .Values.secret.name }}
key: {{ .Values.secret.adminPassword }}
{{- else }}
- name: SECRET_FILE_ADMIN_PASSWORD
value: {{ .Values.secret.adminPassword }}
{{- end }}
{{- end }}
{{- if .Values.useCosmosDb }}
Expand Down
9 changes: 0 additions & 9 deletions charts/nx-cloud/templates/nx-cloud-frontend-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,5 @@ spec:
name: {{ .name }}
key: {{ .hubspotApiKey }}
{{- end }}
{{- else }}
{{- if .githubPrivateKey }}
- name: SECRET_FILE_NX_CLOUD_GITHUB_PRIVATE_KEY
value: {{ .githubPrivateKey }}
{{- end }}
{{- if .githubAppId }}
- name: SECRET_FILE_NX_CLOUD_GITHUB_APP_ID
value: {{ .githubAppId }}
{{- end }}
{{- end }}
{{- end }}
8 changes: 0 additions & 8 deletions charts/nx-cloud/templates/nx-cloud-nx-api-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,6 @@ spec:
secretKeyRef:
name: {{ .name }}
key: {{ .awsS3SecretAccessKey }}
{{- else }}
- name: SECRET_FILE_AWS_S3_ACCESS_KEY_ID
value: {{ .awsS3AccessKeyId }}
- name: SECRET_FILE_AWS_S3_SECRET_ACCESS_KEY
value: {{ .awsS3SecretAccessKey }}
{{- end }}
{{- end }}
{{- end }}
Expand All @@ -142,9 +137,6 @@ spec:
secretKeyRef:
name: {{ .Values.secret.name }}
key: {{ .Values.secret.azureConnectionString }}
{{- else }}
- name: SECRET_FILE_AZURE_CONNECTION_STRING
value: {{ .Values.secret.azureConnectionString }}
{{- end }}
{{- end }}
{{- if .Values.fixedBatchSize }}
Expand Down

0 comments on commit 9d1c867

Please sign in to comment.