diff --git a/Jenkinsfile b/Jenkinsfile
index 3d70124a45c4b11b782c03e6f1c5b2379afaa063..999c2844a2de5bcb5ccbb48bb086bb4ed86158eb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -160,7 +160,7 @@ pipeline {
HELM_CHART_VERSION = generateHelmChartVersion()
dir('src/main/helm') {
- sh "helm lint -f ../../test/unit-values.yaml"
+ sh "helm lint -f ../../test/linter-values.yaml"
sh "helm unittest --helm3 -f '../../test/helm/*.yaml' -v '../../test/unit-values.yaml' ."
diff --git a/run_helm_test.sh b/run_helm_test.sh
index 7324e7d118cdd0dd4d8815201c07089ea5122d12..ceb8ca700e0407fbd67ebd479d03c0c9780bb5ed 100755
--- a/run_helm_test.sh
+++ b/run_helm_test.sh
@@ -1,7 +1,8 @@
#!/bin/sh
set -e
+set -x
-helm template ./src/main/helm/ -f src/test/unit-values.yaml
-helm lint -f src/test/unit-values.yaml ./src/main/helm/
+helm template ./src/main/helm/ -f src/test/linter-values.yaml
+helm lint -f src/test/linter-values.yaml ./src/main/helm/
cd src/main/helm && helm unittest --helm3 -f '../../test/helm/*.yaml' -v '../../test/unit-values.yaml' .
\ No newline at end of file
diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index e8a339f4fd8344ec1e426ecc3b7fc6452eb06fb3..31b7db78f5842d6a8ca7cfd8da6b4934bd663014 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/src/main/helm/templates/network_policy.yaml
@@ -56,10 +56,7 @@ spec:
- to:
- namespaceSelector:
matchLabels:
- kubernetes.io/metadata.name: kube-system
- podSelector:
- matchLabels:
- k8s-app: kube-dns
+ kubernetes.io/metadata.name: {{ required "networkPolicy.dnsServerNamespace must be set" (.Values.networkPolicy).dnsServerNamespace }}
ports:
- port: 53
protocol: UDP
diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml
index ed301b85485858a7b7c41b758b8a9adda4f12001..66da8d8ea8f18d64f89f3dd61dc0e562c4141b07 100644
--- a/src/test/helm/network_policy_test.yaml
+++ b/src/test/helm/network_policy_test.yaml
@@ -29,14 +29,23 @@ templates:
- templates/network_policy.yaml
tests:
- it: should match apiVersion
+ set:
+ networkPolicy:
+ dnsServerNamespace: test-namespace-dns
asserts:
- isAPIVersion:
of: networking.k8s.io/v1
- it: should match kind
+ set:
+ networkPolicy:
+ dnsServerNamespace: test-namespace-dns
asserts:
- isKind:
of: NetworkPolicy
- it: validate metadata
+ set:
+ networkPolicy:
+ dnsServerNamespace: test-namespace-dns
asserts:
- equal:
path: metadata
@@ -44,6 +53,9 @@ tests:
name: network-policy-user-manager
namespace: by-helm-test
- it: validate spec
+ set:
+ networkPolicy:
+ dnsServerNamespace: test-namespace-dns
asserts:
- equal:
path: spec
@@ -72,10 +84,7 @@ tests:
- to:
- namespaceSelector:
matchLabels:
- kubernetes.io/metadata.name: kube-system
- podSelector:
- matchLabels:
- k8s-app: kube-dns
+ kubernetes.io/metadata.name: test-namespace-dns
ports:
- port: 53
protocol: UDP
@@ -84,6 +93,7 @@ tests:
- it: add ingress rule by values
set:
networkPolicy:
+ dnsServerNamespace: test-namespace-dns
additionalIngressConfig:
- podSelector:
matchLabels:
@@ -102,6 +112,7 @@ tests:
- it: test network policy disabled
set:
networkPolicy:
+ dnsServerNamespace: test-namespace-dns
disabled: true
asserts:
- hasDocuments:
@@ -110,6 +121,7 @@ tests:
- it: test network policy unset should be disabled
set:
networkPolicy:
+ dnsServerNamespace: test-namespace-dns
disabled: false
asserts:
- hasDocuments:
diff --git a/src/test/linter-values.yaml b/src/test/linter-values.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..90be37129692fc2427cdf559da3139282d7fd2c1
--- /dev/null
+++ b/src/test/linter-values.yaml
@@ -0,0 +1,41 @@
+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+baseUrl: test.sh.ozg-cloud.de
+
+ozgcloud:
+ bundesland: sh
+ bezeichner: helm
+ environment: test
+ keycloak:
+ api:
+ password: geheim
+
+sso:
+ serverUrl: sso.test.sh.ozg-cloud.de
+
+networkPolicy:
+ ssoPublicIp: 51.89.117.53/32
+ dnsServerNamespace: test-dns-namespace
+
\ No newline at end of file
diff --git a/src/test/unit-values.yaml b/src/test/unit-values.yaml
index b770b5627b1dededa79c5880016ab5cee831ed49..3beed7471843741873fa409ae049bf9c27009bbd 100644
--- a/src/test/unit-values.yaml
+++ b/src/test/unit-values.yaml
@@ -36,4 +36,4 @@ sso:
serverUrl: sso.test.sh.ozg-cloud.de
networkPolicy:
- ssoPublicIp: 51.89.117.53/32
\ No newline at end of file
+ ssoPublicIp: 51.89.117.53/32
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockService.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockService.java
index 23a2f0e73209f6d563a0584e026e4d2c64053aae..0c8837476ac7dfe16989c0620cbbcd1ad75798fe 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockService.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockService.java
@@ -26,10 +26,11 @@ package de.ozgcloud.user.common.lock;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
-import de.ozgcloud.common.logging.OzgCloudLogging;
-import de.ozgcloud.user.common.errorhandling.LockCreationException;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
+
+import de.ozgcloud.common.logging.OzgCloudLogging;
+import de.ozgcloud.user.common.errorhandling.LockCreationException;
import lombok.extern.log4j.Log4j2;
@Log4j2
@@ -57,12 +58,12 @@ public class LockService {
public void unlock() {
var count = repository.deleteAll();
- LOG.info("%s Locks deleted".formatted(count));
+ LOG.debug("%s Locks deleted".formatted(count));
}
public void lock(Instant timestamp) {
repository.persist(Lock.builder().timestamp(timestamp.toEpochMilli()).build());
- LOG.info("Lock created");
+ LOG.debug("Lock created");
}
Lock getByTimestamp(Instant timestamp) {