A better structure for config-api

thotasyama · Jun 28, 2022 · 006aea3 · 006aea3
1 parent 6335090
commit 006aea3
Show file tree

Hide file tree

Showing 104 changed files with 277 additions and 527 deletions.
diff --git a/.github/workflows/operator-ci.yml b/.github/workflows/operator-ci.yml
@@ -76,7 +76,7 @@ jobs:
         run: |
           eval $(minikube -p minikube docker-env)
           (cd quarkus/container && docker build --build-arg KEYCLOAK_DIST=$(ls keycloak-*.tar.gz) . -t keycloak:${{ steps.vars.outputs.version }})
-          (cd operator/app && ./scripts/build-testing-docker-images.sh ${{ steps.vars.outputs.version }} keycloak custom-keycloak)
+          (cd operator && ./scripts/build-testing-docker-images.sh ${{ steps.vars.outputs.version }} keycloak custom-keycloak)
 
       - name: Test operator running locally
         run: |
@@ -121,7 +121,7 @@ jobs:
         run: |
           eval $(minikube -p minikube docker-env)
           (cd quarkus/container && docker build --build-arg KEYCLOAK_DIST=$(ls keycloak-*.tar.gz) . -t keycloak:${{ steps.vars.outputs.version }})
-          (cd operator/app && ./scripts/build-testing-docker-images.sh ${{ steps.vars.outputs.version }} keycloak custom-keycloak)
+          (cd operator && ./scripts/build-testing-docker-images.sh ${{ steps.vars.outputs.version }} keycloak custom-keycloak)
 
       - name: Test operator running in cluster
         run: |
@@ -163,7 +163,7 @@ jobs:
       - name: Install Yq
         run: sudo snap install yq
       - name: Install OLM
-        working-directory: operator/app
+        working-directory: operator
         run: ./scripts/install-olm.sh
       - name: Download keycloak distribution
         id: download-keycloak-dist
@@ -172,13 +172,13 @@ jobs:
           name: keycloak-distribution
           path: quarkus/container
       - name: Arrange OLM test installation
-        working-directory: operator/app
+        working-directory: operator
         run: |
           eval $(minikube -p minikube docker-env)
           ./scripts/olm-testing.sh ${GITHUB_SHA::6}
 
       - name: Deploy an example Keycloak and wait for it to be ready
-        working-directory: operator/app
+        working-directory: operator
         run: |
           kubectl apply -f src/main/resources/example-postgres.yaml
           ./scripts/check-crds-installed.sh

diff --git a/operator/app/.gitignore → operator/.gitignore b/operator/app/.gitignore → operator/.gitignore
diff --git a/operator/app/pom.xml b/operator/app/pom.xml