Skip to content
Snippets Groups Projects
Commit 21e76f28 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4188 OZG-4555 revert renaming based on code review comments

parent 95fe715e
No related branches found
No related tags found
No related merge requests found
......@@ -10,7 +10,7 @@ kind: OzgKeycloakClient
metadata:
name: {{ include "app.generateKeycloakClientRessourceName" $client.client_name }}
namespace: {{ include "app.namespace" $ }}
{{- if $client.ozgcloudOperator }}
{{- if $client.kopOperator }}
annotations:
"helm.sh/resource-policy": keep
{{- end }}
......
{{ range $user := concat (.Values.sso.api_users | default list) (.Values.sso.keycloak_users | default list) }}
---
{{- if $user.ozgcloudOperator }}
apiVersion: api.ozgcloud-stack.de/v1
kind: OzgcloudKeycloakUser
{{- if $user.kopOperator }}
apiVersion: api.kop-stack.de/v1
kind: KopKeycloakUser
{{- else }}
apiVersion: operator.ozgcloud.de/v1
kind: OzgKeycloakUser
......@@ -10,7 +10,7 @@ kind: OzgKeycloakUser
metadata:
name: {{ include "app.generateKeycloakUserRessourceName" (deepCopy $user.name) }}
namespace: {{ include "app.namespace" $ }}
{{- if $user.ozgcloudOperator }}
{{- if $user.kopOperator }}
annotations:
"helm.sh/resource-policy": keep
{{- end }}
......
......@@ -51,12 +51,12 @@ tests:
- equal:
path: metadata.namespace
value: by-helm-test
- it: should contain header data for ozgcloudOperator
- it: should contain header data for kopOperator
set:
sso:
keycloak_clients:
- client_name: alfa
ozgcloudOperator: true
kopOperator: true
asserts:
- isAPIVersion:
of: api.ozgcloud-stack.de/v1
......
......@@ -541,8 +541,8 @@ tests:
environment: test
sso:
keycloak_users:
- name: ozgcloud
ozgcloudOperator: true
- name: kop
kopOperator: true
asserts:
- isAPIVersion:
of: api.ozgcloud-stack.de/v1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment