From 4484033fa28654685a274786733ea6ea3fcb9668 Mon Sep 17 00:00:00 2001 From: Bastian SOMON Date: Mon, 27 Nov 2023 19:41:02 +0000 Subject: [PATCH] Fix: remove Javadoc --- .github/workflows/cd-production.yml | 62 +++++++++---------- infra/application/base/kustomization.yml | 4 +- .../overlay/production/kustomization.yml | 8 +-- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.github/workflows/cd-production.yml b/.github/workflows/cd-production.yml index c5ccda5..7122e36 100644 --- a/.github/workflows/cd-production.yml +++ b/.github/workflows/cd-production.yml @@ -36,30 +36,30 @@ jobs: backend/target/site/apidocs retention-days: 1 - build-javadoc: - runs-on: ubuntu-latest - needs: prepare-build - steps: - - uses: actions/checkout@v3 - - - name: Download a single artifact - uses: actions/download-artifact@v3 - with: - name: javadoc-jar - path: backend/target/site/apidocs - - - name: Build javadoc docker image - run: | - echo "*******************************" - echo "Building images" - docker build -t registry.bastian-somon.fr/city-connect-javadoc:${{ github.ref_name }} -f backend/Dockerfile.javadoc backend - echo "*******************************" - - echo "*******************************" - echo "Pushing images" - echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin registry.bastian-somon.fr - docker push registry.bastian-somon.fr/city-connect-javadoc:${{ github.ref_name }} - echo "*******************************" + # build-javadoc: + # runs-on: ubuntu-latest + # needs: prepare-build + # steps: + # - uses: actions/checkout@v3 + + # - name: Download a single artifact + # uses: actions/download-artifact@v3 + # with: + # name: javadoc-jar + # path: backend/target/site/apidocs + + # - name: Build javadoc docker image + # run: | + # echo "*******************************" + # echo "Building images" + # docker build -t registry.bastian-somon.fr/city-connect-javadoc:${{ github.ref_name }} -f backend/Dockerfile.javadoc backend + # echo "*******************************" + + # echo "*******************************" + # echo "Pushing images" + # echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin registry.bastian-somon.fr + # docker push registry.bastian-somon.fr/city-connect-javadoc:${{ github.ref_name }} + # echo "*******************************" build-application: runs-on: ubuntu-latest @@ -79,7 +79,7 @@ jobs: echo "Building images" docker build -t registry.bastian-somon.fr/city-connect:${{ github.ref_name }} -f backend/Dockerfile backend echo "*******************************" - + echo "*******************************" echo "Pushing images" echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin registry.bastian-somon.fr @@ -88,7 +88,7 @@ jobs: rollout-kube: runs-on: ubuntu-latest - needs: [build-application, build-javadoc] + needs: [build-application] steps: - uses: actions/checkout@v3 @@ -98,22 +98,22 @@ jobs: echo "Importing custom kubectl config" echo ${{ secrets.KUBE_CONFIG }} | base64 -d > config echo "*******************************" - + echo "*******************************" echo "Replacing value in deployment.yaml ..." sed -i "s/%%VERSION%%/${{ github.ref_name }}/1" infra/application/overlay/production/patches/backend-deployment.yml - sed -i "s/%%VERSION%%/${{ github.ref_name }}/1" infra/application/overlay/production/patches/javadoc-deployment.yml + # sed -i "s/%%VERSION%%/${{ github.ref_name }}/1" infra/application/overlay/production/patches/javadoc-deployment.yml echo "*******************************" - + echo "*******************************" echo "Updating infrastructure ..." kubectl --kubeconfig config apply -k infra/application/overlay/production echo "*******************************" - + echo "*******************************" echo "Rolling out deployment ..." kubectl --kubeconfig config rollout restart deployment/city-connect -n city-connect - kubectl --kubeconfig config rollout restart deployment/javadoc -n city-connect + # kubectl --kubeconfig config rollout restart deployment/javadoc -n city-connect echo "*******************************" create-release: diff --git a/infra/application/base/kustomization.yml b/infra/application/base/kustomization.yml index 642996a..5d6d6be 100644 --- a/infra/application/base/kustomization.yml +++ b/infra/application/base/kustomization.yml @@ -5,5 +5,5 @@ resources: - ingress.yml - backend/service.yml - backend/deployment.yml -- javadoc/service.yml -- javadoc/deployment.yml +# - javadoc/service.yml +# - javadoc/deployment.yml diff --git a/infra/application/overlay/production/kustomization.yml b/infra/application/overlay/production/kustomization.yml index 284b304..d6122be 100644 --- a/infra/application/overlay/production/kustomization.yml +++ b/infra/application/overlay/production/kustomization.yml @@ -7,10 +7,10 @@ resources: namespace: city-connect patches: - - target: - kind: Deployment - name: javadoc - path: ./patches/javadoc-deployment.yml + # - target: + # kind: Deployment + # name: javadoc + # path: ./patches/javadoc-deployment.yml - target: kind: Deployment name: server