From d99f30b563dd2a29dae616933a6375a01e7b3823 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/workflows/build-dev.yml | 2 +- .github/workflows/chart-tests.yml | 4 ++-- .github/workflows/contour-tests.yml | 4 ++-- .github/workflows/harbor-e2e-tests.yml | 4 ++-- .github/workflows/tests.yml | 2 +- Makefile | 2 +- manifests/cluster/kustomization.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 + 12 files changed, 15 insertions(+), 10 deletions(-) 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..2e743e153 100644 --- a/.github/workflows/harbor-e2e-tests.yml +++ b/.github/workflows/harbor-e2e-tests.yml @@ -201,7 +201,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 +214,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/manifests/cluster/kustomization.yaml b/manifests/cluster/kustomization.yaml index 162fdcd1d..921217fa8 100644 --- a/manifests/cluster/kustomization.yaml +++ b/manifests/cluster/kustomization.yaml @@ -17,7 +17,7 @@ resources: - patch/namespace.yaml - https://raw.githubusercontent.com/spotahome/redis-operator/v1.2.0/example/operator/all-redis-operator-resources.yaml # redis operator - https://raw.githubusercontent.com/spotahome/redis-operator/v1.2.0/manifests/databases.spotahome.com_redisfailovers.yaml # redis operator crd - - github.com/zalando/postgres-operator/manifests?ref=v1.7.0 # postgresql operator + - github.com/zalando/postgres-operator/manifests?ref=v1.9.0 # postgresql operator - github.com/minio/operator?ref=v4.4.28 # minIO storage operator # If you have to override the image source, uncomment this patch and also change the image source in the patch/image-source.yaml file. 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