diff --git a/Jenkinsfile b/Jenkinsfile index 252984b381edb0fb05fb43838d2acf51075f93dc..8e94fdcfdce3971ee0d7ba778e49a06125377ada 100644 --- a/Jenkinsfile +++ b/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: ''' diff --git a/ozgcloud-elastic-operator/pom.xml b/ozgcloud-elastic-operator/pom.xml index 6df5d09797cf903fb45bf384013c2baf142c6868..ed52db99ea016b735c9880255b1be03cbaf012b7 100644 --- a/ozgcloud-elastic-operator/pom.xml +++ b/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 --> @@ -19,23 +21,7 @@ <groupId>org.keycloak</groupId> <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> diff --git a/ozgcloud-keycloak-operator/pom.xml b/ozgcloud-keycloak-operator/pom.xml index 95e9e0a9d5d58ca57b1c040fd1c7a55562a5ba64..ff26d6fe329ae50f0093220d2ac5b3c50bb72192 100644 --- a/ozgcloud-keycloak-operator/pom.xml +++ b/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> diff --git a/ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakClient.yaml b/ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakClient.yaml index 48e43dede1c1dcca8c93cce42bf210f64196f24a..108f36bdf32ac63bf229c8a6fdd8804e8787354c 100644 --- a/ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakClient.yaml +++ b/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 diff --git a/ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakGroup.yaml b/ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakGroup.yaml index 8f97e2a4322e87db2f6e43b7b92405286c0732da..4e2991e5284721a5538a38d5f0d072b5cf72a62d 100644 --- a/ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakGroup.yaml +++ b/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 diff --git a/ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakRealms.yaml b/ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakRealms.yaml index 7a0a715c565c68c469f5d481c726eed3c3546728..d07a971b56465878743ec8a89c5b3e66f8c54db8 100644 --- a/ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakRealms.yaml +++ b/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 diff --git a/ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakUser.yaml b/ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakUser.yaml index e3a24f2e6fe032abc0435df081971a0bf9d27f99..a00d4569981e461bc5809198ac62ccff2adf7b31 100644 --- a/ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakUser.yaml +++ b/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 diff --git a/pom.xml b/pom.xml index dfe0be294b0e2eb108f0f775e6fd432b13daaeae..31b062e57de6703f97cc070f156f0d912d9d66d7 100644 --- a/pom.xml +++ b/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>