From 5516b5ee1026c2f11551506112b647619ceb7c0a Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 15 Nov 2022 15:34:33 +0100
Subject: [PATCH] OZG-3152: changed bundesland back to sh and added
additionally helm template tests
---
Jenkinsfile | 3 +++
src/main/helm/dataport-values.yaml | 1 -
src/main/helm/templates/ingress.yaml | 6 ------
src/main/helm/test-values.yaml | 4 +---
src/main/helm/values.yaml | 7 +------
src/test/helm/deployment_defaults_labels_test.yaml | 4 ++--
src/test/helm/deployment_resources_test.yaml | 2 +-
src/test/helm/deployment_routing-strategy.yaml | 2 +-
src/test/helm/deployment_test.yaml | 2 +-
src/test/helm/ingress_test.yaml | 12 ++++++------
src/test/helm/service_monitor_test.yaml | 6 +++---
src/test/helm/service_test.yaml | 4 ++--
src/test/unit-values.yaml | 3 ++-
13 files changed, 23 insertions(+), 33 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 2af7a9304..9edda920b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -137,6 +137,9 @@ pipeline {
sh "helm lint -f test-values.yaml"
sh "helm lint -f dataport-values.yaml"
+ sh "helm template . -f test-values.yaml -n sh-helm-test --dry-run"
+ sh "helm template . -f dataport-values.yaml -n sh-helm-test --dry-run"
+
sh "helm unittest -f '../../test/helm/*.yaml' -v '../../test/unit-values.yaml' ."
sh "helm package --version=${HELM_CHART_VERSION} ."
diff --git a/src/main/helm/dataport-values.yaml b/src/main/helm/dataport-values.yaml
index d34a6c235..91cfaf93f 100644
--- a/src/main/helm/dataport-values.yaml
+++ b/src/main/helm/dataport-values.yaml
@@ -23,7 +23,6 @@
#
cluster_env: dataport
baseUrl: test.ozg-sh.de
-
kop:
environment: test
bezeichner: helm
\ No newline at end of file
diff --git a/src/main/helm/templates/ingress.yaml b/src/main/helm/templates/ingress.yaml
index d2f2f6c28..aecae6e6c 100644
--- a/src/main/helm/templates/ingress.yaml
+++ b/src/main/helm/templates/ingress.yaml
@@ -26,14 +26,8 @@
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
- {{- if eq (.Values).cluster_env "dataport" }}
- {{- with .Values.ingressAnnotations }}
- annotations: {{- toYaml . | nindent 4 }}
- {{- end }}
- {{- else }}
annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod
- {{- end }}
name: {{ include "app.name" . }}
namespace: {{ include "app.namespace" . }}
spec:
diff --git a/src/main/helm/test-values.yaml b/src/main/helm/test-values.yaml
index e5d00fa63..85d7890c1 100644
--- a/src/main/helm/test-values.yaml
+++ b/src/main/helm/test-values.yaml
@@ -21,9 +21,7 @@
# Die sprachspezifischen Genehmigungen und Beschränkungen
# unter der Lizenz sind dem Lizenztext zu entnehmen.
#
-
-baseUrl: test.by.ozg-cloud.de
-
+baseUrl: test.sh.ozg-cloud.de
kop:
environment: test
bezeichner: helm
\ No newline at end of file
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index 25f0e5750..de14ffd67 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -23,7 +23,7 @@
#
cluster_env: ""
-baseUrl: test.by.ozg-cloud.de
+baseUrl: test.sh.ozg-cloud.de
image:
repo: docker.ozg-sh.de
@@ -43,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
diff --git a/src/test/helm/deployment_defaults_labels_test.yaml b/src/test/helm/deployment_defaults_labels_test.yaml
index 795d3f770..70290fea5 100644
--- a/src/test/helm/deployment_defaults_labels_test.yaml
+++ b/src/test/helm/deployment_defaults_labels_test.yaml
@@ -25,7 +25,7 @@
suite: test deployment
release:
name: intelliform-adapter
- namespace: by-helm-test
+ namespace: sh-helm-test
templates:
- templates/deployment.yaml
- templates/service_monitor.yaml
@@ -44,4 +44,4 @@ tests:
value: kop
- equal:
path: metadata.labels.[app.kubernetes.io/namespace]
- value: by-helm-test
+ value: sh-helm-test
diff --git a/src/test/helm/deployment_resources_test.yaml b/src/test/helm/deployment_resources_test.yaml
index 11441f69d..588505e7e 100644
--- a/src/test/helm/deployment_resources_test.yaml
+++ b/src/test/helm/deployment_resources_test.yaml
@@ -48,7 +48,7 @@ tests:
value: 250Mi
- it: test default resources
release:
- namespace: by-helm-test
+ namespace: sh-helm-test
asserts:
- equal:
path: spec.template.spec.containers[0].resources.limits.cpu
diff --git a/src/test/helm/deployment_routing-strategy.yaml b/src/test/helm/deployment_routing-strategy.yaml
index 27c9e2084..7705a4af9 100644
--- a/src/test/helm/deployment_routing-strategy.yaml
+++ b/src/test/helm/deployment_routing-strategy.yaml
@@ -25,7 +25,7 @@
suite: test deployment
release:
name: intelliform-adapter
- namespace: by-helm-test
+ namespace: sh-helm-test
templates:
- deployment.yaml
set:
diff --git a/src/test/helm/deployment_test.yaml b/src/test/helm/deployment_test.yaml
index 0c182ce97..02ab7be03 100644
--- a/src/test/helm/deployment_test.yaml
+++ b/src/test/helm/deployment_test.yaml
@@ -25,7 +25,7 @@
suite: test deployment
release:
name: intelliform-adapter
- namespace: by-helm-test
+ namespace: sh-helm-test
templates:
- deployment.yaml
tests:
diff --git a/src/test/helm/ingress_test.yaml b/src/test/helm/ingress_test.yaml
index 80fe6cab1..0ec5a6754 100644
--- a/src/test/helm/ingress_test.yaml
+++ b/src/test/helm/ingress_test.yaml
@@ -25,7 +25,7 @@
suite: test ingress creation
release:
name: intelliform-adapter
- namespace: by-helm-test
+ namespace: sh-helm-test
templates:
- templates/ingress.yaml
tests:
@@ -39,7 +39,7 @@ tests:
value: intelliform-adapter
- equal:
path: metadata.namespace
- value: by-helm-test
+ value: sh-helm-test
- it: should match service port number
asserts:
- equal:
@@ -63,10 +63,10 @@ tests:
asserts:
- equal:
path: spec.rules[0].host
- value: helm-afm.test.by.ozg-cloud.de
+ value: helm-afm.test.sh.ozg-cloud.de
- equal:
path: spec.tls[0].hosts[0]
- value: helm-afm.test.by.ozg-cloud.de
+ value: helm-afm.test.sh.ozg-cloud.de
- it: should create fs host
@@ -75,7 +75,7 @@ tests:
asserts:
- equal:
path: spec.rules[0].host
- value: helm-fs.test.by.ozg-cloud.de
+ value: helm-fs.test.sh.ozg-cloud.de
- equal:
path: spec.tls[0].hosts[0]
- value: helm-fs.test.by.ozg-cloud.de
+ value: helm-fs.test.sh.ozg-cloud.de
diff --git a/src/test/helm/service_monitor_test.yaml b/src/test/helm/service_monitor_test.yaml
index 600c3f3a2..e20b93198 100644
--- a/src/test/helm/service_monitor_test.yaml
+++ b/src/test/helm/service_monitor_test.yaml
@@ -25,7 +25,7 @@
suite: test deployment
release:
name: afm-adapter
- namespace: by-helm-test
+ namespace: sh-helm-test
templates:
- templates/service_monitor.yaml
tests:
@@ -60,7 +60,7 @@ tests:
asserts:
- contains:
path: spec.namespaceSelector.matchNames
- content: by-helm-test
+ content: sh-helm-test
- it: selector should contain the component label with the value afm-adapter-service
asserts:
- equal:
@@ -73,4 +73,4 @@ tests:
value: afm-adapter
- equal:
path: spec.selector.matchLabels.[app.kubernetes.io/namespace]
- value: by-helm-test
+ value: sh-helm-test
diff --git a/src/test/helm/service_test.yaml b/src/test/helm/service_test.yaml
index 04b386829..f9680d60e 100644
--- a/src/test/helm/service_test.yaml
+++ b/src/test/helm/service_test.yaml
@@ -25,7 +25,7 @@
suite: test deployment
release:
name: afm-adapter
- namespace: by-helm-test
+ namespace: sh-helm-test
templates:
- templates/service.yaml
tests:
@@ -74,5 +74,5 @@ tests:
value: afm-adapter
- equal:
path: spec.selector.[app.kubernetes.io/namespace]
- value: by-helm-test
+ value: sh-helm-test
\ No newline at end of file
diff --git a/src/test/unit-values.yaml b/src/test/unit-values.yaml
index da77a1e5b..5a2a0cc18 100644
--- a/src/test/unit-values.yaml
+++ b/src/test/unit-values.yaml
@@ -22,9 +22,10 @@
# unter der Lizenz sind dem Lizenztext zu entnehmen.
#
-baseUrl: test.by.ozg-cloud.de
+baseUrl: test.sh.ozg-cloud.de
kop:
+ bundesland: sh
environment: test
bezeichner: helm
--
GitLab