Skip to content

Commit

Permalink
Merge c469833 into 1553b97
Browse files Browse the repository at this point in the history
  • Loading branch information
vyruz1986 authored Aug 18, 2022
2 parents 1553b97 + c469833 commit cde17c3
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
7 changes: 7 additions & 0 deletions Infrastructure/helm-charts/haspman/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ spec:
secretKeyRef:
name: {{ include "haspman.fullname" . }}
key: DB_CONNECTION_STRING
- name: Storage__ConnectionString
valueFrom:
secretKeyRef:
name: {{ include "haspman.fullname" . }}
key: STORAGE_CONNECTION_STRING
- name: Storage__StorageContainerName
value: {{ required "A valid .Values.haspman.storageContainerName entry is required" .Values.haspman.storageContainerName | quote }}
- name: Oidc__Authority
value: {{ required "A valid .Values.haspman.oauth.authority entry required!" .Values.haspman.oauth.authority | quote }}
- name: Oidc__Audience
Expand Down
3 changes: 2 additions & 1 deletion Infrastructure/helm-charts/haspman/templates/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ metadata:
type: Opaque
data:
CLIENT_SECRET: {{ required "A valid .Values.haspman.oauth.clientSecret entry required!" .Values.haspman.oauth.clientSecret | b64enc | quote }}
DB_CONNECTION_STRING: {{ required "A valid .Values.haspman.dbConnectionString entry required!" .Values.haspman.dbConnectionString | b64enc | quote }}
DB_CONNECTION_STRING: {{ required "A valid .Values.haspman.dbConnectionString entry required!" .Values.haspman.dbConnectionString | b64enc | quote }}
STORAGE_CONNECTION_STRING: {{ required "A valid .Values.haspman.storageConnectionString entry required!" .Values.haspman.storageConnectionString | b64enc | quote }}
2 changes: 2 additions & 0 deletions Infrastructure/helm-charts/haspman/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ affinity: {}
haspman:
environment: Dev
dbConnectionString: ""
storageConnectionString: ""
storageContainerName: ""
oauth:
clientId: ""
clientSecret: ""
Expand Down
2 changes: 1 addition & 1 deletion Web/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"Storage": {
"ConnectionString": "",
"StorageContainerName": ""
}
}
}

0 comments on commit cde17c3

Please sign in to comment.