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.

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

Upgrde to latest dep dekn#10068 #1097

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
fae3279
remove descriptions from crd
BRONSOLO May 10, 2023
3ebbf62
upgrade controller-runtime version (#1034)
CoderTH May 24, 2023
4266fb8
cherry pick commit from harbor-operator main branch
devinturner Jun 23, 2023
361fe61
format harbor webhook imports
devinturner Jun 27, 2023
b2149e6
Merge pull request #1 from plotly/update-controller-runtime
devinturner Jul 6, 2023
3b49216
security: upgrade dependencies to resolve CVE-2022-31836, CVE-2021-30…
devinturner Mar 25, 2024
b76952a
Merge pull request #2 from plotly/sec-upgrade-harbor-operator
devinturner Mar 26, 2024
5a2fef6
fix: add 2.10.x to the known constraints
devinturner Mar 28, 2024
78885d4
fix: upgrade build tools and regenerate
devinturner Mar 28, 2024
33def05
Merge pull request #3 from plotly/fix-version-constraints
devinturner Mar 28, 2024
251d6a2
Merge pull request #4 from plotly/5.3-sp-release
devinturner Apr 12, 2024
995bbad
remove descriptions from crd
BRONSOLO May 10, 2023
1d854c1
cherry pick commit from harbor-operator main branch
devinturner Jun 23, 2023
2ec021a
format harbor webhook imports
devinturner Jun 27, 2023
2281996
security: upgrade dependencies to resolve CVE-2022-31836, CVE-2021-30…
devinturner Mar 25, 2024
596e9f9
fix: add 2.10.x to the known constraints
devinturner Mar 28, 2024
60b58e5
fix: upgrade build tools and regenerate
devinturner Mar 28, 2024
2861d23
Merge branch 'resync_fork' of [email protected]:plotly/harbor-operator.git
May 2, 2024
4c3d224
Fix dependencies
May 2, 2024
2a560b1
Fix dependencies
May 2, 2024
7b9db4e
Regenerate the deployments manifests
May 3, 2024
e09c8e5
PR reviews
May 7, 2024
43a05e8
Resync fork on 2024-04 version (#6)
agateaux May 8, 2024
6f4d264
Merge pull request #7 from plotly/resync_fork
agateaux May 8, 2024
1f8eb53
Update README.md with "maintained by Plotly" badge
gvwilson Jun 7, 2024
d054aad
Merge pull request #10 from plotly/gvwilson-patch-1
gvwilson Jun 10, 2024
835fbdb
fix: add harbor v2.11.x to known constraints dekn#8409
devinturner Jun 25, 2024
160d867
Merge pull request #11 from plotly/upgrade-harbor-2110
devinturner Jun 26, 2024
495da92
upgrade to go 1.23 + all dependencies to latest
Oct 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
25 changes: 0 additions & 25 deletions .github/auto-assignees.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/scripts/apidb_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ DOCKER_DATA_DIR=`mktemp -d -t docker-XXXXXX`

mkdir -p /var/log/harbor/

docker run -i --rm --privileged -v `pwd`/harbor:/drone -v /var/log/harbor/:/var/log/harbor/ -v $DOCKER_DATA_DIR:/var/lib/docker -e NOTARY_URL=https://$NOTARY_HOST -w /drone $E2E_IMAGE make swagger_client
docker run -i --rm --privileged -v `pwd`/harbor:/drone -v /var/log/harbor/:/var/log/harbor/ -v $DOCKER_DATA_DIR:/var/lib/docker -e NOTARY_URL=https://$NOTARY_HOST -w /drone $E2E_IMAGE $CMD
docker run -i --rm --privileged -v `pwd`/harbor:/drone -v /var/log/harbor/:/var/log/harbor/ -v $DOCKER_DATA_DIR:/var/lib/docker -w /drone $E2E_IMAGE make swagger_client
docker run -i --rm --privileged -v `pwd`/harbor:/drone -v /var/log/harbor/:/var/log/harbor/ -v $DOCKER_DATA_DIR:/var/lib/docker -w /drone $E2E_IMAGE $CMD

rc=$?

Expand Down
17 changes: 0 additions & 17 deletions .github/workflows/auto-assign-prs.yaml

This file was deleted.

26 changes: 13 additions & 13 deletions .github/workflows/build-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ jobs:
docker:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v2
- uses: actions/setup-go@v5
with:
go-version: 1.18
- uses: actions/checkout@v2
go-version: 1.23
- uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2.0.0
uses: docker/setup-buildx-action@v3.7.1
with:
driver-opts: image=moby/buildkit:master
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: '${{ secrets.DOCKER_USER }}'
password: '${{ secrets.DOCKER_TOKEN }}'
- name: Build and push to DockerHub
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
push: true
platforms: |
Expand All @@ -35,13 +35,13 @@ jobs:
file: Dockerfile
tags: goharbor/harbor-operator:dev
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: harbor
password: '${{ secrets.GHCR_TOKEN }}'
- name: Build and push go ghcr
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
push: true
platforms: |
Expand All @@ -53,13 +53,13 @@ jobs:
charts:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v2
- uses: actions/setup-go@v5
with:
go-version: 1.18
- uses: actions/checkout@v2
go-version: 1.23
- uses: actions/checkout@v4
- name: Package charts
run: make helm-generate
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: charts
path: charts/*.tgz
23 changes: 9 additions & 14 deletions .github/workflows/chart-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,18 @@ jobs:
- "1.3.0"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: actions/setup-go@v2
- uses: actions/setup-go@v5
with:
go-version: 1.18
go-version: 1.23

- uses: azure/setup-kubectl@v3
- uses: azure/setup-kubectl@v4
with:
version: 'latest'

- name: Cache go mod
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
Expand All @@ -62,9 +62,8 @@ jobs:
sudo mount -t tmpfs tmpfs /tmp/lib/etcd

- name: Install Kubernetes v${{ matrix.k8sVersion }}
uses: helm/kind-action@v1.3.0
uses: helm/kind-action@v1.10.0
with:
version: v0.14.0
node_image: kindest/node:v${{ matrix.k8sVersion }}
cluster_name: harbor
config: .github/kind.yaml
Expand Down Expand Up @@ -107,13 +106,9 @@ jobs:
IP=`hostname -I | awk '{print $1}'`
echo "IP=$IP" >> $GITHUB_ENV
CORE_HOST=core.$IP.nip.io
NOTARY_HOST=notary.$IP.nip.io
echo "CORE_HOST=$CORE_HOST" >> $GITHUB_ENV
echo "NOTARY_HOST=$NOTARY_HOST" >> $GITHUB_ENV
sed -i "s/core.harbor.domain/$CORE_HOST/g" config/samples/harborcluster-minimal/*.yaml
sed -i "s/notary.harbor.domain/$NOTARY_HOST/g" config/samples/harborcluster-minimal/*.yaml
sed -i "s/core.harbor.domain/$CORE_HOST/g" config/samples/harborcluster-standard/*.yaml
sed -i "s/notary.harbor.domain/$NOTARY_HOST/g" config/samples/harborcluster-standard/*.yaml

make sample-harborcluster-standard

Expand Down Expand Up @@ -169,14 +164,14 @@ jobs:
if: ${{ failure() }}
run: |
mkdir -p /tmp/harbor
for name in core jobservice registry registryctl trivy chartmuseum notaryserver notarysigner portal; do \
for name in core jobservice registry registryctl trivy portal; do \
kubectl logs -l "goharbor.io/operator-controller=$name" --all-containers > /tmp/harbor/$name.log ; \
done
kubectl logs -l "app.kubernetes.io/instance=harbor-database" --all-containers > /tmp/harbor/db.log
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 +184,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
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -50,7 +50,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -64,4 +64,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
22 changes: 9 additions & 13 deletions .github/workflows/contour-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@ jobs:
- "full_stack.yaml"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: actions/setup-go@v2
- uses: actions/setup-go@v5
with:
go-version: 1.18
go-version: 1.23

- uses: azure/setup-kubectl@v3
- uses: azure/setup-kubectl@v4
with:
version: 'v1.25.4'

- name: Cache go mod
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
Expand All @@ -64,9 +64,8 @@ jobs:
sudo mount -t tmpfs tmpfs /tmp/lib/etcd

- name: Install Kubernetes v${{ matrix.k8sVersion }}
uses: helm/kind-action@v1.3.0
uses: helm/kind-action@v1.10.0
with:
version: v0.14.0
node_image: kindest/node:v${{ matrix.k8sVersion }}
cluster_name: harbor
config: .github/kind.yaml
Expand Down Expand Up @@ -113,14 +112,11 @@ jobs:
IP=`hostname -I | awk '{print $1}'`
echo "IP=$IP" >> $GITHUB_ENV
CORE_HOST=core.$IP.nip.io
NOTARY_HOST=notary.$IP.nip.io
MINIO_HOST=minio.$IP.nip.io
echo "CORE_HOST=$CORE_HOST" >> $GITHUB_ENV
echo "NOTARY_HOST=$NOTARY_HOST" >> $GITHUB_ENV
echo "MINIO_HOST=$MINIO_HOST" >> $GITHUB_ENV
samplefile=${{ matrix.samples }}
sed -i "s/core.harbor.domain/$CORE_HOST/g" manifests/samples/$samplefile
sed -i "s/notary.harbor.domain/$NOTARY_HOST/g" manifests/samples/$samplefile
sed -i "s/minio.harbor.domain/$MINIO_HOST/g" manifests/samples/$samplefile
sed -i "s/controller: default/controller: contour/g" manifests/samples/$samplefile
sed -i "s/logLevel: info/logLevel: debug/g" manifests/samples/$samplefile
Expand Down Expand Up @@ -191,14 +187,14 @@ jobs:
df -h
free -m
mkdir -p /tmp/harbor
for name in core jobservice registry registryctl trivy chartmuseum notaryserver notarysigner portal; do \
for name in core jobservice registry registryctl trivy portal; do \
kubectl -n cluster-sample-ns logs -l "goharbor.io/operator-controller=$name" --all-containers > /tmp/harbor/$name.log ; \
done
kubectl -n cluster-sample-ns logs -l "application=spilo" --all-containers > /tmp/harbor/db.log
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 +207,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
22 changes: 9 additions & 13 deletions .github/workflows/harbor-e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,18 @@ jobs:
- "standard_stack_fs.yaml"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: actions/setup-go@v2
- uses: actions/setup-go@v5
with:
go-version: 1.18
go-version: 1.23

- uses: azure/setup-kubectl@v3
- uses: azure/setup-kubectl@v4
with:
version: 'latest'

- name: Cache go mod
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
Expand All @@ -67,9 +67,8 @@ jobs:
sudo mount -t tmpfs tmpfs /tmp/lib/etcd

- name: Install Kubernetes v${{ matrix.k8sVersion }}
uses: helm/kind-action@v1.3.0
uses: helm/kind-action@v1.10.0
with:
version: v0.14.0
node_image: kindest/node:v${{ matrix.k8sVersion }}
cluster_name: harbor
config: .github/kind_permission.yaml
Expand Down Expand Up @@ -116,14 +115,11 @@ jobs:
IP=`hostname -I | awk '{print $1}'`
echo "IP=$IP" >> $GITHUB_ENV
CORE_HOST=core.$IP.nip.io
NOTARY_HOST=notary.$IP.nip.io
MINIO_HOST=minio.$IP.nip.io
echo "CORE_HOST=$CORE_HOST" >> $GITHUB_ENV
echo "NOTARY_HOST=$NOTARY_HOST" >> $GITHUB_ENV
echo "MINIO_HOST=$MINIO_HOST" >> $GITHUB_ENV
samplefile=${{ matrix.samples }}
sed -i "s/core.harbor.domain/$CORE_HOST/g" manifests/samples/$samplefile
sed -i "s/notary.harbor.domain/$NOTARY_HOST/g" manifests/samples/$samplefile
sed -i "s/minio.harbor.domain/$MINIO_HOST/g" manifests/samples/$samplefile
sed -i "s/logLevel: info/logLevel: debug/g" manifests/samples/$samplefile

Expand Down Expand Up @@ -194,14 +190,14 @@ jobs:
df -h
free -m
mkdir -p /tmp/harbor
for name in core jobservice registry registryctl trivy chartmuseum notaryserver notarysigner portal; do \
for name in core jobservice registry registryctl trivy portal; do \
kubectl -n cluster-sample-ns logs -l "goharbor.io/operator-controller=$name" --all-containers > /tmp/harbor/$name.log ; \
done
kubectl -n cluster-sample-ns logs -l "application=spilo" --all-containers > /tmp/harbor/db.log
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 +210,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
Loading
Loading