diff --git a/Jenkinsfile b/Jenkinsfile index def5419adfb78fb1ca87bd38baa4401740972dd9..cd73182f1f5fa5d4ebff8f5c742d1d5d28ba81f8 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 637b0920a4d30880bc7b33445c94844437f2abc3..0000000000000000000000000000000000000000 --- 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 49f09f55635c40889b144e4344fda3ee5a029006..5c59e5b729fcba81b59f1d71cd54f713ad59abf2 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 c44e6e64e0272fa3580c0b60ff3cb76cc49abf3b..bd7df8c73e596096c6d457d7f5d2a04a2a859e8c 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 7b5f3e2167f8b45f8044a993691359dc11f13631..9404db81c9dc25dc0c0c59a0b967683ee9cd2c4c 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 637b0920a4d30880bc7b33445c94844437f2abc3..0000000000000000000000000000000000000000 --- 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 a9264c929616e47fdbdca195863565ec6bab82f2..0000000000000000000000000000000000000000 --- 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 06c95fb32ee2a7942ecc3dff7e8e406a3f699bb9..8c24a1cd6b30f687ddad684fdc08cfc6980dfc2a 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