Skip to content

Commit 0d03e89

Browse files
author
mgianluc
committed
Bump go modules
1 parent cc51b46 commit 0d03e89

File tree

8 files changed

+245
-259
lines changed

8 files changed

+245
-259
lines changed

.golangci.yaml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,4 @@
11
linters-settings:
2-
depguard:
3-
list-type: blacklist
4-
packages:
5-
# Following logging implementations are allowed:
6-
# k8s.io/klog
7-
# go.uber.org/zap
8-
# go-logr/logr
9-
#
10-
# note that the following list will grow.
11-
- github.com/google/glog
12-
- log
13-
- github.com/sirupsen/logrus
14-
- github.com/wojas/genericr
15-
- logfmt
16-
packages-with-error-message:
17-
- github.com/google/glog: "Use klog, zap, or logr for logging."
18-
- log: "Use klog, zap, or logr for logging."
19-
- github.com/sirupsen/logrus: "Use klog, zap, or logr for logging."
20-
- github.com/wojas/genericr: "Use klog, zap, or logr for logging."
21-
- logfmt: "Use klog, zap, or logr for logging."
222
dupl:
233
threshold: 200
244
errorlint:
@@ -116,7 +96,6 @@ linters:
11696
- bidichk
11797
- containedctx
11898
- bodyclose
119-
- depguard
12099
- dogsled
121100
- dupl
122101
- durationcheck

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.20 as builder
2+
FROM golang:1.21 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ SETUP_ENVTEST := $(TOOLS_BIN_DIR)/setup_envs
3636
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
3737
KIND := $(TOOLS_BIN_DIR)/kind
3838

39-
GOLANGCI_LINT_VERSION := "v1.52.2"
39+
GOLANGCI_LINT_VERSION := "v1.55.2"
4040

4141

4242
$(CONTROLLER_GEN): $(TOOLS_DIR)/go.mod # Build controller-gen from tools folder.
@@ -113,7 +113,7 @@ build: fmt vet ## Build manager binary.
113113
##@ Testing
114114

115115
# KUBEBUILDER_ENVTEST_KUBERNETES_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
116-
KUBEBUILDER_ENVTEST_KUBERNETES_VERSION = 1.28.0
116+
KUBEBUILDER_ENVTEST_KUBERNETES_VERSION = 1.29.0
117117

118118
ifeq ($(shell go env GOOS),darwin) # Use the darwin/amd64 binary until an arm64 version is available
119119
KUBEBUILDER_ASSETS ?= $(shell $(SETUP_ENVTEST) use --use-env -p path --arch amd64 $(KUBEBUILDER_ENVTEST_KUBERNETES_VERSION))
@@ -131,7 +131,7 @@ CONTROL_CLUSTER_NAME ?= sveltos-management
131131
# K8S_VERSION for the Kind cluster can be set as environment variable. If not defined,
132132
# this default value is used
133133
ifndef K8S_VERSION
134-
K8S_VERSION := v1.28.0
134+
K8S_VERSION := v1.29.0
135135
endif
136136

137137

go.mod

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,74 @@
11
module github.com/gianlucam76/k8s_collector
22

3-
go 1.20
3+
go 1.21
44

55
require (
6-
github.com/go-logr/logr v1.3.0
7-
github.com/onsi/ginkgo/v2 v2.13.0
8-
github.com/onsi/gomega v1.29.0
6+
github.com/go-logr/logr v1.4.1
7+
github.com/onsi/ginkgo/v2 v2.17.1
8+
github.com/onsi/gomega v1.32.0
99
github.com/pkg/errors v0.9.1
10-
github.com/projectsveltos/libsveltos v0.19.0
10+
github.com/projectsveltos/libsveltos v0.26.0
1111
github.com/spf13/pflag v1.0.5
1212
gopkg.in/yaml.v2 v2.4.0
13-
k8s.io/api v0.28.4
14-
k8s.io/apimachinery v0.28.4
15-
k8s.io/client-go v0.28.4
16-
k8s.io/component-base v0.28.3
17-
k8s.io/klog/v2 v2.110.1
18-
sigs.k8s.io/controller-runtime v0.16.3
13+
gopkg.in/yaml.v3 v3.0.1
14+
k8s.io/api v0.29.3
15+
k8s.io/apimachinery v0.29.3
16+
k8s.io/client-go v0.29.3
17+
k8s.io/component-base v0.29.1
18+
k8s.io/klog/v2 v2.120.1
19+
sigs.k8s.io/controller-runtime v0.17.2
1920
)
2021

