Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

operator
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

aa45ee9c

Commit aa45ee9c authored 1 year ago by OZGCloud

Downloads
- Plain Diff

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

# Conflicts:
#	pom.xml

parents 38b6f73b fee12f03

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Jenkinsfile 17 additions, 0 deletions

Jenkinsfile
ozgcloud-elastic-operator/pom.xml 4 additions, 18 deletions

ozgcloud-elastic-operator/pom.xml
ozgcloud-keycloak-operator/pom.xml 3 additions, 2 deletions

ozgcloud-keycloak-operator/pom.xml
ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakClient.yaml 3 additions, 3 deletions

...emplates/crds/operator.ozgcloud.de_OzgKeycloakClient.yaml
ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakGroup.yaml 3 additions, 3 deletions

...templates/crds/operator.ozgcloud.de_OzgKeycloakGroup.yaml
ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakRealms.yaml 3 additions, 3 deletions

...emplates/crds/operator.ozgcloud.de_OzgKeycloakRealms.yaml
ozgcloud-keycloak-operator/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakUser.yaml 3 additions, 3 deletions

.../templates/crds/operator.ozgcloud.de_OzgKeycloakUser.yaml
pom.xml 1 addition, 1 deletion

pom.xml

with 37 additions and 33 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Impressum - Datenschutz - Barrierefreiheit