From 1d8800bb91f25be338f1c64570c4332aa9452851 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 28 Nov 2024 15:23:24 +0100
Subject: [PATCH] OZG-6162 OZG-7254 Delete xdomea properties
---
.../src/main/resources/application-dev.yml | 4 --
.../src/main/resources/application-e2e.yml | 4 --
.../src/main/resources/application.yml | 4 --
src/main/helm/templates/deployment.yaml | 6 --
src/test/helm/deployment_xdomea_env_test.yaml | 55 -------------------
5 files changed, 73 deletions(-)
delete mode 100644 src/test/helm/deployment_xdomea_env_test.yaml
diff --git a/alfa-server/src/main/resources/application-dev.yml b/alfa-server/src/main/resources/application-dev.yml
index 6f11904235..ec9f40e322 100644
--- a/alfa-server/src/main/resources/application-dev.yml
+++ b/alfa-server/src/main/resources/application-dev.yml
@@ -14,7 +14,3 @@ ozgcloud:
production: false
stage:
production: false
- xdomea:
- behoerdenschluessel: "DUMMY-SCHLUESSEL"
- behoerdenschluessel-uri: "DUMMY-URI"
- behoerdenschluessel-version: "DUMMY-VERSION"
\ No newline at end of file
diff --git a/alfa-server/src/main/resources/application-e2e.yml b/alfa-server/src/main/resources/application-e2e.yml
index fd8c68442d..1f162b5430 100644
--- a/alfa-server/src/main/resources/application-e2e.yml
+++ b/alfa-server/src/main/resources/application-e2e.yml
@@ -13,7 +13,3 @@ ozgcloud:
url: /assets/benutzerleitfaden/benutzerleitfaden.pdf
user-manager:
url: http://localhost:9092
- xdomea:
- behoerdenschluessel: "DUMMY-SCHLUESSEL-E2E"
- behoerdenschluessel-uri: "DUMMY-URI-E2E"
- behoerdenschluessel-version: "DUMMY-VERSION-E2E"
\ No newline at end of file
diff --git a/alfa-server/src/main/resources/application.yml b/alfa-server/src/main/resources/application.yml
index aaf3f0290c..38c43bdefb 100644
--- a/alfa-server/src/main/resources/application.yml
+++ b/alfa-server/src/main/resources/application.yml
@@ -100,7 +100,3 @@ ozgcloud:
user-manager:
profile-template: /api/userProfiles/%s
search-template: /api/userProfiles/?searchBy={searchBy}
- xdomea:
- behoerdenschluessel:
- behoerdenschluessel-uri:
- behoerdenschluessel-version:
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 91335d8886..dee4ff1198 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -107,12 +107,6 @@ spec:
value: {{ $bescheid.formEngineName }}
{{- end }}
{{- end}}
- - name: ozgcloud_xdomea_behoerdenschluessel
- value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluessel | quote }}
- - name: ozgcloud_xdomea_behoerdenschluesselUri
- value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluesselUri}}
- - name: ozgcloud_xdomea_behoerdenschluesselVersion
- value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluesselVersion | quote }}
- name: ozgcloud_administration_address
value: {{ include "app.spring_cloud_config_administration_address" . }}
- name: grpc_client_zufi-manager_address
diff --git a/src/test/helm/deployment_xdomea_env_test.yaml b/src/test/helm/deployment_xdomea_env_test.yaml
deleted file mode 100644
index 351acfe657..0000000000
--- a/src/test/helm/deployment_xdomea_env_test.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-suite: deployment xdomea env
-release:
- name: alfa
- namespace: sh-helm-test
-templates:
- - templates/deployment.yaml
-set:
- baseUrl: test.company.local
- ozgcloud:
- environment: test
- bundesland: sh
- bezeichner: helm
- sso:
- serverUrl: https://sso.company.local
- imagePullSecret: image-pull-secret
-tests:
- - it: should not require on behoerdenschlüssel properties
- set:
- # note: explicitly non-set behoerdenschlüssel properties
- asserts:
- - notContains:
- path: spec.template.spec.containers[0].env
- content:
- name: ozgcloud_xdomea_behoerdenschluessel
- - notContains:
- path: spec.template.spec.containers[0].env
- content:
- name: ozgcloud_xdomea_behoerdenschluesselUri
- - notContains:
- path: spec.template.spec.containers[0].env
- content:
- name: ozgcloud_xdomea_behoerdenschluesselVersion
- - it: should set (optional) behoerdenschlüssel properties
- set:
- ozgcloud:
- xdomea:
- behoerdenschluessel: "123456"
- behoerdenschluesselUri: "uri.uri:uri"
- behoerdenschluesselVersion: "version 1"
- asserts:
- - contains:
- path: spec.template.spec.containers[0].env
- content:
- name: ozgcloud_xdomea_behoerdenschluessel
- value: "123456"
- - contains:
- path: spec.template.spec.containers[0].env
- content:
- name: ozgcloud_xdomea_behoerdenschluesselUri
- value: "uri.uri:uri"
- - contains:
- path: spec.template.spec.containers[0].env
- content:
- name: ozgcloud_xdomea_behoerdenschluesselVersion
- value: "version 1"
\ No newline at end of file
--
GitLab