Merge branch 'master' into OZG-3140-jenkins-umzug

d9d82eab · OZGCloud · a478b5a2 · a8905420 · d9d82eab · d9d82eab
Commit d9d82eab authored 2 years ago by OZGCloud
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -131,7 +131,7 @@ pipeline {
                    dir('src/main/helm') {
                        sh "helm lint -f test-values.yaml"

-                        sh "helm unittest -f '../../test/helm/*.yaml' ."
+                        sh "helm unittest -f '../../test/helm/*.yaml' -v '../../test/unit-values.yaml' ."

                        sh "helm package --version=${HELM_CHART_VERSION} ."

@@ -250,7 +250,7 @@ Void setNewProvisioningVersion(String environment) {

        envVersions.versions.afm_adapter.image.tag = IMAGE_TAG
        envVersions.versions.fs_adapter.image.tag = IMAGE_TAG
-        envVersions.charts.intelliform_adapter.version = HELM_CHART_VERSION
+        // envVersions.charts.intelliform_adapter.version = HELM_CHART_VERSION


        writeYaml file: envFile, data: envVersions, overwrite: true

--- a/common/pom.xml
+++ b/common/pom.xml
@@ -32,7 +32,7 @@
 	<parent>
 		<groupId>de.itvsh.kop.eingangsadapter</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.25.0-SNAPSHOT</version>
+		<version>0.25.0</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>common</artifactId>

--- a/formsolutions-adapter/pom.xml
+++ b/formsolutions-adapter/pom.xml
@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>de.itvsh.kop.eingangsadapter</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.25.0-SNAPSHOT</version>
+		<version>0.26.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>


--- a/forwarder/pom.xml
+++ b/forwarder/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>de.itvsh.kop.eingangsadapter</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.25.0-SNAPSHOT</version>
+		<version>0.26.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>


--- a/intelliform-adapter/pom.xml
+++ b/intelliform-adapter/pom.xml
@@ -33,7 +33,7 @@
 	<parent>
 		<groupId>de.itvsh.kop.eingangsadapter</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.25.0-SNAPSHOT</version>
+		<version>0.26.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>


--- a/pom.xml
+++ b/pom.xml
 <!--
-
    Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
    Ministerpräsidenten des Landes Schleswig-Holstein
    Staatskanzlei
@@ -30,12 +29,12 @@
 	<artifactId>parent</artifactId>
 	<name>Eingangs Adapter - Parent</name>
 	<packaging>pom</packaging>
-	<version>0.25.0-SNAPSHOT</version>
+	<version>0.26.0-SNAPSHOT</version>

 	<parent>
 		<groupId>de.itvsh.kop.common</groupId>
 		<artifactId>kop-common-parent</artifactId>
-		<version>1.2.1</version>
+		<version>1.3.0</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>

@@ -51,11 +50,11 @@
 	<properties>
 		<mapstruct.version>1.4.2.Final</mapstruct.version>

-		<pluto.version>0.31.0</pluto.version>
+		<pluto.version>1.1.0</pluto.version>

 		<jsoup.version>1.14.3</jsoup.version>
 		<xmlschema.version>2.3.0</xmlschema.version>
-		<kop.license.version>1.3.0-SNAPSHOT</kop.license.version>
+		<kop.license.version>1.3.0</kop.license.version>

 		<!-- plugins -->
 		<jaxb2-plugin.version>0.14.0</jaxb2-plugin.version>

--- a/router/pom.xml
+++ b/router/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>de.itvsh.kop.eingangsadapter</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.25.0-SNAPSHOT</version>
+		<version>0.26.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>


--- a/semantik-adapter/pom.xml
+++ b/semantik-adapter/pom.xml
@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>de.itvsh.kop.eingangsadapter</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.25.0-SNAPSHOT</version>
+		<version>0.26.0-SNAPSHOT</version>
 	</parent>
 	
 	<artifactId>semantik-adapter</artifactId>

--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -48,7 +48,6 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end }}
 {{- end }}

-
 {{- define "app.envSpringProfiles" }}
 {{- if (.Values.env).overrideSpringProfiles -}}
 {{ printf "%s" (.Values.env).overrideSpringProfiles }}
@@ -57,12 +56,10 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 {{- end -}}

-
 {{- define "app.kopEnvironment" -}}
 {{- required "Environment muss angegeben sein" (.Values.kop).environment -}}
 {{- end -}}

-
 {{- define "app.kopBezeichner" -}}
 {{ $length := len (.Values.kop).bezeichner }}
 {{- if ge 27 $length -}}
@@ -72,7 +69,6 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 {{- end -}}

-
 {{- define "app.resources" }}
 {{- if eq (include "app.kopEnvironment" . ) "prod" }}
  limits:
@@ -91,32 +87,10 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end }}
 {{- end -}}

