Skip to content

Commit

Permalink
bump up dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Ziming Zhang <zziming@vmware.com>
  • Loading branch information
bitsf committed Sep 5, 2022
1 parent 8a09ac2 commit 53b6bce
Show file tree
Hide file tree
Showing 78 changed files with 680 additions and 198 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v1
with:
version: v1.6.3
version: v1.11.0
args: release --rm-dist --release-footer /tmp/release.txt
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
64 changes: 33 additions & 31 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,17 @@ jobs:
sudo mount -t tmpfs tmpfs /tmp/lib/etcd
- name: Install Kubernetes
uses: helm/kind-action@v1.1.0
uses: helm/kind-action@v1.3.0
with:
version: v0.11.0
version: v0.14.0
cluster_name: harbor
node_image: kindest/node:v1.22.9
config: .github/kind.yaml

- name: Install CertManager
run: |
# Try the recet way to install crd or fallback to the old one
kubectl apply -f "https://github.com/jetstack/cert-manager/releases/download/v1.1.0/cert-manager.yaml"
kubectl apply -f "https://github.com/jetstack/cert-manager/releases/download/v1.7.3/cert-manager.yaml"
sleep 5
time kubectl -n cert-manager wait --for=condition=Available deployment --all --timeout 300s
Expand Down Expand Up @@ -132,20 +133,18 @@ jobs:
matrix:
# https://github.com/jetstack/cert-manager/tags
certManager:
# - "1.1.1"
# - "1.2.0"
- "1.5.3"
- "1.6.1"
- "1.6.3"
- "1.9.1"

# https://github.com/kubernetes-sigs/kind/releases
k8sVersion:
- "1.20.7"
- "1.21.2"
- "1.22.0"
- "1.23.0"
- "1.21.12"
- "1.23.6"
- "1.24.0"

# https://github.com/kubernetes/ingress-nginx/tags
ingress:
- "1.0.5"
- "1.3.0"

samples:
- "full_stack.yaml"
Expand Down Expand Up @@ -177,9 +176,9 @@ jobs:
sudo mount -t tmpfs tmpfs /tmp/lib/etcd
- name: Install Kubernetes v${{ matrix.k8sVersion }}
uses: helm/kind-action@v1.1.0
uses: helm/kind-action@v1.3.0
with:
version: v0.11.0
version: v0.14.0
node_image: kindest/node:v${{ matrix.k8sVersion }}
cluster_name: harbor
config: .github/kind_permission.yaml
Expand Down Expand Up @@ -347,13 +346,16 @@ jobs:
matrix:
# https://github.com/jetstack/cert-manager/tags
certManager:
- "1.4.4"
- "1.8.2"

k8sVersion:
- "1.20.7"
- "1.21.2"
# https://github.com/projectcontour/contour/tags
contour:
- "1.22.0"
- "1.23.0"

k8sVersion:
- "1.21.12"
- "1.23.6"
- "1.24.0"

samples:
- "full_stack.yaml"
Expand Down Expand Up @@ -384,9 +386,9 @@ jobs:
sudo mount -t tmpfs tmpfs /tmp/lib/etcd
- name: Install Kubernetes v${{ matrix.k8sVersion }}
uses: helm/kind-action@v1.1.0
uses: helm/kind-action@v1.3.0
with:
version: v0.11.0
version: v0.14.0
node_image: kindest/node:v${{ matrix.k8sVersion }}
cluster_name: harbor
config: .github/kind.yaml
Expand All @@ -399,9 +401,9 @@ jobs:
- name: Install Contour
run: |
kubectl apply -f https://github.com/projectcontour/contour/raw/v1.19.1/examples/render/contour.yaml
kubectl apply -f https://github.com/projectcontour/contour/raw/v${{ matrix.contour }}/examples/render/contour.yaml
sleep 5
kubectl patch daemonsets -n projectcontour envoy -p '{"spec":{"template":{"spec":{"nodeSelector":{"ingress-ready":"true"},"tolerations":[{"key":"node-role.kubernetes.io/master","operator":"Equal","effect":"NoSchedule"}]}}}}'
kubectl patch daemonsets -n projectcontour envoy -p '{"spec":{"template":{"spec":{"nodeSelector":{"ingress-ready":"true"},"tolerations":[{"key":"node-role.kubernetes.io/master","operator":"Equal","effect":"NoSchedule"}, {"key":"node-role.kubernetes.io/control-plane","operator":"Equal","effect":"NoSchedule"}]}}}}'
sleep 5
kubectl get all -n projectcontour
time kubectl wait --namespace projectcontour --for=condition=ready pod --selector=app=envoy --timeout=100s || kubectl get all -n projectcontour
Expand Down Expand Up @@ -555,17 +557,17 @@ jobs:
matrix:
# https://github.com/jetstack/cert-manager/tags
certManager:
- "1.3.3"
- "1.9.1"

# https://snapcraft.io/microk8s
k8sVersion:
- "1.20.7"
- "1.21.2"
- "1.22.0"
- "1.23.0"
- "1.21.12"
- "1.23.6"
- "1.24.0"

# https://github.com/kubernetes/ingress-nginx/tags
ingress:
- "1.0.5"
- "1.3.0"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -593,9 +595,9 @@ jobs:
sudo mount -t tmpfs tmpfs /tmp/lib/etcd
- name: Install Kubernetes v${{ matrix.k8sVersion }}
uses: helm/kind-action@v1.1.0
uses: helm/kind-action@v1.3.0
with:
version: v0.11.0
version: v0.14.0
node_image: kindest/node:v${{ matrix.k8sVersion }}
cluster_name: harbor
config: .github/kind.yaml
Expand Down
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ $(CONTROLLER_GEN):

