Skip to content

Commit 1a8d5b7

Browse files
author
mgianluc
committed
Bump libsveltos pin
1 parent d96216c commit 1a8d5b7

File tree

8 files changed

+238
-242
lines changed

8 files changed

+238
-242
lines changed

.github/workflows/main.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: checkout
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7
1818
- name: Set up Go
19-
uses: actions/setup-go@v4
19+
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # tag=v5.0.2
2020
with:
21-
go-version: 1.22.0
21+
go-version: 1.22.5
2222
- name: Build
2323
run: make build
2424
- name: FMT
@@ -33,11 +33,11 @@ jobs:
3333
runs-on: ubuntu-latest
3434
steps:
3535
- name: checkout
36-
uses: actions/checkout@v4
36+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7
3737
- name: Set up Go
38-
uses: actions/setup-go@v4
38+
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # tag=v5.0.2
3939
with:
40-
go-version: 1.22.0
40+
go-version: 1.22.5
4141
- name: ut
4242
run: make test
4343
env:
@@ -46,11 +46,11 @@ jobs:
4646
runs-on: ubuntu-latest
4747
steps:
4848
- name: checkout
49-
uses: actions/checkout@v4
49+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7
5050
- name: Set up Go
51-
uses: actions/setup-go@v4
51+
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # tag=v5.0.2
5252
with:
53-
go-version: 1.22.0
53+
go-version: 1.22.5
5454
- name: fv
5555
run: make create-cluster fv
5656
env:

.golangci.yaml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,8 @@ linters-settings:
3535
min-complexity: 20
3636
goimports:
3737
local-prefixes: github.com/projectsveltos
38-
gomnd:
39-
settings:
40-
mnd:
41-
# don't include the "operation" and "assign"
42-
checks: argument,case,condition,return
38+
mnd:
39+
checks: argument,case,condition,return
4340
gomodguard:
4441
# Although this is almost empty, we will evolve the list below with the
4542
# modules we shouldn't use for technical and/or security reasons.
@@ -51,7 +48,7 @@ linters-settings:
5148
# Don't merge replace directives using local path.
5249
local_replace_directives: true
5350
govet:
54-
check-shadowing: true
51+
shadow: true
5552
settings:
5653
printf:
5754
funcs:
@@ -111,7 +108,7 @@ linters:
111108
- gocyclo
112109
- gofmt
113110
- goimports
114-
- gomnd
111+
- mnd
115112
- gomodguard
116113
- goprintffuncname
117114
- gosec
@@ -157,7 +154,7 @@ issues:
157154
exclude-rules:
158155
- path: _test\.go
159156
linters:
160-
- gomnd
157+
- mnd
161158
- grouper
162159
- maintidx
163160

@@ -177,6 +174,4 @@ run:
177174
allow-parallel-runners: true
178175
# Timeout for analysis
179176
timeout: 5m
180-
# files to skip: they will be analyzed, but issues from them won't be reported.
181-
skip-dirs:
182-
- cmd/example/gen
177+

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.22 as builder
2+
FROM golang:1.22.5 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ KUBECTL := $(TOOLS_BIN_DIR)/kubectl
3535
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
3636
KIND := $(TOOLS_BIN_DIR)/kind
3737

38-
GOLANGCI_LINT_VERSION := "v1.55.2"
38+
GOLANGCI_LINT_VERSION := "v1.59.0"
3939

40-
KUSTOMIZE_VER := v4.5.2
40+
KUSTOMIZE_VER := v5.3.0
4141
KUSTOMIZE_BIN := kustomize
4242
KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
43-
KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4
43+
KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v5
4444
$(KUSTOMIZE): # Build kustomize from tools folder.
4545
CGO_ENABLED=0 GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(KUSTOMIZE_PKG) $(KUSTOMIZE_BIN) $(KUSTOMIZE_VER)
4646

47-
SETUP_ENVTEST_VER := v0.0.0-20240215143116-d0396a3d6f9f
47+
SETUP_ENVTEST_VER := v0.0.0-20240522175850-2e9781e9fc60
4848
SETUP_ENVTEST_BIN := setup-envtest
4949
SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))
5050
SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest
@@ -149,7 +149,7 @@ CONTROL_CLUSTER_NAME ?= sveltos-management
149149
# K8S_VERSION for the Kind cluster can be set as environment variable. If not defined,
150150
# this default value is used
151151
ifndef K8S_VERSION
152-
K8S_VERSION := v1.29.0
152+
K8S_VERSION := v1.31.0
153153
endif
154154

