From 864aee203f70503009aff016d9a680d0382e94cf Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 25 Jan 2023 11:43:10 +0100
Subject: [PATCH] OZG-3276 OZG-3318 cleanup; enable grpc ssl for prod profile
---
Jenkinsfile | 2 +-
config/application-develop.yaml | 6 ----
src/main/helm/templates/_helpers.tpl | 10 +-----
src/main/helm/templates/deployment.yaml | 2 --
src/test/helm/deployment_env_test.yaml | 25 +------------
.../config/application-develop.yaml | 6 ----
.../main/resources/application-develop.yaml | 36 -------------------
.../src/main/resources/application.yaml | 7 ++++
8 files changed, 10 insertions(+), 84 deletions(-)
delete mode 100644 config/application-develop.yaml
delete mode 100644 user-manager-server/config/application-develop.yaml
delete mode 100644 user-manager-server/src/main/resources/application-develop.yaml
diff --git a/Jenkinsfile b/Jenkinsfile
index def5419a..cd73182f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -138,7 +138,7 @@ pipeline {
dir('src/main/helm') {
sh "helm lint -f ../../test/unit-values.yaml"
- //sh "helm unittest -f '../../test/helm/*.yaml' -v '../../test/unit-values.yaml' ."
+ sh "helm unittest -f '../../test/helm/*.yaml' -v '../../test/unit-values.yaml' ."
sh "helm package --version=${HELM_CHART_VERSION} ."
diff --git a/config/application-develop.yaml b/config/application-develop.yaml
deleted file mode 100644
index 637b0920..00000000
--- a/config/application-develop.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-quarkus:
- grpc:
- server:
- ssl:
- certificate: /user-manager-tls-certificate/tls.crt
- key: /user-manager-tls-certificate/tls.key
\ No newline at end of file
diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 49f09f55..5c59e5b7 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -114,12 +114,4 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- define "app.goofyAddress" -}}
{{ printf "https://%s.%s" (include "app.kopBezeichner" .) .Values.baseUrl }}
-{{- end -}}
-
-{{- define "app.envProfiles" -}}
-{{- if eq (include "app.kopEnvironment" . ) "dev" -}}
-{{ printf "develop" }}
-{{- else -}}
-{{ printf "prod" }}
-{{- end -}}
-{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index c44e6e64..bd7df8c7 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -85,8 +85,6 @@ spec:
value: {{ include "app.baseUrl" . }}
- name: KOP_KEYCLOAK_SYNC_CRON
value: {{ .Values.kop.keycloak.sync.cron }}
- - name: QUARKUS_PROFILE
- value: {{ include "app.envProfiles" . }}
{{- with (.Values.env).customList }}
{{ toYaml . | indent 8 }}
{{- end }}
diff --git a/src/test/helm/deployment_env_test.yaml b/src/test/helm/deployment_env_test.yaml
index 7b5f3e21..9404db81 100644
--- a/src/test/helm/deployment_env_test.yaml
+++ b/src/test/helm/deployment_env_test.yaml
@@ -45,27 +45,4 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: my_test_environment_name
- value: "A test value"
-
- - it: should set profile to "develop" if environment is dev
- template: deployment.yaml
- set:
- kop:
- environment: dev
- asserts:
- - contains:
- path: spec.template.spec.containers[0].env
- content:
- name: QUARKUS_PROFILE
- value: develop
- - it: should set profile to "prod" as default
- template: deployment.yaml
- set:
- kop:
- environment: prod
- asserts:
- - contains:
- path: spec.template.spec.containers[0].env
- content:
- name: QUARKUS_PROFILE
- value: prod
\ No newline at end of file
+ value: "A test value"
\ No newline at end of file
diff --git a/user-manager-server/config/application-develop.yaml b/user-manager-server/config/application-develop.yaml
deleted file mode 100644
index 637b0920..00000000
--- a/user-manager-server/config/application-develop.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-quarkus:
- grpc:
- server:
- ssl:
- certificate: /user-manager-tls-certificate/tls.crt
- key: /user-manager-tls-certificate/tls.key
\ No newline at end of file
diff --git a/user-manager-server/src/main/resources/application-develop.yaml b/user-manager-server/src/main/resources/application-develop.yaml
deleted file mode 100644
index a9264c92..00000000
--- a/user-manager-server/src/main/resources/application-develop.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-quarkus:
- grpc:
- server:
- ssl:
- certificate: /user-manager-tls-certificate/tls.crt
- key: /user-manager-tls-certificate/tls.key
- mongodb:
- database: usermanager
- oidc:
- auth-server-url: https://sso.dev.by.kop-cloud.de/realms/sh-kiel-dev
- http:
- auth:
- permission:
- bearer:
- paths: /api/userProfiles/*,/api/user/*
- policy: permit
- deny-api:
- paths: /api/*
- policy: deny
- permit-migration:
- enabled: false
- paths: /api/migration/user/*
- policy: permit
- methods: GET
-kop:
- keycloak:
- sync:
- cron: "0 */10 * * * ?"
- api:
- user: goofyApiUser
- password: S9UEMuLG9y9ev99
- realm: dev
- organisations-einheit-id-key: organisationsEinheitId
- ldap-id-key: LDAP_ID
-keycloak:
- url: https://sso.dev.by.kop-cloud.de
\ No newline at end of file
diff --git a/user-manager-server/src/main/resources/application.yaml b/user-manager-server/src/main/resources/application.yaml
index 06c95fb3..8c24a1cd 100644
--- a/user-manager-server/src/main/resources/application.yaml
+++ b/user-manager-server/src/main/resources/application.yaml
@@ -1,3 +1,10 @@
+"%prod":
+ quarkus:
+ grpc:
+ server:
+ ssl:
+ certificate: /user-manager-tls-certificate/tls.crt
+ key: /user-manager-tls-certificate/tls.key
quarkus:
application:
name: kopusermanager
--
GitLab