Skip to content

Commit

Permalink
chore: fix release 1.4 ci job
Browse files Browse the repository at this point in the history
Signed-off-by: suhan.zcy <[email protected]>
  • Loading branch information
suhan.zcy committed Sep 24, 2024
1 parent 9d23a0a commit 94c686d
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/chart-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/contour-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/harbor-e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/harbor-operator/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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.10.1
digest: sha256:a457f468187c5ac3e0279e64e9a565335b0a5455400ccc818f29e4758c8074d0
generated: "2023-02-22T10:57:46.632256448+01:00"
2 changes: 1 addition & 1 deletion charts/harbor-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies:
tags:
- cache
- name: postgres-operator
version: 1.7.0
version: 1.10.1
condition: postgres-operator.enabled
repository: https://opensource.zalando.com/postgres-operator/charts/postgres-operator
tags:
Expand Down
2 changes: 1 addition & 1 deletion manifests/cluster/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.10.1 # 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.
Expand Down
1 change: 1 addition & 0 deletions manifests/samples/full_stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ spec:
internalTLS:
enabled: true
portal: {}
jobservice: {}
registry:
metrics:
enabled: true
Expand Down
1 change: 1 addition & 0 deletions manifests/samples/minimal_stack_fs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ spec:
internalTLS:
enabled: true
portal: {}
jobservice: {}
registry:
metrics:
enabled: true
Expand Down
1 change: 1 addition & 0 deletions manifests/samples/minimal_stack_incluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ spec:
internalTLS:
enabled: true
portal: {}
jobservice: {}
registry:
metrics:
enabled: true
Expand Down
1 change: 1 addition & 0 deletions manifests/samples/standard_stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ spec:
portal:
templateAnnotations:
foo: "bar"
jobservice: {}
registry: {}
trivy:
skipUpdate: false
Expand Down
1 change: 1 addition & 0 deletions manifests/samples/standard_stack_fs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ spec:
internalTLS:
enabled: true
portal: {}
jobservice: {}
registry:
metrics:
enabled: true
Expand Down

0 comments on commit 94c686d

Please sign in to comment.