From 92240e8061bccf775ab4c43b63ee888c3e039de1 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Mon, 18 Dec 2023 10:57:50 +0100 Subject: [PATCH] pr anmerkungen --- src/main/helm/templates/keycloak-user-crd.yaml | 6 ++++-- .../ozgcloud_keycloak_operator_secrets_read_role.yaml | 4 +++- ...zgcloud_keycloak_operator_secrets_read_role_binding.yaml | 4 +++- .../ozgcloud_keycloak_operator_secrets_write_role.yaml | 4 +++- ...gcloud_keycloak_operator_secrets_write_role_binding.yaml | 4 +++- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/helm/templates/keycloak-user-crd.yaml b/src/main/helm/templates/keycloak-user-crd.yaml index b3005e8a..42dd1067 100644 --- a/src/main/helm/templates/keycloak-user-crd.yaml +++ b/src/main/helm/templates/keycloak-user-crd.yaml @@ -1,4 +1,5 @@ -{{ if and (not (.Values.sso).disableOzgOperator) (.Values.sso).api_user }} +{{- if not (.Values.sso).disableOzgOperator }} +{{ if (.Values.sso).api_user }} apiVersion: operator.ozgcloud.de/v1 kind: OzgCloudKeycloakUser metadata: @@ -31,4 +32,5 @@ spec: {{ toYaml . | indent 6 }} {{- end }} {{- end }} -{{ end }} \ No newline at end of file +{{ end }} +{{- end }} \ No newline at end of file diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml index 5530d704..b8647883 100644 --- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml +++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml @@ -1,4 +1,5 @@ -{{- if and (not (.Values.sso).disableOzgOperator) (.Values.sso).api_user }} +{{- if not (.Values.sso).disableOzgOperator }} +{{- if (.Values.sso).api_user }} apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -14,4 +15,5 @@ rules: verbs: - get - list +{{- end }} {{- end }} \ No newline at end of file diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml index 31967cdc..b20195a7 100644 --- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml +++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml @@ -1,4 +1,5 @@ -{{- if and (not (.Values.sso).disableOzgOperator) (.Values.sso).api_user }} +{{- if not (.Values.sso).disableOzgOperator }} +{{- if (.Values.sso).api_user }} apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: @@ -12,4 +13,5 @@ roleRef: kind: Role name: ozgcloud-keycloak-operator-secrets-read-role-user-manager apiGroup: rbac.authorization.k8s.io +{{- end }} {{- end }} \ No newline at end of file diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml index fe6ced48..4144a159 100644 --- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml +++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml @@ -1,4 +1,5 @@ -{{- if and (not (.Values.sso).disableOzgOperator) (.Values.sso).api_user }} +{{- if not (.Values.sso).disableOzgOperator }} +{{- if (.Values.sso).api_user }} apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -11,4 +12,5 @@ rules: - secrets verbs: - create +{{- end }} {{- end }} \ No newline at end of file diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml index c5b453d0..147d792a 100644 --- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml +++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml @@ -1,4 +1,5 @@ -{{- if and (not (.Values.sso).disableOzgOperator) (.Values.sso).api_user }} +{{- if not (.Values.sso).disableOzgOperator }} +{{- if (.Values.sso).api_user }} apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: @@ -12,4 +13,5 @@ roleRef: kind: Role name: ozgcloud-keycloak-operator-secrets-write-role-user-manager apiGroup: rbac.authorization.k8s.io +{{- end }} {{- end }} \ No newline at end of file -- GitLab