diff --git a/charts/openstack-hypervisor-operator/templates/deployment.yaml b/charts/openstack-hypervisor-operator/templates/deployment.yaml index 0452645e..b1ca082d 100644 --- a/charts/openstack-hypervisor-operator/templates/deployment.yaml +++ b/charts/openstack-hypervisor-operator/templates/deployment.yaml @@ -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: diff --git a/charts/openstack-hypervisor-operator/templates/secret.yaml b/charts/openstack-hypervisor-operator/templates/secret.yaml index 85c5cdcd..bf096ec2 100644 --- a/charts/openstack-hypervisor-operator/templates/secret.yaml +++ b/charts/openstack-hypervisor-operator/templates/secret.yaml @@ -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 diff --git a/charts/openstack-hypervisor-operator/values.yaml b/charts/openstack-hypervisor-operator/values.yaml index 22f61295..2330aea3 100644 --- a/charts/openstack-hypervisor-operator/values.yaml +++ b/charts/openstack-hypervisor-operator/values.yaml @@ -60,6 +60,7 @@ serviceMonitor: labels: {} interval: 60s secret: + serviceUsername: "" servicePassword: "" serviceAccount: annotations: {}