Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
amuraru committed Nov 18, 2023
1 parent 9b59b31 commit 89c78fe
Show file tree
Hide file tree
Showing 45 changed files with 1,735 additions and 1,301 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
uses: actions/setup-go@v4
with:
go-version: 1.19
go-version: 1.21

- name: Checkout code
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }}
- name: Build kafka-operator
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
tags: ghcr.io/banzaicloud/kafka-operator:${{ steps.imagetag.outputs.value }}
file: Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker_perf_test_load.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

- name: Setup Docker metadata
id: setup-docker-metadata
uses: docker/metadata-action@v3
uses: docker/metadata-action@v4
with:
images: ghcr.io/banzaicloud/koperator-performance-test-load

Expand All @@ -54,7 +54,7 @@ jobs:
password: ${{ secrets.CR_PAT }}

- name: Build koperator-performance-test-load
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
tags: ghcr.io/banzaicloud/koperator-performance-test-load:${{ steps.imagetag.outputs.value }}
file: docs/benchmarks/loadgens/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.19
go-version: 1.21

- name: Checkout code
uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- uses: azure/setup-helm@v1
- uses: azure/setup-helm@v3
with:
version: ${{ env.HELM_VERSION }}

Expand Down
8 changes: 8 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,11 @@ linters-settings:
lll:
# FIXME: we should be able to reduce the length of lines to be closer to the default 120 lines
line-length: 300 # default: 120
depguard:
rules:
main:
files:
- $all
deny:
- pkg: "forbiddenpackage"
desc: Please don't use forbiddenpackage package
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19 as builder
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.21 as builder

ARG BUILDPLATFORM
ARG TARGETPLATFORM
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ RELEASE_MSG ?= "koperator release"

REL_TAG = $(shell ./scripts/increment_version.sh -${RELEASE_TYPE} ${TAG})

GOLANGCI_VERSION = 1.51.2
LICENSEI_VERSION = 0.8.0
GOLANGCI_VERSION = 1.55.2
LICENSEI_VERSION = 0.9.0
GOPROXY=https://proxy.golang.org

CONTROLLER_GEN_VERSION = v0.9.2
CONTROLLER_GEN_VERSION = v0.13.0
CONTROLLER_GEN = $(PWD)/bin/controller-gen

ENVTEST_K8S_VERSION = 1.24.x!
ENVTEST_K8S_VERSION = 1.27.x!

KUSTOMIZE_BASE = config/overlays/specific-manager-version

Expand Down Expand Up @@ -223,7 +223,7 @@ license-header-fix: gen-license-header bin/addlicense ## Fix missing license hea
$(ADDLICENSE_OPTS_IGNORE) \
$(ADDLICENSE_SOURCE_DIRS)

GOTEMPLATE_VERSION := 3.7.3
GOTEMPLATE_VERSION := 3.7.5

bin/gotemplate: $(BIN_DIR)/gotemplate-$(GOTEMPLATE_VERSION) ## Symlink gotemplate-<version> into versionless gotemplate.
@ln -sf gotemplate-$(GOTEMPLATE_VERSION) $(BIN_DIR)/gotemplate
Expand Down
34 changes: 18 additions & 16 deletions api/go.mod
Original file line number Diff line number Diff line change
@@ -1,36 +1,38 @@
module github.com/banzaicloud/koperator/api

go 1.19
go 1.21

require (
dario.cat/mergo v1.0.0
emperror.dev/errors v0.8.1
github.com/banzaicloud/istio-client-go v0.0.17
github.com/cert-manager/cert-manager v1.11.2
github.com/imdario/mergo v0.3.13
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
github.com/cert-manager/cert-manager v1.13.2
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
gotest.tools v2.2.0+incompatible
k8s.io/api v0.26.4
k8s.io/apimachinery v0.26.4
sigs.k8s.io/controller-runtime v0.14.6
k8s.io/api v0.28.4
k8s.io/apimachinery v0.28.4
sigs.k8s.io/controller-runtime v0.16.3
)

require (
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/text v0.7.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/text v0.13.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
)

// remove once https://github.com/cert-manager/cert-manager/issues/5953 is fixed
replace github.com/Venafi/vcert/v4 => github.com/jetstack/vcert/v4 v4.9.6-0.20230519122548-219f317ae107
Loading

0 comments on commit 89c78fe

Please sign in to comment.