-
 {{- define "app.ingress.host" }}
-{{- if .Values.ingress.overrideHost }}
-{{- printf "%s" ( trimPrefix "https://" .Values.ingress.overrideHost ) }}
-{{- else }}
-
-{{- if eq (include "app.kopEnvironment" . ) "prod" }}
 {{- if eq (.Values.image).name "formsolutions-adapter" }}
-{{- printf "%s.fs.ozg-sh.de" (include "app.kopBezeichner" .) }}
+{{- printf "%s-fs.%s" (include "app.kopBezeichner" .) .Values.baseUrl }}
 {{- else }}
-{{- printf "%s.afm.ozg-sh.de" (include "app.kopBezeichner" .) }}
-{{- end }}
-
-{{- else if eq (include "app.kopEnvironment" . ) "stage" }}
-{{- if eq (.Values.image).name "formsolutions-adapter" }}
-{{- printf "%s.stage.fs.ozg-sh.de" (include "app.kopBezeichner" .) }}
-{{- else }}
-{{- printf "%s.stage.afm.ozg-sh.de" (include "app.kopBezeichner" .) }}
-{{- end }}
-
-{{- else }}
-{{- if eq (.Values.image).name "formsolutions-adapter" }}
-{{- printf "%s-fs.%s.ozg-sh.de" (include "app.kopBezeichner" .)  (include "app.kopEnvironment" . ) }}
-{{- else }}
-{{- printf "%s-afm.%s.ozg-sh.de" (include "app.kopBezeichner" .) (include "app.kopEnvironment" . ) }}
-{{- end }}
-{{- end }}
-{{- end }}
+{{- printf "%s-afm.%s" (include "app.kopBezeichner" .) .Values.baseUrl }}
 {{- end }}
+{{- end -}}
\ No newline at end of file
--- a/src/main/helm/templates/ingress.yaml
+++ b/src/main/helm/templates/ingress.yaml
@@ -26,12 +26,14 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  {{- with .Values.ingressAnnotations }}
-  annotations: {{- toYaml . | nindent 4 }}
-  {{- end }}
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-prod
  name: {{ include "app.name" . }}
  namespace: {{ include "app.namespace" . }}
 spec:
+  {{- if ne (.Values).cluster_env "dataport"}}
+  ingressClassName: nginx
+  {{- end }}
  rules:
    - http:
        paths:
@@ -46,4 +48,7 @@ spec:
  tls:
    - hosts:
      - {{ include "app.ingress.host" . }}
+      {{- if ne (.Values).cluster_env "dataport" }}
+      secretName: {{ .Values.kop.bezeichner }}-{{ include "app.name" . }}-tls
+      {{- end }}
 {{- end -}}
\ No newline at end of file
--- a/src/main/helm/test-values.yaml
+++ b/src/main/helm/test-values.yaml
@@ -21,7 +21,7 @@
 # Die sprachspezifischen Genehmigungen und Beschränkungen
 # unter der Lizenz sind dem Lizenztext zu entnehmen.
 #
-
 kop:
  environment: test
  bezeichner: helm
+  bundesland: sh
\ No newline at end of file
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -21,6 +21,9 @@
 # Die sprachspezifischen Genehmigungen und Beschränkungen
 # unter der Lizenz sind dem Lizenztext zu entnehmen.
 #
+cluster_env: ""
+
+baseUrl: test.sh.ozg-cloud.de

 image:
  repo: docker.ozg-sh.de
@@ -40,11 +43,6 @@ image:
 #    cpu: 100m # [default: 100m]
 #    memory: 250Mi # [default: 250Mi]

-ingressAnnotations:
-  kubernetes.io/ingress.class: traefik
-  traefik.ingress.kubernetes.io/router.entrypoints: websecure
-  traefik.ingress.kubernetes.io/router.tls: "true"
-
 imageCredentials:
  registry: docker.ozg-sh.de
  username: kop
@@ -59,7 +57,3 @@ routing:
  targetPlutoName: pluto
 #  fallbackStrategy: DENY
 #  routingStrategy: SINGLE
