Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ spec:
- name: OS_USER_DOMAIN_NAME
value: {{ quote .Values.controllerManager.manager.env.osUserDomainName }}
- name: OS_USERNAME
value: {{ quote .Values.controllerManager.manager.env.osUsername }}
valueFrom:
secretKeyRef:
key: SERVICE_USERNAME
name: {{ include "openstack-hypervisor-operator.fullname" . }}-secret
- name: OS_PASSWORD
valueFrom:
secretKeyRef:
Expand Down
7 changes: 4 additions & 3 deletions charts/openstack-hypervisor-operator/templates/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ metadata:
name: {{ include "openstack-hypervisor-operator.fullname" . }}-secret
labels:
{{- include "openstack-hypervisor-operator.labels" . | nindent 4 }}
stringData:
SERVICE_PASSWORD: {{ required "secret.servicePassword is required" .Values.secret.servicePassword
| quote }}
data:
SERVICE_USERNAME: {{ .Values.secret.serviceUsername | default .Values.controllerManager.manager.env.osUsername
| required "secret.serviceUsername or controllerManager.manager.env.osUsername is required" | b64enc | quote }}
SERVICE_PASSWORD: {{ .Values.secret.servicePassword | required "secret.servicePassword is required" | b64enc | quote }}
type: Opaque
1 change: 1 addition & 0 deletions charts/openstack-hypervisor-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ serviceMonitor:
labels: {}
interval: 60s
secret:
serviceUsername: ""
servicePassword: ""
serviceAccount:
annotations: {}
Expand Down
Loading