diff --git a/doc/examples/client-alfa.yaml b/doc/examples/client-alfa.yaml index 2e4df435095ccc956835b8da0b1189cf560cf909..1c109fb108be45a7b22ecf0bf2bf4843192af777 100644 --- a/doc/examples/client-alfa.yaml +++ b/doc/examples/client-alfa.yaml @@ -2,13 +2,13 @@ apiVersion: operator.ozgcloud.de/v1 kind: OzgCloudKeycloakClient metadata: name: alfa-keycloak-client1 - namespace: by-torsten-ozg-operator-dev + namespace: by-torsten-ozgcloud-keycloak-operator-dev spec: - client_base_url: https://torsten-ozg-operator.dev.by.ozg-cloud.de + client_base_url: https://torsten-ozgcloud-keycloak-operator.dev.by.ozg-cloud.de client_name: alfa1 client_redirect_uris: - - https://torsten-ozg-operator.dev.by.ozg-cloud.de - - https://torsten-ozg-operator.dev.by.ozg-cloud.de/* + - https://torsten-ozgcloud-keycloak-operator.dev.by.ozg-cloud.de + - https://torsten-ozgcloud-keycloak-operator.dev.by.ozg-cloud.de/* - http://localhost:4300 - http://localhost:4300/* - http://192.168.178.20:4300 @@ -18,7 +18,7 @@ spec: - name: VERWALTUNG_POSTSTELLE - name: VERWALTUNG_USER client_web_origins: - - https://torsten-ozg-operator.dev.by.ozg-cloud.de + - https://torsten-ozgcloud-keycloak-operator.dev.by.ozg-cloud.de keep_after_delete: false protocol_mappers: - name: organisationseinheitIdMapper diff --git a/doc/examples/realm-berlin.yaml b/doc/examples/realm-berlin.yaml index c99c2ae35853ff2b8a5e9b308acf483cdba84743..fc51ba6eb295649b5393354c85444a9efd32f13a 100644 --- a/doc/examples/realm-berlin.yaml +++ b/doc/examples/realm-berlin.yaml @@ -2,7 +2,7 @@ apiVersion: operator.ozgcloud.de/v1 kind: OzgCloudKeycloakRealm metadata: name: by-berlintest-dev - namespace: by-torsten-ozg-operator-dev + namespace: by-torsten-ozgcloud-keycloak-operator-dev spec: keep_after_delete: false kommune: by-kiel-dev diff --git a/doc/examples/user-helge.yaml b/doc/examples/user-helge.yaml index a7f55e1b42e21a8be5ec51b2b1c2adc71b813af0..ac00115c4f9d511d797029436518b260657265c6 100644 --- a/doc/examples/user-helge.yaml +++ b/doc/examples/user-helge.yaml @@ -2,7 +2,7 @@ apiVersion: operator.ozgcloud.de/v1 kind: OzgCloudKeycloakUser metadata: name: helge - namespace: by-torsten-ozg-operator-dev + namespace: by-torsten-ozgcloud-keycloak-operator-dev spec: keep_after_delete: false keycloak_user: diff --git a/run-local.sh b/run-local.sh index 7b6cff12a8e1111c664578c9ccab3cf9cb3079fb..32c96b49b2bb9a3a76934e1325b991b7f12f51b1 100755 --- a/run-local.sh +++ b/run-local.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker run --rm -p 8080:8080 docker.ozg-sh.de/ozg-operator:build-latest +docker run --rm -p 8080:8080 docker.ozg-sh.de/ozgcloud-keycloak-operator:build-latest diff --git a/src/main/helm/Chart.yaml b/src/main/helm/Chart.yaml index 72a2fbf301e8dc641ed992bf5aa0a55524148acd..25e247ca5d46a6c7dbaa325d627e0f863559a68a 100644 --- a/src/main/helm/Chart.yaml +++ b/src/main/helm/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -name: ozg-operator -description: OZG Cloud Operator +name: ozgcloud-keycloak-operator +description: OZG Cloud Keycloak Operator type: application version: 0.0.0-MANAGED-BY-JENKINS appVersion: "0.0.0-MANAGED-BY-JENKINS" diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml index 6d26ef996e96b1224e817ec1fd95709be47b92fc..93e9c335185b344a674ee76596253dd9950f7851 100644 --- a/src/main/helm/templates/deployment.yaml +++ b/src/main/helm/templates/deployment.yaml @@ -46,7 +46,7 @@ spec: spec: serviceAccountName: ozgcloud-keycloak-operator-serviceaccount containers: - - name: ozg-operator + - name: ozgcloud-keycloak-operator image: "{{ required "image.repo must be set" (.Values.image).repo }}/{{ required "image.name must be set" (.Values.image).name }}:{{ required "image.tag must be set" (.Values.image).tag }}" env: {{- with (.Values.env).customList }} diff --git a/src/test/helm/deployment_matchlabels_test.yaml b/src/test/helm/deployment_matchlabels_test.yaml index feeaa0e271253271a7e31e0313ed4ba53b7c8715..2f8cde74b7f150ac26dd95e46a8d8a9aa064915e 100644 --- a/src/test/helm/deployment_matchlabels_test.yaml +++ b/src/test/helm/deployment_matchlabels_test.yaml @@ -24,7 +24,7 @@ suite: deployment matchlabels release: - name: ozg-operator + name: ozgcloud-keycloak-operator namespace: sh-helm-test templates: - templates/deployment.yaml @@ -37,14 +37,14 @@ tests: asserts: - equal: path: spec.selector.matchLabels.[app.kubernetes.io/name] - value: ozg-operator + value: ozgcloud-keycloak-operator - equal: path: spec.selector.matchLabels.[app.kubernetes.io/namespace] value: sh-helm-test - equal: path: spec.template.metadata.labels.[app.kubernetes.io/name] - value: ozg-operator + value: ozgcloud-keycloak-operator - equal: path: spec.template.metadata.labels.[app.kubernetes.io/namespace] value: sh-helm-test \ No newline at end of file diff --git a/src/test/helm/deployment_metadata_labels_test.yaml b/src/test/helm/deployment_metadata_labels_test.yaml index 20ab66a4aca6efc734db249c2cc64f13319813de..1cbd552473f472618b142f2f2e244ef0937ed3a5 100644 --- a/src/test/helm/deployment_metadata_labels_test.yaml +++ b/src/test/helm/deployment_metadata_labels_test.yaml @@ -24,7 +24,7 @@ suite: deployment test metadata labels release: - name: ozg-operator + name: ozgcloud-keycloak-operator namespace: sh-helm-test templates: - templates/deployment.yaml @@ -37,10 +37,10 @@ tests: asserts: - equal: path: metadata.labels.[app.kubernetes.io/instance] - value: ozg-operator + value: ozgcloud-keycloak-operator - equal: path: metadata.labels.[app.kubernetes.io/name] - value: ozg-operator + value: ozgcloud-keycloak-operator - equal: path: metadata.labels.[app.kubernetes.io/part-of] value: ozg diff --git a/src/test/helm/deployment_pull_secret_test.yaml b/src/test/helm/deployment_pull_secret_test.yaml index 1bd9be1215c704463654dead4e9794ff16be5502..659b348d8afbbd1a9bb4dca4ea65e85cf8e3f69b 100644 --- a/src/test/helm/deployment_pull_secret_test.yaml +++ b/src/test/helm/deployment_pull_secret_test.yaml @@ -24,7 +24,7 @@ suite: deployment pull secret release: - name: ozg-operator + name: ozgcloud-keycloak-operator namespace: sh-helm-test templates: - deployment.yaml @@ -37,4 +37,4 @@ tests: asserts: - equal: path: spec.template.spec.imagePullSecrets[0].name - value: ozg-operator-image-pull-secret + value: ozgcloud-keycloak-operator-image-pull-secret diff --git a/src/test/helm/rbacs/keycloak_admin_secret_read.yaml b/src/test/helm/rbacs/keycloak_admin_secret_read.yaml index 3e0b5d38ca885de86b162a37aad518115221290e..f8110ec01bf2299ea649c18728675592e7a7f1b8 100644 --- a/src/test/helm/rbacs/keycloak_admin_secret_read.yaml +++ b/src/test/helm/rbacs/keycloak_admin_secret_read.yaml @@ -24,7 +24,7 @@ suite: Keycloak admin secret rbac test release: - name: ozg-operator + name: ozgcloud-keycloak-operator namespace: test-namespace templates: - templates/rbacs/keycloak_admin_secret_read.yaml diff --git a/src/test/helm/rbacs/keycloak_read_test.yaml b/src/test/helm/rbacs/keycloak_read_test.yaml index a142a9695fe64d51b927d7f42e0f0b293ab91923..2a52cf0982d275a62256ead45acc6475bfd94630 100644 --- a/src/test/helm/rbacs/keycloak_read_test.yaml +++ b/src/test/helm/rbacs/keycloak_read_test.yaml @@ -24,7 +24,7 @@ suite: Keycloak read rbac test release: - name: ozg-operator + name: ozgcloud-keycloak-operator namespace: test-namespace templates: - templates/rbacs/keycloak_read.yaml diff --git a/src/test/helm/rbacs/keycloak_write_test.yaml b/src/test/helm/rbacs/keycloak_write_test.yaml index 746708269097782a9bceb45f25aa0ee653e61634..98fe2eb9243a9126110b42fc7b6e36a3881aa5f3 100644 --- a/src/test/helm/rbacs/keycloak_write_test.yaml +++ b/src/test/helm/rbacs/keycloak_write_test.yaml @@ -24,7 +24,7 @@ suite: Keycloak write rbac test release: - name: ozg-operator + name: ozgcloud-keycloak-operator namespace: test-namespace templates: - templates/rbacs/keycloak_write.yaml diff --git a/src/test/helm/rbacs/serviceaccount_test.yaml b/src/test/helm/rbacs/serviceaccount_test.yaml index 44323bb0b341d2a4ed8f06b48f9de7e7b576b0b3..e4544eed75e979f1b5b09802fcf9ddff34f6f4fc 100644 --- a/src/test/helm/rbacs/serviceaccount_test.yaml +++ b/src/test/helm/rbacs/serviceaccount_test.yaml @@ -24,7 +24,7 @@ suite: ServiceAccount test release: - name: ozg-operator + name: ozgcloud-keycloak-operator namespace: test-namespace templates: - templates/rbacs/serviceaccount.yaml