Skip to content

Commit 20a30e5

Browse files
authored
Merge pull request #120 from ArangoGutierrez/devel/v0.4_deps_update
Update dependencies
2 parents e1afd34 + 8657ff0 commit 20a30e5

File tree

5 files changed

+411
-48
lines changed

5 files changed

+411
-48
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG BASE_IMAGE_FULL
22
ARG BASE_IMAGE_MINIMAL
33
# Build the manager biinary
4-
FROM golang:1.17.1-buster as builder
4+
FROM golang:1.17.6-buster as builder
55

66
WORKDIR /workspace
77
# Copy the Go Modules manifests

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ IMAGE_EXTRA_TAGS := $(foreach tag,$(IMAGE_EXTRA_TAG_NAMES),$(IMAGE_REPO):$(tag))
6767
BASE_IMAGE_FULL ?= debian:buster-slim
6868
BASE_IMAGE_MINIMAL ?= gcr.io/distroless/base
6969

70-
IMAGE_TAG_RBAC_PROXY ?= gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
70+
IMAGE_TAG_RBAC_PROXY ?= gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
7171

7272
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
7373
CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
@@ -199,12 +199,12 @@ site-serve:
199199
# Download controller-gen locally if necessary
200200
CONTROLLER_GEN = $(PROJECT_DIR)/bin/controller-gen
201201
controller-gen:
202-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1)
202+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0)
203203

204204
# Download kustomize locally if necessary
205205
KUSTOMIZE = $(PROJECT_DIR)/bin/kustomize
206206
kustomize:
207-
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v3@v3.8.7)
207+
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v3@v3.10.0)
208208

209209
# go-get-tool will 'go get' any package $2 and install it to $1.
210210
define go-get-tool

go.mod

Lines changed: 45 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,72 +3,75 @@ module github.com/kubernetes-sigs/node-feature-discovery-operator
33
go 1.17
44

55
require (
6-
github.com/onsi/ginkgo v1.16.4
7-
github.com/onsi/gomega v1.15.0
8-
k8s.io/api v0.22.2
9-
k8s.io/apimachinery v0.22.2
10-
k8s.io/client-go v0.22.2
11-
k8s.io/component-base v0.22.2
12-
k8s.io/klog/v2 v2.9.0
13-
k8s.io/kubectl v0.22.2
14-
sigs.k8s.io/controller-runtime v0.10.2
6+
github.com/onsi/ginkgo v1.16.5
7+
github.com/onsi/gomega v1.18.1
8+
k8s.io/api v0.23.3
9+
k8s.io/apimachinery v0.23.3
10+
k8s.io/client-go v0.23.3
11+
k8s.io/component-base v0.23.3
12+
k8s.io/klog/v2 v2.40.1
13+
k8s.io/kubectl v0.23.3
14+
sigs.k8s.io/controller-runtime v0.11.0
1515
)
1616

1717
require (
18-
cloud.google.com/go v0.54.0 // indirect
18+
cloud.google.com/go v0.100.2 // indirect
19+
cloud.google.com/go/compute v1.2.0 // indirect
1920
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
20-
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
21-
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
21+
github.com/Azure/go-autorest/autorest v0.11.24 // indirect
22+
github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect
2223
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
2324
github.com/Azure/go-autorest/logger v0.2.1 // indirect
2425
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
2526
github.com/beorn7/perks v1.0.1 // indirect
26-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
27+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2728
github.com/davecgh/go-spew v1.1.1 // indirect
28-
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
29-
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
30-
github.com/fsnotify/fsnotify v1.4.9 // indirect
31-
github.com/go-logr/logr v0.4.0 // indirect
32-
github.com/go-logr/zapr v0.4.0 // indirect
29+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
30+
github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect
31+
github.com/fsnotify/fsnotify v1.5.1 // indirect
32+
github.com/go-logr/logr v1.2.2 // indirect
33+
github.com/go-logr/zapr v1.2.2 // indirect
3334
github.com/gogo/protobuf v1.3.2 // indirect
35+
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
3436
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3537
github.com/golang/protobuf v1.5.2 // indirect
36-
github.com/google/go-cmp v0.5.5 // indirect
37-
github.com/google/gofuzz v1.1.0 // indirect
38-
github.com/google/uuid v1.1.2 // indirect
38+
github.com/google/go-cmp v0.5.7 // indirect
39+
github.com/google/gofuzz v1.2.0 // indirect
40+
github.com/google/uuid v1.3.0 // indirect
3941
github.com/googleapis/gnostic v0.5.5 // indirect
4042
github.com/imdario/mergo v0.3.12 // indirect
41-
github.com/json-iterator/go v1.1.11 // indirect
43+
github.com/json-iterator/go v1.1.12 // indirect
4244
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
4345
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
44-
github.com/modern-go/reflect2 v1.0.1 // indirect
46+
github.com/modern-go/reflect2 v1.0.2 // indirect
4547
github.com/nxadm/tail v1.4.8 // indirect
4648
github.com/pkg/errors v0.9.1 // indirect
47-
github.com/prometheus/client_golang v1.11.0 // indirect
49+
github.com/prometheus/client_golang v1.12.1 // indirect
4850
github.com/prometheus/client_model v0.2.0 // indirect
49-
github.com/prometheus/common v0.26.0 // indirect
50-
github.com/prometheus/procfs v0.6.0 // indirect
51+
github.com/prometheus/common v0.32.1 // indirect
52+
github.com/prometheus/procfs v0.7.3 // indirect
5153
github.com/spf13/pflag v1.0.5 // indirect
52-
go.uber.org/atomic v1.7.0 // indirect
53-
go.uber.org/multierr v1.6.0 // indirect
54-
go.uber.org/zap v1.19.0 // indirect
55-
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
56-
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
57-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
58-
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 // indirect
59-
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
60-
golang.org/x/text v0.3.6 // indirect
61-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
54+
go.uber.org/atomic v1.9.0 // indirect
55+
go.uber.org/multierr v1.7.0 // indirect
56+
go.uber.org/zap v1.21.0 // indirect
57+
golang.org/x/crypto v0.0.0-20220209155544-dad33157f4bf // indirect
58+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
59+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
60+
golang.org/x/sys v0.0.0-20220207234003-57398862261d // indirect
61+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
62+
golang.org/x/text v0.3.7 // indirect
63+
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
6264
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
6365
google.golang.org/appengine v1.6.7 // indirect
64-
google.golang.org/protobuf v1.26.0 // indirect
66+
google.golang.org/protobuf v1.27.1 // indirect
6567
gopkg.in/inf.v0 v0.9.1 // indirect
6668
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
6769
gopkg.in/yaml.v2 v2.4.0 // indirect
6870
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
69-
k8s.io/apiextensions-apiserver v0.22.2 // indirect
70-
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
71-
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
72-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
73-
sigs.k8s.io/yaml v1.2.0 // indirect
71+
k8s.io/apiextensions-apiserver v0.23.3 // indirect
72+
k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf // indirect
73+
k8s.io/utils v0.0.0-20220127004650-9b3446523e65 // indirect
74+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
75+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
76+
sigs.k8s.io/yaml v1.3.0 // indirect
7477
)

0 commit comments

Comments
 (0)