Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: fix release 1.4 ci job #1092

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −12
Open

chore: fix release 1.4 ci job #1092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/scripts/apidb_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/build-dev.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
7 changes: 4 additions & 3 deletions .github/workflows/harbor-e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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.9.0
digest: sha256:a457f468187c5ac3e0279e64e9a565335b0a5455400ccc818f29e4758c8074d0
generated: "2023-02-22T10:57:46.632256448+01:00"
2 changes: 1 addition & 1 deletion charts/harbor-operator/Chart.yaml
View file
Open in desktop
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.9.0
condition: postgres-operator.enabled
repository: https://opensource.zalando.com/postgres-operator/charts/postgres-operator
tags:
Expand Down
1 change: 1 addition & 0 deletions manifests/samples/full_stack.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading