From 696c32fbb6ad5e4da6b83a723abc902edfff5b73 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 30 Nov 2023 20:37:23 +0100
Subject: [PATCH] OZG-4188 OZG-4555 rename pluto to vorgang-manager
---
src/main/helm/questions.yml | 6 +++---
src/main/helm/templates/_helpers.tpl | 4 ++--
src/main/helm/templates/deployment.yaml | 2 +-
src/main/helm/templates/network_policy.yaml | 2 +-
src/main/helm/values.yaml | 2 +-
src/test/helm/deployment_defaults_env_test.yaml | 2 +-
src/test/helm/deployment_pluto_address_test.yaml | 6 +++---
src/test/helm/network_policy_test.yaml | 2 +-
src/test/unit-values.yaml | 2 +-
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/helm/questions.yml b/src/main/helm/questions.yml
index 60159a956b..253a9c80f5 100644
--- a/src/main/helm/questions.yml
+++ b/src/main/helm/questions.yml
@@ -52,11 +52,11 @@ questions:
label: "Environment"
type: string
required: true
- - variable: plutoName
+ - variable: vorgangManagerName
group: "Other"
type: string
- default: "pluto"
- label: "Name of the pluto deployment in the namespace"
+ default: "vorgang-manager"
+ label: "Name of the vorgang-manager deployment in the namespace"
- variable: sso.role_einheitlicher_ansprechpartner
group: "Other"
type: boolean
diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 1eabdba990..59f494e51d 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -50,8 +50,8 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- end -}}
{{- end -}}
-{{- define "app.grpc_client_pluto_address" -}}
-{{ printf "%s.%s:9090" ( coalesce .Values.plutoName "pluto" ) .Release.Namespace | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- define "app.grpc_client_vorgang_manager_address" -}}
+{{ printf "%s.%s:9090" ( coalesce .Values.vorgangManagerName "vorgang-manager" ) .Release.Namespace | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end -}}
{{- define "app.grpc_client_user-manager_address" -}}
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 003bfc9a96..6d2ee1247d 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -68,7 +68,7 @@ spec:
- name: SERVICE_BINDING_ROOT
value: "/bindings"
- name: grpc_client_pluto_address
- value: {{ include "app.grpc_client_pluto_address" . }}
+ value: {{ include "app.grpc_client_vorgang_manager_address" . }}
- name: grpc_client_user-manager_address
value: {{ include "app.grpc_client_user-manager_address" . }}
- name: spring_profiles_active
diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index 59e83c22a9..21f80e8acc 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/src/main/helm/templates/network_policy.yaml
@@ -22,7 +22,7 @@ spec:
- to:
- podSelector:
matchLabels:
- component: pluto
+ component: vorgang-manager
ports:
- port: 9090
protocol: TCP
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index f9191eeb7c..6299afcb84 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -60,7 +60,7 @@ usermanagerName: user-manager
# cpu: 50m
# memory: 500Mi
-# plutoName: pluto # [default: pluto]
+# vorgangManagerName: vorgang-manager # [default: vorgang-manager]
# sso: # Most values are set according to namespace name (<bundesland>-<name>-<level>) and are optional
# serverUrl: https://sso.<level>.by.ozg-cloud.de # [default: https://sso.dev.by.ozg-cloud.de, if level == "stage|prod" https://sso.by.ozg-cloud.de]
# apiPassword: # Required value
diff --git a/src/test/helm/deployment_defaults_env_test.yaml b/src/test/helm/deployment_defaults_env_test.yaml
index f0dee20234..9d695aaf28 100644
--- a/src/test/helm/deployment_defaults_env_test.yaml
+++ b/src/test/helm/deployment_defaults_env_test.yaml
@@ -39,7 +39,7 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: grpc_client_pluto_address
- value: pluto.sh-helm-test:9090
+ value: vorgang-manager.sh-helm-test:9090
- contains:
path: spec.template.spec.containers[0].env
content:
diff --git a/src/test/helm/deployment_pluto_address_test.yaml b/src/test/helm/deployment_pluto_address_test.yaml
index ed81b0fc62..36dc726c76 100644
--- a/src/test/helm/deployment_pluto_address_test.yaml
+++ b/src/test/helm/deployment_pluto_address_test.yaml
@@ -29,12 +29,12 @@ release:
templates:
- templates/deployment.yaml
tests:
- - it: should set the pluto name
+ - it: should set the vorgang-manager name
set:
- plutoName: my-test-pluto-name
+ vorgangManagerName: my-test-vorgang-manager-name
asserts:
- contains:
path: spec.template.spec.containers[0].env
content:
name: grpc_client_pluto_address
- value: my-test-pluto-name.sh-helm-test:9090
+ value: my-test-vorgang-manager-name.sh-helm-test:9090
diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml
index 1f1d32e794..bd129d8b2f 100644
--- a/src/test/helm/network_policy_test.yaml
+++ b/src/test/helm/network_policy_test.yaml
@@ -62,7 +62,7 @@ tests:
- to:
- podSelector:
matchLabels:
- component: pluto
+ component: vorgang-manager
ports:
- port: 9090
protocol: TCP
diff --git a/src/test/unit-values.yaml b/src/test/unit-values.yaml
index 53cb775ef7..e6c704ec6a 100644
--- a/src/test/unit-values.yaml
+++ b/src/test/unit-values.yaml
@@ -25,7 +25,7 @@
cluster_env: ""
replicaCount: 5
-plutoName: pluto
+vorgangManagerName: vorgang-manager
usermanagerName: my-test-usermanager-name
ozgcloud:
--
GitLab