# find or download markdownlint
# download markdownlint if necessary
MARKDOWNLINT_VERSION := 0.31.1
MARKDOWNLINT_VERSION := 0.32.2
MARKDOWNLINT := $(BIN)/markdownlint

.PHONY: markdownlint
Expand All @@ -550,7 +550,7 @@ $(MARKDOWNLINT):
# find or download golangci-lint
# download golangci-lint if necessary
GOLANGCI_LINT := $(BIN)/golangci-lint
GOLANGCI_LINT_VERSION := 1.46.2
GOLANGCI_LINT_VERSION := 1.49.0

.PHONY: golangci-lint
golangci-lint:
Expand All @@ -567,7 +567,7 @@ $(GOLANGCI_LINT):

# find or download kubebuilder
# download kubebuilder if necessary
KUBEBUIDER_VERSION := 3.2.0
KUBEBUIDER_VERSION := 3.6.0
KUBEBUILDER=$(BIN)/kubebuilder

.PHONY: kubebuilder
Expand All @@ -586,7 +586,7 @@ $(KUBEBUILDER):

# find or download kustomize
# download kustomize if necessary
KUSTOMIZE_VERSION := 4.5.4
KUSTOMIZE_VERSION := 4.5.7
KUSTOMIZE := $(BIN)/kustomize

.PHONY: kustomize
Expand All @@ -613,7 +613,7 @@ HELM=$(shell which helm 2> /dev/null)
endif

# find or download goreleaser
GORELEASER_VERSION := v1.6.3
GORELEASER_VERSION := v1.11.0
GORELEASER := $(BIN)/goreleaser

.PHONY: goreleaser
Expand All @@ -638,7 +638,7 @@ $(GORELEASER):

# find or download stringer
# download stringer if necessary
STRINGER_VERSION := v0.1.11
STRINGER_VERSION := v0.1.12
STRINGER := $(BIN)/stringer

.PHONY: stringer
Expand All @@ -664,7 +664,7 @@ $(STRINGER):

# find or download hadolint
# download hadolint if necessary
HADOLINT_VERSION := 1.18.0
HADOLINT_VERSION := 2.10.0
HADOLINT := $(BIN)/hadolint

.PHONY: hadolint
Expand Down Expand Up @@ -698,7 +698,7 @@ $(KIND):

# find or download helm-docs
# download helm-docs if necessary
HELM_DOCS_VERSION := 1.8.1
HELM_DOCS_VERSION := 1.11.0
HELM_DOCS := $(BIN)/helm-docs

.PHONY: helm-docs
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Versions of the underlying components are listed below:

| Components | Harbor | MinIO operator | PostgreSQL operator | Redis operator |
|---------------|-------------|----------------|---------------------|----------------|
| Versions | 2.5.x `[1]` | 4.4.22 | 1.6.3 | 1.1.1 |
| Versions | 2.5.x `[1]` | 4.4.28 | 1.6.3 | 1.1.1 |

NOTES:

Expand All @@ -78,17 +78,17 @@ NOTES:

Harbor operator supports two extra Kubernetes versions besides the current latest version (`n-2` pattern):

| Versions | 1.20 | 1.21 | 1.22 | 1.23 |
|---------------|--------------------|--------------------|---------------------|---------------------|
| Compatibility | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
| Versions | 1.21 | 1.22 | 1.23 | 1.24 |
|---------------|--------------------|--------------------|--------------------|---------------------|
| Compatibility | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |

### Cert manager versions

Harbor operator relies on cert manager to manage kinds of certificates used by Harbor cluster components. Table shown below lists the compatibilities of cert manager versions:

| Versions | 1.4[.4] | 1.5[.3] | 1.6[.1] |
|---------------|--------------------|----------------------|----------------------|
| Compatibility | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
| Versions | 1.6[.3] | 1.7[.3] | 1.8[.2] | 1.9[.1] |
|---------------|--------------------|----------------------|----------------------|----------------------|
| Compatibility | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |

### Ingress controller types

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/chartmuseum_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,6 @@ type ChartMuseumCacheSpec struct {
Redis *harbormetav1.RedisConnection `json:"redis,omitempty"`
}

func init() { // nolint:gochecknoinits
func init() { //nolint:gochecknoinits
SchemeBuilder.Register(&ChartMuseum{}, &ChartMuseumList{})
}
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/core_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,6 @@ type CoreLogSpec struct {
Level harbormetav1.CoreLogLevel `json:"level,omitempty"`
}

func init() { // nolint:gochecknoinits
func init() { //nolint:gochecknoinits
SchemeBuilder.Register(&Core{}, &CoreList{})
}
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/exporter_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,6 @@ type ExporterLogSpec struct {
Level harbormetav1.ExporterLogLevel `json:"level,omitempty"`
}

func init() { // nolint:gochecknoinits
func init() { //nolint:gochecknoinits
SchemeBuilder.Register(&Exporter{}, &ExporterList{})
}
4 changes: 2 additions & 2 deletions apis/goharbor.io/v1alpha3/harbor_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ func (r *HarborDatabaseSpec) GetPostgresqlConnection(component harbormetav1.Comp

var databaseName string

switch component { // nolint:exhaustive
switch component { //nolint:exhaustive
case harbormetav1.CoreComponent:
databaseName = harbormetav1.CoreDatabase
case harbormetav1.ExporterComponent:
Expand Down Expand Up @@ -755,7 +755,7 @@ type HarborProxySpec struct {
Components []string `json:"components,omitempty"`
}

func init() { // nolint:gochecknoinits
func init() { //nolint:gochecknoinits
SchemeBuilder.Register(&Harbor{}, &HarborList{})
}

Expand Down
Loading

0 comments on commit 53b6bce

Please sign in to comment.