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

Upgrade dependencies #993

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions .github/actions/kind-create/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ inputs: # adding these parameters to make this reusable later on
kind_k8s_version:
description: 'The k8s version to use'
required: true
default: 'v1.24.15'
default: 'v1.27.3'
kind_config:
description: 'Path to the kind config to use'
required: true
Expand All @@ -23,7 +23,7 @@ runs:

steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- uses: engineerd/[email protected]
with:
name: ${{ inputs.kind_cluster_name }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ 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
uses: actions/checkout@v4

- name: Check Go modules dependency file integrity
run: |
Expand Down Expand Up @@ -49,15 +49,15 @@ 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
uses: actions/checkout@v4

- name: License cache
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 #v3.3.1
uses: actions/cache@v3
with:
path: .licensei.cache
key: license-v1-${{ hashFiles('**/go.sum') }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Cache Docker layers
uses: actions/cache@v3
with:
Expand All @@ -40,13 +40,13 @@ jobs:
TAG_OR_BRANCH: ${{ steps.refortag.outputs.value }}

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }}
- name: Build kafka-operator
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
tags: ghcr.io/banzaicloud/kafka-operator:${{ steps.imagetag.outputs.value }}
file: Dockerfile
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docker_perf_test_load.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Cache Docker layers
uses: actions/cache@v3
Expand All @@ -42,19 +42,19 @@ jobs:

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

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }}

- name: Build koperator-performance-test-load
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
tags: ghcr.io/banzaicloud/koperator-performance-test-load:${{ steps.imagetag.outputs.value }}
file: docs/benchmarks/loadgens/Dockerfile
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: 1.19
go-version: 1.21

- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build docker image
run: |
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@v4

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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:

- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Concatenate CRDs
run: |
Expand Down
14 changes: 14 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,17 @@ 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

issues:
exclude-rules:
- path: '(.+)_test\.go'
linters:
- goconst
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
31 changes: 15 additions & 16 deletions api/go.mod
Original file line number Diff line number Diff line change
@@ -1,36 +1,35 @@
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.3.0 // 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.18.0 // indirect
golang.org/x/text v0.14.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.110.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.4.1 // indirect
)
Loading
Loading