From a2a61056cc27f050f2023cd59b1a06dccd370f83 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 14:59:03 +0100 Subject: [PATCH] OPSEXP-2398 Bump Alfresco/alfresco-build-tools from 3.3.3 to 3.8.0 (#1044) --- .github/workflows/bumpVersions.yml | 8 ++++---- .../workflows/docker-compose-community.yml | 2 +- .../workflows/docker-compose-enterprise.yml | 2 +- .github/workflows/helm-community.yml | 9 +++------ .github/workflows/helm-enterprise.yml | 20 +++---------------- .github/workflows/helm-release.yml | 2 +- .github/workflows/helm-static-checks.yml | 8 ++++---- .github/workflows/pre-commit-compose.yml | 2 +- .github/workflows/pre-commit-helm.yml | 2 +- 9 files changed, 19 insertions(+), 36 deletions(-) diff --git a/.github/workflows/bumpVersions.yml b/.github/workflows/bumpVersions.yml index e3c6cfba5..699bcb96a 100644 --- a/.github/workflows/bumpVersions.yml +++ b/.github/workflows/bumpVersions.yml @@ -51,9 +51,9 @@ jobs: env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v3.3.3 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v3.8.0 - name: Regenerate helm docs if necessary - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v3.3.3 + uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v3.8.0 with: pre-commit-args: helm-docs || true skip_checkout: "true" @@ -106,9 +106,9 @@ jobs: QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }} UPDATECLI_GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }} - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v3.3.3 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v3.8.0 - name: Regenerate helm docs if necessary - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v3.3.3 + uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v3.8.0 with: pre-commit-args: helm-docs || true skip_checkout: "true" diff --git a/.github/workflows/docker-compose-community.yml b/.github/workflows/docker-compose-community.yml index 44dbd84ce..d4d7db468 100644 --- a/.github/workflows/docker-compose-community.yml +++ b/.github/workflows/docker-compose-community.yml @@ -22,6 +22,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: >- - Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v3.3.3 + Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v3.8.0 with: compose_file_path: docker-compose/community-docker-compose.yml diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml index 6582d44dc..b298293f4 100644 --- a/.github/workflows/docker-compose-enterprise.yml +++ b/.github/workflows/docker-compose-enterprise.yml @@ -49,7 +49,7 @@ jobs: ) steps: - uses: >- - Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v3.3.3 + Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v3.8.0 with: compose_file_path: docker-compose/${{ matrix.compose_file }} quay_username: ${{ secrets.QUAY_USERNAME }} diff --git a/.github/workflows/helm-community.yml b/.github/workflows/helm-community.yml index a35919f22..6481d9516 100644 --- a/.github/workflows/helm-community.yml +++ b/.github/workflows/helm-community.yml @@ -36,9 +36,11 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} - name: Setup cluster - uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v3.3.3 + uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v3.8.0 with: ingress-nginx-ref: controller-v1.8.2 + kind-version: v0.19.0 + kind-node-image: kindest/node:v1.27.1@sha256:b7d12ed662b873bd8510879c1846e87c7e676a79fefc93e17b2a52989d3ff42b - name: Set nginx ingress config run: | @@ -52,11 +54,6 @@ jobs: --from-file=.dockerconfigjson=$HOME/.docker/config.json \ --type=kubernetes.io/dockerconfigjson - - name: Set nginx ingress config - run: | - kubectl -n ingress-nginx patch cm ingress-nginx-controller \ - -p '{"data": {"allow-snippet-annotations":"true"}}' - - name: Helm install run: | helm dep up ./helm/alfresco-content-services diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index a5452909b..02e03a610 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -72,17 +72,6 @@ jobs: with: version: "3.12.1" - - name: Setup aws cli - run: | - curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" - unzip awscliv2.zip - sudo ./aws/install - - - name: Setup dnsutils - run: | - sudo apt update - sudo apt install -y dnsutils - - name: Login to Docker Hub uses: docker/login-action@v3 with: @@ -97,9 +86,11 @@ jobs: password: ${{ secrets.QUAY_PASSWORD }} - name: Setup cluster - uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v3.3.3 + uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v3.8.0 with: ingress-nginx-ref: controller-v1.8.2 + kind-version: v0.19.0 + kind-node-image: kindest/node:v1.27.1@sha256:b7d12ed662b873bd8510879c1846e87c7e676a79fefc93e17b2a52989d3ff42b - name: Set nginx ingress config run: | @@ -112,11 +103,6 @@ jobs: --from-file=.dockerconfigjson=$HOME/.docker/config.json \ --type=kubernetes.io/dockerconfigjson - - name: Set nginx ingress config - run: | - kubectl -n ingress-nginx patch cm ingress-nginx-controller \ - -p '{"data": {"allow-snippet-annotations":"true"}}' - - name: Helm install run: | helm dep up ./helm/alfresco-content-services diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml index 4be62e282..111d9db09 100644 --- a/.github/workflows/helm-release.yml +++ b/.github/workflows/helm-release.yml @@ -45,7 +45,7 @@ jobs: ! grep -e "-alpha" -e "-SNAPSHOT" helm/${{ matrix.charts }}/Chart.yaml - name: Publish chart uses: >- - Alfresco/alfresco-build-tools/.github/actions/dbp-charts/publish-chart@v3.3.3 + Alfresco/alfresco-build-tools/.github/actions/dbp-charts/publish-chart@v3.8.0 with: chart_name: ${{ matrix.charts }} github_token: ${{ secrets.BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/helm-static-checks.yml b/.github/workflows/helm-static-checks.yml index 43fe5cd6d..8604a1ae5 100644 --- a/.github/workflows/helm-static-checks.yml +++ b/.github/workflows/helm-static-checks.yml @@ -39,11 +39,11 @@ jobs: - name: Checkout uses: actions/checkout@v4 - uses: >- - Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v3.3.3 + Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v3.8.0 with: chart-dir: helm/${{ matrix.charts.name }} - uses: >- - Alfresco/alfresco-build-tools/.github/actions/helm-plugin@v3.3.3 + Alfresco/alfresco-build-tools/.github/actions/helm-plugin@v3.8.0 with: plugin_url: https://github.com/helm-unittest/helm-unittest - run: | @@ -58,11 +58,11 @@ jobs: - name: Checkout uses: actions/checkout@v4 - uses: >- - Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v3.3.3 + Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v3.8.0 with: chart-dir: helm/${{ matrix.charts.name }} - uses: >- - Alfresco/alfresco-build-tools/.github/actions/helm-template-yamllint@v3.3.3 + Alfresco/alfresco-build-tools/.github/actions/helm-template-yamllint@v3.8.0 with: chart-dir: helm/${{ matrix.charts.name }} helm-options: --values tests/values/test_values.yaml diff --git a/.github/workflows/pre-commit-compose.yml b/.github/workflows/pre-commit-compose.yml index 97636c9c3..c1fe80188 100644 --- a/.github/workflows/pre-commit-compose.yml +++ b/.github/workflows/pre-commit-compose.yml @@ -24,4 +24,4 @@ jobs: name: Run pre-commit runs-on: ubuntu-latest steps: - - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v3.3.3 + - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v3.8.0 diff --git a/.github/workflows/pre-commit-helm.yml b/.github/workflows/pre-commit-helm.yml index babb3b034..4064f613d 100644 --- a/.github/workflows/pre-commit-helm.yml +++ b/.github/workflows/pre-commit-helm.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v3.3.3 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v3.8.0 - name: Add dependency chart repos run: | helm repo add alfresco-helm-charts https://alfresco.github.io/alfresco-helm-charts