155155

go.mod

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
module github.com/gianlucam76/k8s_collector
22

3-
go 1.22.0
3+
go 1.22.5
44

55
require (
6-
github.com/go-logr/logr v1.4.1
7-
github.com/onsi/ginkgo/v2 v2.17.2
8-
github.com/onsi/gomega v1.33.0
6+
github.com/go-logr/logr v1.4.2
7+
github.com/onsi/ginkgo/v2 v2.20.2
8+
github.com/onsi/gomega v1.34.2
99
github.com/pkg/errors v0.9.1
10-
github.com/projectsveltos/libsveltos v0.28.0
10+
github.com/projectsveltos/libsveltos v0.37.0
1111
github.com/spf13/pflag v1.0.5
1212
gopkg.in/yaml.v2 v2.4.0
1313
gopkg.in/yaml.v3 v3.0.1
14-
k8s.io/api v0.29.4
15-
k8s.io/apimachinery v0.29.4
16-
k8s.io/client-go v0.29.4
17-
k8s.io/component-base v0.29.4
18-
k8s.io/klog/v2 v2.120.1
19-
sigs.k8s.io/controller-runtime v0.17.3
14+
k8s.io/api v0.31.0
15+
k8s.io/apimachinery v0.31.0
16+
k8s.io/client-go v0.31.0
17+
k8s.io/component-base v0.31.0
18+
k8s.io/klog/v2 v2.130.1
19+
sigs.k8s.io/controller-runtime v0.19.0
2020
)
2121

2222
require (
2323
github.com/beorn7/perks v1.0.1 // indirect
24-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
24+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2525
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
26-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
26+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
2727
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
2828
github.com/fsnotify/fsnotify v1.7.0 // indirect
29+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
2930
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3031
github.com/go-openapi/jsonreference v0.20.2 // indirect
3132
github.com/go-openapi/swag v0.22.4 // indirect
@@ -36,38 +37,37 @@ require (
3637
github.com/google/gnostic-models v0.6.8 // indirect
3738
github.com/google/go-cmp v0.6.0 // indirect
3839
github.com/google/gofuzz v1.2.0 // indirect
39-
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
40-
github.com/google/uuid v1.4.0 // indirect
40+
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
41+
github.com/google/uuid v1.6.0 // indirect
4142
github.com/imdario/mergo v0.3.13 // indirect
4243
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4344
github.com/josharian/intern v1.0.0 // indirect
4445
github.com/json-iterator/go v1.1.12 // indirect
4546
github.com/mailru/easyjson v0.7.7 // indirect
46-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
4747
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4848
github.com/modern-go/reflect2 v1.0.2 // indirect
4949
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // 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.24.0 // indirect
57-
golang.org/x/oauth2 v0.18.0 // indirect
58-
golang.org/x/sys v0.19.0 // indirect
59-
golang.org/x/term v0.19.0 // indirect
60-
golang.org/x/text v0.14.0 // indirect
50+
github.com/prometheus/client_golang v1.19.1 // indirect
51+
github.com/prometheus/client_model v0.6.1 // indirect
52+
github.com/prometheus/common v0.55.0 // indirect
53+
github.com/prometheus/procfs v0.15.1 // indirect
54+
github.com/spf13/cobra v1.8.1 // indirect
55+
github.com/x448/float16 v0.8.4 // indirect
56+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
57+
golang.org/x/net v0.28.0 // indirect
58+
golang.org/x/oauth2 v0.21.0 // indirect
59+
golang.org/x/sys v0.24.0 // indirect
60+
golang.org/x/term v0.23.0 // indirect
61+
golang.org/x/text v0.17.0 // indirect
6162
golang.org/x/time v0.5.0 // indirect
62-
golang.org/x/tools v0.20.0 // indirect
63+
golang.org/x/tools v0.24.0 // indirect
6364
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
64-
google.golang.org/appengine v1.6.7 // indirect
65-
google.golang.org/protobuf v1.33.0 // indirect
65+
google.golang.org/protobuf v1.34.2 // indirect
6666
gopkg.in/inf.v0 v0.9.1 // indirect
67-
k8s.io/apiextensions-apiserver v0.29.4 // indirect
68-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
69-
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
70-
sigs.k8s.io/cluster-api v1.7.0 // indirect
67+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
68+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
69+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
70+
sigs.k8s.io/cluster-api v1.8.1 // indirect
7171
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7272
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7373
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)