Skip to content

Commit

Permalink
Rev Go to v1.22, Kubernetes to v1.28.9. (#3314)
Browse files Browse the repository at this point in the history
* Rev Go to v1.22, Kubernetes to v1.28.9.
* Rev other deps to pick up fixes.
* Rev controller-gen.
* Fix args to linter.
  • Loading branch information
fasaxc committed Apr 19, 2024
1 parent c2db2eb commit 23422c4
Show file tree
Hide file tree
Showing 24 changed files with 9,283 additions and 13,873 deletions.
6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -91,7 +91,7 @@ endif

PACKAGE_NAME?=github.com/tigera/operator
LOCAL_USER_ID?=$(shell id -u $$USER)
GO_BUILD_VER?=v0.90
GO_BUILD_VER?=v0.91
CALICO_BUILD?=calico/go-build:$(GO_BUILD_VER)-$(BUILDARCH)
SRC_FILES=$(shell find ./pkg -name '*.go')
SRC_FILES+=$(shell find ./api -name '*.go')
Expand Down Expand Up @@ -410,7 +410,7 @@ cluster-destroy: $(BINDIR)/kubectl $(BINDIR)/kind
.PHONY: static-checks
## Perform static checks on the code.
static-checks:
$(CONTAINERIZED) $(CALICO_BUILD) golangci-lint run --deadline 5m
$(CONTAINERIZED) $(CALICO_BUILD) golangci-lint run --timeout 5m

.PHONY: fix
## Fix static checks
Expand Down Expand Up @@ -722,7 +722,7 @@ help: # Some kind of magic from https://gist.github.com/rcmachado/af3db315e31383
#####################################
# Image URL to use all building/pushing image targets
IMG ?= controller:latest
CONTROLLER_GEN_VERSION ?= v0.11.3
CONTROLLER_GEN_VERSION ?= v0.14.0

# Run against the configured Kubernetes cluster in ~/.kube/config
run: generate fmt vet manifests
Expand Down
4 changes: 2 additions & 2 deletions api/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 28 additions & 30 deletions go.mod
@@ -1,13 +1,15 @@
module github.com/tigera/operator

go 1.20
go 1.22.0

require (
github.com/cloudflare/cfssl v1.6.4
github.com/aws/aws-sdk-go v1.51.9
github.com/cloudflare/cfssl v1.6.5
github.com/containernetworking/cni v1.0.1
github.com/elastic/cloud-on-k8s/v2 v2.9.0
github.com/go-ldap/ldap v3.0.3+incompatible
github.com/go-logr/logr v1.2.4
github.com/google/go-cmp v0.6.0
github.com/hashicorp/go-version v1.2.1
github.com/olivere/elastic/v7 v7.0.32
github.com/onsi/ginkgo v1.16.5
Expand All @@ -21,28 +23,24 @@ require (
github.com/stretchr/testify v1.8.4
github.com/tigera/api v0.0.0-20230406222214-ca74195900cb
go.uber.org/zap v1.24.0
golang.org/x/crypto v0.18.0
golang.org/x/crypto v0.22.0
gopkg.in/inf.v0 v0.9.1
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.27.10
k8s.io/apiextensions-apiserver v0.27.10
k8s.io/apimachinery v0.27.10
k8s.io/apiserver v0.27.10
k8s.io/client-go v0.27.10
k8s.io/kube-aggregator v0.27.10
k8s.io/utils v0.0.0-20230209194617-a36077c30491
k8s.io/api v0.28.9
k8s.io/apiextensions-apiserver v0.28.9
k8s.io/apimachinery v0.28.9
k8s.io/apiserver v0.28.9
k8s.io/client-go v0.28.9
k8s.io/kube-aggregator v0.28.9
sigs.k8s.io/controller-runtime v0.15.3
sigs.k8s.io/kind v0.17.0 // Do not remove, not used by code but used by build
sigs.k8s.io/yaml v1.3.0
)

require github.com/google/go-cmp v0.5.9

require (
github.com/BurntSushi/toml v1.0.0 // indirect
github.com/alessio/shellescape v1.4.1 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/aws/aws-sdk-go v1.51.9 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
Expand All @@ -56,12 +54,12 @@ require (
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
github.com/google/uuid v1.3.0 // indirect
Expand All @@ -76,43 +74,43 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/prometheus/client_golang v1.19.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
go.elastic.co/apm/module/apmzap/v2 v2.4.3 // indirect
go.elastic.co/apm/v2 v2.4.3 // indirect
go.elastic.co/fastjson v1.1.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/term v0.16.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/oauth2 v0.19.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/time v0.5.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
howett.net/plist v1.0.0 // indirect
k8s.io/component-base v0.27.10 // indirect
howett.net/plist v1.0.1 // indirect
k8s.io/component-base v0.28.9 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)
Expand Down

0 comments on commit 23422c4

Please sign in to comment.