Skip to content

Commit 2c229f3

Browse files
gianlucam76gianlucam76
authored
Merge pull request #17 from gianlucam76/deps
chore(deps): update dependencies
2 parents ad331df + 217e64b commit 2c229f3

File tree

12 files changed

+358
-389
lines changed

12 files changed

+358
-389
lines changed

‎.github/workflows/main.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: checkout
16-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
16+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717
- name: Set up Go
18-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # tag=v5.0.0
18+
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
1919
with:
20-
go-version: 1.21.5
20+
go-version: 1.22.7
2121
- name: Build
2222
run: make build
2323
- name: FMT
@@ -32,11 +32,11 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: checkout
35-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
35+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3636
- name: Set up Go
37-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # tag=v5.0.0
37+
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
3838
with:
39-
go-version: 1.21.5
39+
go-version: 1.22.7
4040
- name: ut
4141
run: make test
4242
env:
@@ -45,11 +45,11 @@ jobs:
4545
runs-on: ubuntu-latest
4646
steps:
4747
- name: checkout
48-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
48+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4949
- name: Set up Go
50-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # tag=v5.0.0
50+
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
5151
with:
52-
go-version: 1.21.5
52+
go-version: 1.22.7
5353
- name: fv
5454
run: make create-cluster fv
5555
env:

‎.golangci.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ linters-settings:
3535
min-complexity: 20
3636
goimports:
3737
local-prefixes: github.com/projectsveltos
38-
gomnd:
38+
mnd:
3939
checks: argument,case,condition,return
4040
gomodguard:
4141
# Although this is almost empty, we will evolve the list below with the
@@ -100,15 +100,15 @@ linters:
100100
- errname
101101
- errorlint
102102
- exhaustive
103-
- exportloopref
103+
- copyloopvar
104104
- forbidigo
105105
- funlen
106106
- goconst
107107
- gocritic
108108
- gocyclo
109109
- gofmt
110110
- goimports
111-
- gomnd
111+
- mnd
112112
- gomodguard
113113
- goprintffuncname
114114
- gosec
@@ -154,7 +154,7 @@ issues:
154154
exclude-rules:
155155
- path: _test\.go
156156
linters:
157-
- gomnd
157+
- mnd
158158
- grouper
159159
- maintidx
160160

‎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.7 AS builder
33

44
ARG BUILDOS
55
ARG TARGETARCH

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Image URL to use all building/pushing image targets
33
IMG ?= controller:latest
44
# KUBEBUILDER_ENVTEST_KUBERNETES_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5-
KUBEBUILDER_ENVTEST_KUBERNETES_VERSION = 1.30.0
5+
KUBEBUILDER_ENVTEST_KUBERNETES_VERSION = 1.31.0
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))
@@ -66,8 +66,8 @@ GINKGO := $(TOOLS_BIN_DIR)/ginkgo
6666
KIND := $(TOOLS_BIN_DIR)/kind
6767
KUBECTL := $(TOOLS_BIN_DIR)/kubectl
6868

69-
GOLANGCI_LINT_VERSION := "v1.57.2"
70-
CLUSTERCTL_VERSION := "v1.7.2"
69+
GOLANGCI_LINT_VERSION := "v1.61.0"
70+
CLUSTERCTL_VERSION := "v1.8.5"
7171

7272
KUSTOMIZE_VER := v5.3.0
7373
KUSTOMIZE_BIN := kustomize
@@ -76,7 +76,7 @@ KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v5
7676
$(KUSTOMIZE): # Build kustomize from tools folder.
7777
CGO_ENABLED=0 GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(KUSTOMIZE_PKG) $(KUSTOMIZE_BIN) $(KUSTOMIZE_VER)
7878

79-
SETUP_ENVTEST_VER := v0.0.0-20240215143116-d0396a3d6f9f
79+
SETUP_ENVTEST_VER := release-0.19
8080
SETUP_ENVTEST_BIN := setup-envtest
8181
SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))
8282
SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest
@@ -164,7 +164,7 @@ endif
164164
# K8S_VERSION for the Kind cluster can be set as environment variable. If not defined,
165165
# this default value is used
166166
ifndef K8S_VERSION
167-
K8S_VERSION := v1.30.0
167+
K8S_VERSION := v1.31.0
168168
endif
169169

170170
KIND_CONFIG ?= kind-cluster.yaml

‎config/crd/bases/extension.projectsveltos.io_jsonnetsources.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.15.0
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: jsonnetsources.extension.projectsveltos.io
88
spec:
99
group: extension.projectsveltos.io

