Skip to content

Commit

Permalink
fix(ci): also use .htpasswd in helm template
Browse files Browse the repository at this point in the history
  • Loading branch information
ddfreiling committed May 6, 2024
1 parent 00af95d commit 198934b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ci/helm-chart/config/config.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ lcp:
# replace this dsn if you're not using SQLite
database: "{{ .Values.lcp.database }}"
# authentication file of the License Server. Here we use the same file for the License Server and Status Server
auth_file: "/app/htpasswd"
auth_file: "/app/.htpasswd"
{{- if .Values.storage.enabled }}
storage:
filesystem:
Expand Down
4 changes: 2 additions & 2 deletions ci/helm-chart/templates/deployment-lcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ spec:
name: lcp-config
readOnly: true
subPath: config.yaml
- mountPath: /app/htpasswd
- mountPath: /app/.htpasswd
name: lcp-config
subPath: htpasswd
subPath: .htpasswd
readOnly: true
{{- if .Values.edrlab.prodCertSecretName }}
- mountPath: /app/cert
Expand Down
4 changes: 2 additions & 2 deletions ci/helm-chart/templates/deployment-lsd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ spec:
name: lcp-prod-certs
readOnly: true
{{- end }}
- mountPath: /app/htpasswd
- mountPath: /app/.htpasswd
name: lcp-config
subPath: htpasswd
subPath: .htpasswd
- mountPath: /data/db
name: lcp-data
subPath: db
Expand Down
2 changes: 1 addition & 1 deletion ci/helm-chart/templates/secret-lcp-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ metadata:
namespace: {{ .Release.Namespace }}
type: Opaque
data:
htpasswd: {{ htpasswd .Values.auth.username .Values.auth.password | b64enc }}
.htpasswd: {{ htpasswd .Values.auth.username .Values.auth.password | b64enc }}
config.yaml: {{ tpl (.Files.Get "config/config.yaml.tpl") . | b64enc }}

0 comments on commit 198934b

Please sign in to comment.