Skip to content
Snippets Groups Projects
Commit 1024ad4e authored by OZGCloud's avatar OZGCloud
Browse files

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

# Conflicts:
#	pom.xml
parents 40c5bdbc fee12f03
No related branches found
No related tags found
No related merge requests found
......@@ -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: '''
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -12,9 +12,12 @@
<groupId>de.ozgcloud</groupId>
<artifactId>ozgcloud-operator-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OzgCloud Keycloak Operator</name>
<description>OzgCloud Keycloak Operator</description>
<modules>
<module>ozgcloud-keycloak-operator</module>
</modules>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment