From bc9a2d1f967cbd399a35ca1c75360f38abff13c8 Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Wed, 12 Mar 2025 18:35:14 +0100
Subject: [PATCH 1/4] OZG-7922 adjust keycloak versions
---
ozgcloud-keycloak-operator/pom.xml | 32 +++++++++++++++++++++++++-----
1 file changed, 27 insertions(+), 5 deletions(-)
diff --git a/ozgcloud-keycloak-operator/pom.xml b/ozgcloud-keycloak-operator/pom.xml
index 0238e03..4a41190 100644
--- a/ozgcloud-keycloak-operator/pom.xml
+++ b/ozgcloud-keycloak-operator/pom.xml
@@ -43,6 +43,7 @@
<properties>
<spring-boot.build-image.imageName>docker.ozg-sh.de/ozgcloud-keycloak-operator:build-latest</spring-boot.build-image.imageName>
+ <keycloak.version>24.0.5</keycloak.version>
</properties>
<dependencies>
@@ -57,16 +58,37 @@
<!-- keycloak -->
<dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-admin-client</artifactId>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-admin-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-common</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-core</artifactId>
+ <version>${keycloak.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-common</artifactId>
+ <version>${keycloak.version}</version>
+ </dependency>
+
+
<!-- tools -->
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
</dependency>
-
+
<!-- javax -->
<dependency>
<groupId>javax.validation</groupId>
@@ -88,7 +110,7 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
-
+
<!-- test -->
<dependency>
<groupId>org.springframework.boot</groupId>
--
GitLab
From 9c6fe57a6cebd504bc1f8fbb24f686f8d7824384 Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Wed, 12 Mar 2025 18:35:31 +0100
Subject: [PATCH 2/4] OZG-7922 update ozgclod-common-parent
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f113465..2eff4d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>4.7.0</version>
+ <version>4.11.0</version>
</parent>
<groupId>de.ozgcloud</groupId>
--
GitLab
From b3b0dc7395399b6aa2f7d05e9b6b0506212e3857 Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Wed, 12 Mar 2025 18:55:07 +0100
Subject: [PATCH 3/4] OZG-7922 update versions
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2eff4d0..1ef231e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,13 +48,13 @@
</modules>
<properties>
- <operator-sdk.version>5.4.1</operator-sdk.version>
+ <operator-sdk.version>5.6.0</operator-sdk.version>
<!-- tools -->
<reflections.version>0.10.2</reflections.version>
<validation-api.version>2.0.1.Final</validation-api.version>
<!-- test -->
- <kubernetes-server-mock.version>6.13.4</kubernetes-server-mock.version>
+ <kubernetes-server-mock.version>6.13.5</kubernetes-server-mock.version>
<io.javaoperatorsdk.version>0.9.7</io.javaoperatorsdk.version>
<!-- plugin -->
--
GitLab
From 9c5534fbe3fa7485e2ba86a2b1915d0aefb734db Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Wed, 12 Mar 2025 19:00:34 +0100
Subject: [PATCH 4/4] OZG-7922 adjust image tag generation
---
Jenkinsfile | 48 ++++++++++++++++++++++++------------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 186f623..0e19e18 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -80,7 +80,7 @@ pipeline {
steps {
script {
FAILED_STAGE=env.STAGE_NAME
- JAR_TAG = getPomVersion('pom.xml').replace("SNAPSHOT", "${env.BRANCH_NAME}-SNAPSHOT")
+ JAR_TAG = getPomVersion().replace("SNAPSHOT", "${env.BRANCH_NAME}-SNAPSHOT")
}
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${JAR_TAG} -DprocessAllModules=true"
@@ -166,7 +166,7 @@ pipeline {
steps {
script {
FAILED_STAGE=env.STAGE_NAME
- HELM_CHART_VERSION = generateHelmChartVersion()
+ HELM_CHART_VERSION = generateImageTag();
testAndDeployKeycloakHelmChart(HELM_CHART_VERSION)
}
@@ -177,7 +177,7 @@ pipeline {
steps {
script {
FAILED_STAGE=env.STAGE_NAME
- HELM_CHART_VERSION = generateHelmChartVersion()
+ HELM_CHART_VERSION = generateImageTag()
testAndDeployElasticsearchHelmChart(HELM_CHART_VERSION)
}
@@ -259,19 +259,6 @@ String getHelmRepoUrl(){
return "https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps-snapshot"
}
-String generateHelmChartVersion() {
- def chartVersion = getPomVersion('pom.xml')
-
- if (isMainBranch()) {
- chartVersion += "-${env.GIT_COMMIT.take(7)}"
- }
- else if (!isReleaseBranch()) {
- chartVersion += "-${env.BRANCH_NAME}"
- }
-
- return chartVersion.replaceAll('_', '-')
-}
-
Boolean isMainBranch() {
return env.BRANCH_NAME == 'main'
}
@@ -370,20 +357,33 @@ Void tagAndPushDockerImage(String imageName, String newTag){
}
}
-String getPomVersion(String pomFile){
- def pom = readMavenPom file: pomFile
+String generateImageTag() {
+ if (isReleaseBranch()) {
+ return getPomVersion()
+ }
+
+ return "${getPomVersion()}-${validateBranchName(env.BRANCH_NAME)}${getCommitHash()}".replaceAll("_", "-")
+}
+
+String getPomVersion(){
+ def pom = readMavenPom file: 'pom.xml'
return pom.version
}
-String generateImageTag() {
- def imageTag = "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}"
-
- if (env.BRANCH_NAME == 'main') {
- imageTag += "-${env.GIT_COMMIT.take(7)}"
+String validateBranchName(branchName) {
+ int maxLength = 20
+ if (branchName.length() > maxLength) {
+ String originalBranchName = branchName
+ branchName = branchName.substring(0, maxLength)
+ echo "WARNING: Branch name '${originalBranchName}' exceeded ${maxLength} characters. " +
+ "It has been truncated to '${branchName}' for deployment purposes."
}
+ return branchName
+}
- return imageTag
+String getCommitHash() {
+ return "-${env.GIT_COMMIT.take(7)}";
}
String getParentPomVersion(String filePath) {
--
GitLab