2122
require (
2223
github.com/beorn7/perks v1.0.1 // indirect
23-
github.com/blang/semver v3.5.1+incompatible // indirect
24-
github.com/blang/semver/v4 v4.0.0 // indirect
2524
github.com/cespare/xxhash/v2 v2.2.0 // indirect
26-
github.com/davecgh/go-spew v1.1.1 // indirect
25+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2726
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
28-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
29-
github.com/fsnotify/fsnotify v1.6.0 // indirect
27+
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
28+
github.com/fsnotify/fsnotify v1.7.0 // indirect
3029
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3130
github.com/go-openapi/jsonreference v0.20.2 // indirect
3231
github.com/go-openapi/swag v0.22.4 // indirect
3332
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
3433
github.com/gogo/protobuf v1.3.2 // indirect
3534
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
36-
github.com/golang/protobuf v1.5.3 // indirect
35+
github.com/golang/protobuf v1.5.4 // indirect
3736
github.com/google/gnostic-models v0.6.8 // indirect
3837
github.com/google/go-cmp v0.6.0 // indirect
3938
github.com/google/gofuzz v1.2.0 // indirect
4039
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
41-
github.com/google/uuid v1.3.0 // indirect
40+
github.com/google/uuid v1.3.1 // indirect
4241
github.com/imdario/mergo v0.3.13 // indirect
4342
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4443
github.com/josharian/intern v1.0.0 // indirect
4544
github.com/json-iterator/go v1.1.12 // indirect
4645
github.com/mailru/easyjson v0.7.7 // indirect
47-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
46+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
4847
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4948
github.com/modern-go/reflect2 v1.0.2 // indirect
5049
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
51-
github.com/prometheus/client_golang v1.17.0 // indirect
52-
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
53-
github.com/prometheus/common v0.44.0 // indirect
54-
github.com/prometheus/procfs v0.11.1 // indirect
55-
github.com/spf13/cobra v1.7.0 // indirect
56-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
57-
golang.org/x/net v0.17.0 // indirect
58-
golang.org/x/oauth2 v0.10.0 // indirect
59-
golang.org/x/sys v0.13.0 // indirect
60-
golang.org/x/term v0.13.0 // indirect
61-
golang.org/x/text v0.13.0 // indirect
50+
github.com/prometheus/client_golang v1.18.0 // indirect
51+
github.com/prometheus/client_model v0.5.0 // indirect
52+
github.com/prometheus/common v0.45.0 // indirect
53+
github.com/prometheus/procfs v0.12.0 // indirect
54+
github.com/spf13/cobra v1.8.0 // indirect
55+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
56+
golang.org/x/net v0.20.0 // indirect
57+
golang.org/x/oauth2 v0.14.0 // indirect
58+
golang.org/x/sys v0.16.0 // indirect
59+
golang.org/x/term v0.16.0 // indirect
60+
golang.org/x/text v0.14.0 // indirect
6261
golang.org/x/time v0.3.0 // indirect
63-
golang.org/x/tools v0.12.0 // indirect
62+
golang.org/x/tools v0.17.0 // indirect
6463
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
6564
google.golang.org/appengine v1.6.7 // indirect
66-
google.golang.org/protobuf v1.31.0 // indirect
65+
google.golang.org/protobuf v1.33.0 // indirect
6766
gopkg.in/inf.v0 v0.9.1 // indirect
68-
gopkg.in/yaml.v3 v3.0.1 // indirect
69-
k8s.io/apiextensions-apiserver v0.28.3 // indirect
70-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
71-
k8s.io/kubectl v0.28.2 // indirect
72-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
73-
sigs.k8s.io/cluster-api v1.5.3 // indirect
67+
k8s.io/apiextensions-apiserver v0.29.1 // indirect
68+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
69+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
70+
sigs.k8s.io/cluster-api v1.6.1 // indirect
7471
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
75-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
72+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7673
sigs.k8s.io/yaml v1.4.0 // indirect
7774
)

0 commit comments

Comments
 (0)