Merge remote-tracking branch 'origin/master' into OZG-4453-SearchIndexOperator

# Conflicts:
#	pom.xml

Jenkinsfile

@@ -153,6 +153,23 @@ pipeline {
             }
         }
 
+        stage('Trigger Test rollout') {
+            when {
+                branch 'release'
+            }
+            steps {
+                script {
+                    FAILED_STAGE = env.STAGE_NAME
+
+                    cloneGitopsRepo()
+
+                    setNewTestVersion()
+
+                    pushNewTestVersion()
+                }
+            }
+        }
+
         stage ('OWASP Dependency-Check Vulnerabilities') {
             steps {
                     dependencyCheck additionalArguments: ''' 

ozgcloud-elastic-operator/pom.xml

@@ -6,12 +6,14 @@
 	<parent>
 		<groupId>de.ozgcloud</groupId>
 		<artifactId>ozgcloud-operator-parent</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>ozgcloud-elastic-operator</artifactId>
+	
 	<name>OzgCloud Elastic Operator</name>
 	<description>OzgCloud Elastic Operator</description>
+	<packaging>jar</packaging>
 
 	<dependencies>
 		<!-- keycloak -->
@@ -20,22 +22,6 @@
 			<artifactId>keycloak-admin-client</artifactId>
 		</dependency>
 		
-		<!-- TOCHECK: werden die gebraucht!? -->
-		<dependency>
-			<groupId>javax.validation</groupId>
-			<artifactId>validation-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jakarta.xml.bind</groupId>
-			<artifactId>jakarta.xml.bind-api</artifactId>
-			<version>4.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.reflections</groupId>
-			<artifactId>reflections</artifactId>
-		</dependency>
-		<!-- TOCHECK -->
-
 		<!-- spring -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

ozgcloud-keycloak-operator/pom.xml

@@ -11,7 +11,9 @@
 
 	<groupId>de.ozgcloud</groupId>
 	<artifactId>ozgcloud-keycloak-operator</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
+	<packaging>jar</packaging>
+	
 	<name>OzgCloud Keycloak Operator</name>
 	<description>OzgCloud Keycloak Operator</description>
 	
@@ -92,7 +94,6 @@
 			<artifactId>junit-jupiter-params</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 	</dependencies>
 
 	<build>

ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakClient.yaml

@@ -2,14 +2,14 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: ozgkeycloakclients.operator.ozgcloud.de
+  name: ozgcloudkeycloakclients.operator.ozgcloud.de
 spec:
   group: operator.ozgcloud.de
   names:
     kind: OzgCloudKeycloakClient
     listKind: OzgCloudKeycloakClientList
-    plural: ozgkeycloakclients
-    singular: ozgkeycloakclient
+    plural: ozgcloudkeycloakclients
+    singular: ozgcloudkeycloakclient
   scope: Namespaced
   versions:
   - name: v1

ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakGroup.yaml

@@ -2,14 +2,14 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: ozgkeycloakgroups.operator.ozgcloud.de
+  name: ozgcloudkeycloakgroups.operator.ozgcloud.de
 spec:
   group: operator.ozgcloud.de
   names:
     kind: OzgCloudKeycloakGroup
     listKind: OzgCloudKeycloakGroupList
-    plural: ozgkeycloakgroups
-    singular: ozgkeycloakgroup
+    plural: ozgcloudkeycloakgroups
+    singular: ozgcloudkeycloakgroup
   scope: Namespaced
   versions:
   - name: v1

ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakRealms.yaml

@@ -2,14 +2,14 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: ozgkeycloakrealms.operator.ozgcloud.de
+  name: ozgcloudkeycloakrealms.operator.ozgcloud.de
 spec:
   group: operator.ozgcloud.de
   names:
     kind: OzgCloudKeycloakRealm
     listKind: OzgCloudKeycloakRealmList
-    plural: ozgkeycloakrealms
-    singular: ozgkeycloakrealm
+    plural: ozgcloudkeycloakrealms
+    singular: ozgcloudkeycloakrealm
   scope: Namespaced
   versions:
   - name: v1

ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakUser.yaml

@@ -2,14 +2,14 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: ozgkeycloakusers.operator.ozgcloud.de
+  name: ozgcloudkeycloakusers.operator.ozgcloud.de
 spec:
   group: operator.ozgcloud.de
   names:
     kind: OzgCloudKeycloakUser
     listKind: OzgCloudKeycloakUserList
-    plural: ozgkeycloakusers
-    singular: ozgkeycloakuser
+    plural: ozgcloudkeycloakusers
+    singular: ozgcloudkeycloakuser
   scope: Namespaced
   versions:
   - name: v1

pom.xml

@@ -12,7 +12,7 @@
 
 	<groupId>de.ozgcloud</groupId>
 	<artifactId>ozgcloud-operator-parent</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>