Skip to content

fix(openstack): include more fields for the service users #1254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 18, 2025
Merged

fix(openstack): include more fields for the service users #1254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions components/openstack/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{{- define "openstack.serviceuser.user_domain_name" -}}
{{- eq .usage "admin" | ternary "default" "service" }}
{{- end }}

{{- define "openstack.serviceuser.project_domain_name" -}}
{{- eq .usage "admin" | ternary "default" ( default "service" .project_domain_name ) }}
{{- end }}

{{- define "openstack.serviceuser.project_name" -}}
{{- eq .usage "admin" | ternary "admin" ( default "service" .project_name ) }}
{{- end }}
13 changes: 6 additions & 7 deletions components/openstack/templates/keystone-service-user.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{{- if .Values.keystoneServiceUsers.enabled }}
{{- range $serviceName, $users := .Values.keystoneServiceUsers.services }}
{{- range $_, $user := $users }}
{{/* special override for the admin user since its in the bootstrap domain of default */}}
{{- $user_domain_name := eq $user.usage "admin" | ternary "default" "service" }}
{{- $project_domain_name := eq $user.usage "admin" | ternary "default" ( default "service" $user.project_domain_name ) }}
{{- $project_name := eq $user.usage "admin" | ternary "admin" ( default "service" $user.project_name ) }}
---
apiVersion: external-secrets.io/v1
kind: ExternalSecret
Expand All @@ -27,9 +23,9 @@ spec:
OS_AUTH_URL: {{ $.Values.keystoneUrl | quote }}
OS_DEFAULT_DOMAIN: 'default'
OS_INTERFACE: {{ $.Values.keystoneServiceUsers.keystoneInterface | quote }}
OS_PROJECT_DOMAIN_NAME: {{ $project_domain_name | quote }}
OS_PROJECT_NAME: {{ $project_name | quote }}
OS_USER_DOMAIN_NAME: {{ $user_domain_name | quote }}
OS_PROJECT_DOMAIN_NAME: {{ include "openstack.serviceuser.project_domain_name" $user | quote }}
OS_PROJECT_NAME: {{ include "openstack.serviceuser.project_name" $user | quote }}
OS_USER_DOMAIN_NAME: {{ include "openstack.serviceuser.user_domain_name" $user | quote }}
OS_USERNAME: {{ `{{ .username }}` | quote }}
OS_PASSWORD: {{ `{{ .password }}` | quote }}
OS_REGION_NAME: {{ $.Values.regionName | quote }}
Expand Down Expand Up @@ -62,6 +58,9 @@ spec:
{{- $shouldSkip := or (eq $user.usage "test") (eq $user.usage "admin") }}
{{- if not $shouldSkip }}
[{{ $section }}]
project_domain_name={{ include "openstack.serviceuser.project_domain_name" $user }}
project_name={{ include "openstack.serviceuser.project_name" $user }}
user_domain_name={{ include "openstack.serviceuser.user_domain_name" $user }}
username={{ printf "{{ (fromJson .%s).username }}" $user.usage }}
password={{ printf "{{ (fromJson .%s).password }}" $user.usage }}
region_name={{ $.Values.regionName | quote }}
Expand Down
Loading