-
-# kop:
-#   environment: dev
-#   bezeichner: helm
\ No newline at end of file
--- a/src/test/helm/deployment_defaults_labels_test.yaml
+++ b/src/test/helm/deployment_defaults_labels_test.yaml
@@ -32,8 +32,6 @@ templates:
  - templates/service.yaml
 tests:
  - it: check default labels
-    set:
-      kop.environment: dev
    asserts:
      - equal:
          path: metadata.labels.[app.kubernetes.io/instance]

--- a/src/test/helm/deployment_env_test.yaml
+++ b/src/test/helm/deployment_env_test.yaml
@@ -29,7 +29,6 @@ tests:
  - it: check customList
    template: deployment.yaml
    set:
-      kop.environment: test
      env.customList:
        - name: my_test_environment_name
          value: "A test value"

--- a/src/test/helm/deployment_resources_test.yaml
+++ b/src/test/helm/deployment_resources_test.yaml
@@ -30,7 +30,7 @@ templates:
 tests:
  - it: test resources for prod environment
    release:
-      namespace: sh-name-prod
+      namespace: sh-helm-prod
    set:
      kop.environment: prod
    asserts:
@@ -48,9 +48,7 @@ tests:
          value: 250Mi
  - it: test default resources
    release:
-      namespace: sh-name-dev
-    set:
-      kop.environment: dev
+      namespace: sh-helm-test
    asserts:
      - equal:
          path: spec.template.spec.containers[0].resources.limits.cpu

--- a/src/test/helm/deployment_routing-strategy.yaml
+++ b/src/test/helm/deployment_routing-strategy.yaml
@@ -32,8 +32,6 @@ set:
  image.tag: latest
 tests:
  - it: validate default routing values without questions.yaml
-    set:
-      kop.environment: test
    asserts:
      - contains:
          path: spec.template.spec.containers[0].env
@@ -47,7 +45,6 @@ tests:
            value: DENY
  - it: validate routing infos
    set:
-      kop.environment: test
      routing.routingStrategy: MULTI
      routing.fallbackStrategy: FUNDSTELLE
    asserts:

--- a/src/test/helm/deployment_springProfile_test.yaml
+++ b/src/test/helm/deployment_springProfile_test.yaml
@@ -30,7 +30,6 @@ templates:
 tests:
  - it: should override spring profiles
    set:
-      kop.environment: test
      env.overrideSpringProfiles: oc,stage,ea
    asserts:
      - isKind:
@@ -41,8 +40,6 @@ tests:
            name: spring_profiles_active
            value: oc,stage,ea
  - it: should generate spring profiles
-    set:
-      kop.environment: test
    asserts:
      - isKind:
          of: Deployment

--- a/src/test/helm/deployment_test.yaml
+++ b/src/test/helm/deployment_test.yaml
@@ -30,9 +30,6 @@ templates:
  - deployment.yaml
 tests:
  - it: validate image type and container image
-    set:
-      kop.environment: test
-      image.tag: latest
    asserts:
      - isKind:
          of: Deployment
@@ -40,9 +37,6 @@ tests:
          path: spec.template.spec.containers[0].image
          value: docker.ozg-sh.de/intelliform-adapter:latest
  - it: validate image pull secret resource name
-    set:
-      kop.environment: test
-      image.tag: latest
    asserts:
      - equal:
          path: spec.template.spec.imagePullSecrets[0].name

--- a/src/test/helm/image-pull-secret-test.yaml
+++ b/src/test/helm/image-pull-secret-test.yaml
@@ -28,8 +28,6 @@ templates:
 release:
  name: intelliform-adaptero
  namespace: helm-test
-set:
-  image.name: intelliform-adapter
 tests:
  - it: should match basic data
    asserts:

--- a/src/test/helm/ingress-create-or-not.yaml
+++ b/src/test/helm/ingress-create-or-not.yaml
@@ -29,8 +29,6 @@ tests:
  - it: create ingress by config
    set:
      ingress.enabled: true
-      kop.environment: dev
-      kop.bezeichner: unit
    asserts:
      - isKind:
          of: Ingress
@@ -41,9 +39,6 @@ tests:
      - hasDocuments:
          count: 0
  - it: ingress should be created by default
-    set:
-      kop.environment: dev
-      kop.bezeichner: unit
    asserts:
      - isKind:
          of: Ingress