‎config/rbac/role.yaml‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@ rules:
88
- ""
99
resources:
1010
- configmaps
11-
verbs:
12-
- get
13-
- list
14-
- watch
15-
- apiGroups:
16-
- ""
17-
resources:
1811
- secrets
1912
verbs:
2013
- get
@@ -58,45 +51,10 @@ rules:
5851
- source.toolkit.fluxcd.io
5952
resources:
6053
- buckets
61-
verbs:
62-
- get
63-
- list
64-
- watch
65-
- apiGroups:
66-
- source.toolkit.fluxcd.io
67-
resources:
6854
- buckets/status
69-
verbs:
70-
- get
71-
- list
72-
- watch
73-
- apiGroups:
74-
- source.toolkit.fluxcd.io
75-
resources:
7655
- gitrepositories
77-
verbs:
78-
- get
79-
- list
80-
- watch
81-
- apiGroups:
82-
- source.toolkit.fluxcd.io
83-
resources:
8456
- gitrepositories/status
85-
verbs:
86-
- get
87-
- list
88-
- watch
89-
- apiGroups:
90-
- source.toolkit.fluxcd.io
91-
resources:
9257
- ocirepositories
93-
verbs:
94-
- get
95-
- list
96-
- watch
97-
- apiGroups:
98-
- source.toolkit.fluxcd.io
99-
resources:
10058
- ocirepositories/status
10159
verbs:
10260
- get

