From dab48452f4ce8a4921a129d1c86ff2a1354d163b Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 30 Nov 2023 15:11:11 +0100
Subject: [PATCH] OZG-4624 rename helm image
---
doc/examples/client-alfa.yaml | 10 +++++-----
doc/examples/realm-berlin.yaml | 2 +-
doc/examples/user-helge.yaml | 2 +-
run-local.sh | 2 +-
src/main/helm/Chart.yaml | 4 ++--
src/main/helm/templates/deployment.yaml | 2 +-
src/test/helm/deployment_matchlabels_test.yaml | 6 +++---
src/test/helm/deployment_metadata_labels_test.yaml | 6 +++---
src/test/helm/deployment_pull_secret_test.yaml | 4 ++--
src/test/helm/rbacs/keycloak_admin_secret_read.yaml | 2 +-
src/test/helm/rbacs/keycloak_read_test.yaml | 2 +-
src/test/helm/rbacs/keycloak_write_test.yaml | 2 +-
src/test/helm/rbacs/serviceaccount_test.yaml | 2 +-
13 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/doc/examples/client-alfa.yaml b/doc/examples/client-alfa.yaml
index 2e4df43..1c109fb 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 c99c2ae..fc51ba6 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 a7f55e1..ac00115 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 7b6cff1..32c96b4 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 72a2fbf..25e247c 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 6d26ef9..93e9c33 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 feeaa0e..2f8cde7 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 20ab66a..1cbd552 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 1bd9be1..659b348 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 3e0b5d3..f8110ec 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 a142a96..2a52cf0 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 7467082..98fe2eb 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 44323bb..e4544ee 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
--
GitLab