From 408cc29f60f5de19fcc61d2df6b8eba5a879607c Mon Sep 17 00:00:00 2001 From: "suhan.zcy" Date: Fri, 13 Sep 2024 15:50:52 +0800 Subject: [PATCH] chore: fix release 1.4 ci job Signed-off-by: suhan.zcy --- .github/scripts/apidb_test.sh | 4 ++++ .github/workflows/build-dev.yml | 2 +- .github/workflows/chart-tests.yml | 4 ++-- .github/workflows/contour-tests.yml | 4 ++-- .github/workflows/harbor-e2e-tests.yml | 7 ++++--- .github/workflows/tests.yml | 2 +- Makefile | 2 +- charts/harbor-operator/Chart.lock | 2 +- charts/harbor-operator/Chart.yaml | 2 +- manifests/samples/full_stack.yaml | 1 + manifests/samples/minimal_stack_fs.yaml | 1 + manifests/samples/minimal_stack_incluster.yaml | 1 + manifests/samples/standard_stack.yaml | 1 + manifests/samples/standard_stack_fs.yaml | 1 + 14 files changed, 22 insertions(+), 12 deletions(-) diff --git a/.github/scripts/apidb_test.sh b/.github/scripts/apidb_test.sh index 2b2a40f9e..6e11a87a0 100755 --- a/.github/scripts/apidb_test.sh +++ b/.github/scripts/apidb_test.sh @@ -34,4 +34,8 @@ df -h rm -rf $DOCKER_DATA_DIR +mkdir -p /tmp/harbor +# copy the e2e test reports and logs +cp `pwd`/harbor/output.xml `pwd`/harbor/log.html `pwd`/harbor/report.html /tmp/harbor + exit $rc diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 4acfbc302..55792bd27 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -59,7 +59,7 @@ jobs: - uses: actions/checkout@v2 - name: Package charts run: make helm-generate - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: charts path: charts/*.tgz diff --git a/.github/workflows/chart-tests.yml b/.github/workflows/chart-tests.yml index d46f50509..b6c4dca6b 100644 --- a/.github/workflows/chart-tests.yml +++ b/.github/workflows/chart-tests.yml @@ -176,7 +176,7 @@ jobs: kubectl logs -l "release=harbor-redis" --all-containers > /tmp/harbor/redis.log ls -l /tmp/harbor - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: ${{ failure() }} with: name: harbor_chart @@ -189,7 +189,7 @@ jobs: kind export logs --name harbor /tmp/logs ls -l /tmp/logs - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: ${{ failure() }} with: name: kind_chart diff --git a/.github/workflows/contour-tests.yml b/.github/workflows/contour-tests.yml index 46c09d3f3..cebf92cf3 100644 --- a/.github/workflows/contour-tests.yml +++ b/.github/workflows/contour-tests.yml @@ -198,7 +198,7 @@ jobs: kubectl -n cluster-sample-ns logs -l "app.kubernetes.io/component=redis" --all-containers > /tmp/harbor/redis.log ls -l /tmp/harbor - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: ${{ failure() }} with: name: contour_harbor_v${{ matrix.k8sVersion }}_v${{ matrix.certManager }}_${{ matrix.samples }} @@ -211,7 +211,7 @@ jobs: kind export logs --name harbor /tmp/logs ls -l /tmp/logs - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: ${{ failure() }} with: name: contour_kind_v${{ matrix.k8sVersion }}_v${{ matrix.certManager }}_${{ matrix.samples }} diff --git a/.github/workflows/harbor-e2e-tests.yml b/.github/workflows/harbor-e2e-tests.yml index 490319432..61801325e 100644 --- a/.github/workflows/harbor-e2e-tests.yml +++ b/.github/workflows/harbor-e2e-tests.yml @@ -181,7 +181,8 @@ jobs: docker pull $CORE_HOST/library/busybox:test - name: apidb test - run: bash .github/scripts/apidb_test.sh + run: | + bash .github/scripts/apidb_test.sh env: DOCKER_USER: ${{ secrets.DOCKER_USER }} DOCKER_PWD: ${{ secrets.DOCKER_TOKEN }} @@ -201,7 +202,7 @@ jobs: kubectl -n cluster-sample-ns logs -l "app.kubernetes.io/component=redis" --all-containers > /tmp/harbor/redis.log ls -l /tmp/harbor - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: ${{ failure() }} with: name: harbor_v${{ matrix.k8sVersion }}_v${{ matrix.certManager }}_${{ matrix.samples }} @@ -214,7 +215,7 @@ jobs: kind export logs --name harbor /tmp/logs ls -l /tmp/logs - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: ${{ failure() }} with: name: kind_v${{ matrix.k8sVersion }}_v${{ matrix.certManager }}_${{ matrix.samples }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7466a8611..358c9e9f1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -116,7 +116,7 @@ jobs: kind export logs --name harbor /tmp/logs ls -l /tmp/logs - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: ${{ failure() }} with: name: kind_go-tests diff --git a/Makefile b/Makefile index 53412c4b1..6ef0d4999 100644 --- a/Makefile +++ b/Makefile @@ -139,7 +139,7 @@ helm-postgres-operator: helm $(CHARTS_DIRECTORY)/postgres-operator/values.yaml $(MAKE) kube-namespace $(HELM) repo add zalando https://opensource.zalando.com/postgres-operator/charts/postgres-operator $(HELM) repo update - $(HELM) upgrade --namespace "$(NAMESPACE)" --install postgres-operator zalando/postgres-operator --version 1.7.0 -f $(CHARTS_DIRECTORY)/postgres-operator/values.yaml + $(HELM) upgrade --namespace "$(NAMESPACE)" --install postgres-operator zalando/postgres-operator --version 1.9.0 -f $(CHARTS_DIRECTORY)/postgres-operator/values.yaml helm-install: helm helm-generate helm-minio-operator helm-redis-operator helm-postgres-operator $(MAKE) kube-namespace diff --git a/charts/harbor-operator/Chart.lock b/charts/harbor-operator/Chart.lock index 17f534c52..72e53fdbb 100644 --- a/charts/harbor-operator/Chart.lock +++ b/charts/harbor-operator/Chart.lock @@ -7,6 +7,6 @@ dependencies: version: 3.1.4 - name: postgres-operator repository: https://opensource.zalando.com/postgres-operator/charts/postgres-operator - version: 1.7.0 + version: 1.9.0 digest: sha256:a457f468187c5ac3e0279e64e9a565335b0a5455400ccc818f29e4758c8074d0 generated: "2023-02-22T10:57:46.632256448+01:00" diff --git a/charts/harbor-operator/Chart.yaml b/charts/harbor-operator/Chart.yaml index 08080aec4..d8bb55da1 100644 --- a/charts/harbor-operator/Chart.yaml +++ b/charts/harbor-operator/Chart.yaml @@ -33,7 +33,7 @@ dependencies: tags: - cache - name: postgres-operator - version: 1.7.0 + version: 1.9.0 condition: postgres-operator.enabled repository: https://opensource.zalando.com/postgres-operator/charts/postgres-operator tags: diff --git a/manifests/samples/full_stack.yaml b/manifests/samples/full_stack.yaml index 7fa00d43a..f79e38758 100644 --- a/manifests/samples/full_stack.yaml +++ b/manifests/samples/full_stack.yaml @@ -93,6 +93,7 @@ spec: internalTLS: enabled: true portal: {} + jobservice: {} registry: metrics: enabled: true diff --git a/manifests/samples/minimal_stack_fs.yaml b/manifests/samples/minimal_stack_fs.yaml index 1cffdd21d..72d613500 100644 --- a/manifests/samples/minimal_stack_fs.yaml +++ b/manifests/samples/minimal_stack_fs.yaml @@ -84,6 +84,7 @@ spec: internalTLS: enabled: true portal: {} + jobservice: {} registry: metrics: enabled: true diff --git a/manifests/samples/minimal_stack_incluster.yaml b/manifests/samples/minimal_stack_incluster.yaml index 315b41cdb..0da9e1a62 100644 --- a/manifests/samples/minimal_stack_incluster.yaml +++ b/manifests/samples/minimal_stack_incluster.yaml @@ -83,6 +83,7 @@ spec: internalTLS: enabled: true portal: {} + jobservice: {} registry: metrics: enabled: true diff --git a/manifests/samples/standard_stack.yaml b/manifests/samples/standard_stack.yaml index 53e496572..3da89a202 100644 --- a/manifests/samples/standard_stack.yaml +++ b/manifests/samples/standard_stack.yaml @@ -231,6 +231,7 @@ spec: portal: templateAnnotations: foo: "bar" + jobservice: {} registry: {} trivy: skipUpdate: false diff --git a/manifests/samples/standard_stack_fs.yaml b/manifests/samples/standard_stack_fs.yaml index fd75988b6..599e894f7 100644 --- a/manifests/samples/standard_stack_fs.yaml +++ b/manifests/samples/standard_stack_fs.yaml @@ -141,6 +141,7 @@ spec: internalTLS: enabled: true portal: {} + jobservice: {} registry: metrics: enabled: true