‎controllers/utils.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ func extractTarGz(src, dest string) error {
188188
return err
189189
}
190190
case archivetar.TypeReg:
191+
//nolint: gosec // OK
191192
file, err := os.OpenFile(target, os.O_CREATE|os.O_RDWR, os.FileMode(header.Mode))
192193
if err != nil {
193194
return err

‎go.mod‎

Lines changed: 50 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,99 @@
11
module github.com/gianlucam76/jsonnet-controller
22

3-
go 1.22.0
3+
go 1.22.7
44

55
require (
66
github.com/TwiN/go-color v1.4.1
7-
github.com/fluxcd/pkg/http/fetch v0.11.0
8-
github.com/fluxcd/pkg/tar v0.7.0
9-
github.com/fluxcd/source-controller/api v1.3.0
7+
github.com/fluxcd/pkg/http/fetch v0.12.1
8+
github.com/fluxcd/pkg/tar v0.8.1
9+
github.com/fluxcd/source-controller/api v1.4.1
1010
github.com/ghodss/yaml v1.0.0
1111
github.com/go-logr/logr v1.4.2
1212
github.com/google/go-jsonnet v0.20.0
13-
github.com/onsi/ginkgo/v2 v2.19.0
14-
github.com/onsi/gomega v1.33.1
13+
github.com/onsi/ginkgo/v2 v2.21.0
14+
github.com/onsi/gomega v1.35.1
1515
github.com/pkg/errors v0.9.1
16-
github.com/projectsveltos/libsveltos v0.33.0
16+
github.com/projectsveltos/libsveltos v0.41.1
1717
github.com/spf13/pflag v1.0.5
18-
k8s.io/api v0.30.2
19-
k8s.io/apiextensions-apiserver v0.30.2
20-
k8s.io/apimachinery v0.30.2
21-
k8s.io/client-go v0.30.2
22-
k8s.io/component-base v0.30.2
18+
k8s.io/api v0.31.2
19+
k8s.io/apiextensions-apiserver v0.31.2
20+
k8s.io/apimachinery v0.31.2
21+
k8s.io/client-go v0.31.2
22+
k8s.io/component-base v0.31.2
2323
k8s.io/klog/v2 v2.130.1
24-
sigs.k8s.io/cluster-api v1.7.3
25-
sigs.k8s.io/controller-runtime v0.18.4
24+
sigs.k8s.io/cluster-api v1.8.5
25+
sigs.k8s.io/controller-runtime v0.19.1
2626
)
2727

2828
require (
2929
github.com/beorn7/perks v1.0.1 // indirect
3030
github.com/blang/semver/v4 v4.0.0 // indirect
31-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
32-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
31+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
32+
github.com/cyphar/filepath-securejoin v0.3.2 // indirect
3333
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
34-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
35-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
34+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
3635
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
3736
github.com/fluxcd/pkg/apis/acl v0.3.0 // indirect
38-
github.com/fluxcd/pkg/apis/meta v1.5.0 // indirect
37+
github.com/fluxcd/pkg/apis/meta v1.6.1 // indirect
3938
github.com/fsnotify/fsnotify v1.7.0 // indirect
40-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
41-
github.com/go-openapi/jsonreference v0.20.2 // indirect
42-
github.com/go-openapi/swag v0.22.3 // indirect
39+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
40+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
41+
github.com/go-openapi/jsonreference v0.21.0 // indirect
42+
github.com/go-openapi/swag v0.23.0 // indirect
4343
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
44-
github.com/gobuffalo/flect v1.0.2 // indirect
44+
github.com/gobuffalo/flect v1.0.3 // indirect
4545
github.com/gogo/protobuf v1.3.2 // indirect
4646
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4747
github.com/golang/protobuf v1.5.4 // indirect
4848
github.com/google/gnostic-models v0.6.8 // indirect
4949
github.com/google/go-cmp v0.6.0 // indirect
5050
github.com/google/gofuzz v1.2.0 // indirect
51-
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
52-
github.com/google/uuid v1.4.0 // indirect
51+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
52+
github.com/google/uuid v1.6.0 // indirect
5353
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
54-
github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
55-
github.com/imdario/mergo v0.3.13 // indirect
54+
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
55+
github.com/imdario/mergo v0.3.16 // indirect
5656
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5757
github.com/josharian/intern v1.0.0 // indirect
5858
github.com/json-iterator/go v1.1.12 // indirect
59-
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
59+
github.com/klauspost/compress v1.17.9 // indirect
60+
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
6061
github.com/mailru/easyjson v0.7.7 // indirect
61-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
6262
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6363
github.com/modern-go/reflect2 v1.0.2 // indirect
6464
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6565
github.com/opencontainers/go-digest v1.0.0 // indirect
6666
github.com/opencontainers/go-digest/blake3 v0.0.0-20231025023718-d50d2fec9c98 // indirect
67-
github.com/prometheus/client_golang v1.18.0 // indirect
68-
github.com/prometheus/client_model v0.5.0 // indirect
69-
github.com/prometheus/common v0.45.0 // indirect
70-
github.com/prometheus/procfs v0.12.0 // indirect
71-
github.com/spf13/cobra v1.8.0 // indirect
67+
github.com/prometheus/client_golang v1.20.4 // indirect
68+
github.com/prometheus/client_model v0.6.1 // indirect
69+
github.com/prometheus/common v0.60.0 // indirect
70+
github.com/prometheus/procfs v0.15.1 // indirect
71+
github.com/sergi/go-diff v1.2.0 // indirect
72+
github.com/spf13/cobra v1.8.1 // indirect
73+
github.com/x448/float16 v0.8.4 // indirect
7274
github.com/zeebo/blake3 v0.2.3 // indirect
73-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
74-
golang.org/x/net v0.25.0 // indirect
75-
golang.org/x/oauth2 v0.18.0 // indirect
76-
golang.org/x/sys v0.20.0 // indirect
77-
golang.org/x/term v0.20.0 // indirect
78-
golang.org/x/text v0.16.0 // indirect
79-
golang.org/x/time v0.5.0 // indirect
80-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
75+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
76+
golang.org/x/net v0.30.0 // indirect
77+
golang.org/x/oauth2 v0.23.0 // indirect
78+
golang.org/x/sys v0.26.0 // indirect
79+
golang.org/x/term v0.25.0 // indirect
80+
golang.org/x/text v0.19.0 // indirect
81+
golang.org/x/time v0.6.0 // indirect
82+
golang.org/x/tools v0.26.0 // indirect
8183
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
82-
google.golang.org/appengine v1.6.7 // indirect
83-
google.golang.org/protobuf v1.33.0 // indirect
84+
google.golang.org/protobuf v1.35.1 // indirect
85+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
8486
gopkg.in/inf.v0 v0.9.1 // indirect
8587
gopkg.in/yaml.v2 v2.4.0 // indirect
8688
gopkg.in/yaml.v3 v3.0.1 // indirect
87-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
88-
k8s.io/kubectl v0.30.2 // indirect
89-
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
89+
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
90+
k8s.io/kubectl v0.31.2 // indirect
91+
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
9092
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
9193
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
9294
sigs.k8s.io/yaml v1.4.0 // indirect
9395
)
9496

9597
// Replace digest lib to master to gather access to BLAKE3.
9698
// xref: https://github.com/opencontainers/go-digest/pull/66
97-
replace github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.1-0.20220411205349-bde1400a84be
99+
replace github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.1-0.20240426182413-22b78e47854a

0 commit comments

Comments
 (0)