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
Branches
Tags
No related merge requests found
...@@ -10,7 +10,7 @@ kind: OzgKeycloakClient ...@@ -10,7 +10,7 @@ kind: OzgKeycloakClient
metadata: metadata:
name: {{ include "app.generateKeycloakClientRessourceName" $client.client_name }} name: {{ include "app.generateKeycloakClientRessourceName" $client.client_name }}
namespace: {{ include "app.namespace" $ }} namespace: {{ include "app.namespace" $ }}
{{- if $client.ozgcloudOperator }} {{- if $client.kopOperator }}
annotations: annotations:
"helm.sh/resource-policy": keep "helm.sh/resource-policy": keep
{{- end }} {{- end }}
......
{{ range $user := concat (.Values.sso.api_users | default list) (.Values.sso.keycloak_users | default list) }} {{ range $user := concat (.Values.sso.api_users | default list) (.Values.sso.keycloak_users | default list) }}
--- ---
{{- if $user.ozgcloudOperator }} {{- if $user.kopOperator }}
apiVersion: api.ozgcloud-stack.de/v1 apiVersion: api.kop-stack.de/v1
kind: OzgcloudKeycloakUser kind: KopKeycloakUser
{{- else }} {{- else }}
apiVersion: operator.ozgcloud.de/v1 apiVersion: operator.ozgcloud.de/v1
kind: OzgKeycloakUser kind: OzgKeycloakUser
...@@ -10,7 +10,7 @@ kind: OzgKeycloakUser ...@@ -10,7 +10,7 @@ kind: OzgKeycloakUser
metadata: metadata:
name: {{ include "app.generateKeycloakUserRessourceName" (deepCopy $user.name) }} name: {{ include "app.generateKeycloakUserRessourceName" (deepCopy $user.name) }}
namespace: {{ include "app.namespace" $ }} namespace: {{ include "app.namespace" $ }}
{{- if $user.ozgcloudOperator }} {{- if $user.kopOperator }}
annotations: annotations:
"helm.sh/resource-policy": keep "helm.sh/resource-policy": keep
{{- end }} {{- end }}
......
...@@ -51,12 +51,12 @@ tests: ...@@ -51,12 +51,12 @@ tests:
- equal: - equal:
path: metadata.namespace path: metadata.namespace
value: by-helm-test value: by-helm-test
- it: should contain header data for ozgcloudOperator - it: should contain header data for kopOperator
set: set:
sso: sso:
keycloak_clients: keycloak_clients:
- client_name: alfa - client_name: alfa
ozgcloudOperator: true kopOperator: true
asserts: asserts:
- isAPIVersion: - isAPIVersion:
of: api.ozgcloud-stack.de/v1 of: api.ozgcloud-stack.de/v1
......
...@@ -541,8 +541,8 @@ tests: ...@@ -541,8 +541,8 @@ tests:
environment: test environment: test
sso: sso:
keycloak_users: keycloak_users:
- name: ozgcloud - name: kop
ozgcloudOperator: true kopOperator: true
asserts: asserts:
- isAPIVersion: - isAPIVersion:
of: api.ozgcloud-stack.de/v1 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