Skip to content

Commit d7db4de

Browse files
superbrotherssuperbrothers
authored
Merge pull request #24 from pfnet-research/update-deps
Upgrade dependencies and tools
2 parents d983c19 + 76e17db commit d7db4de

9 files changed

+637
-558
lines changed

‎Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ TAG := $(shell git describe --tags --always --dirty)
55
IMG ?= ghcr.io/pfnet-research/node-operation-controller:$(TAG)
66

77
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
8-
ENVTEST_K8S_VERSION = 1.24
8+
ENVTEST_K8S_VERSION = 1.25
99

1010
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
1111
ifeq (,$(shell go env GOBIN))
@@ -44,7 +44,7 @@ help: ## Display this help.
4444
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
4545

4646
CONTROLLER_GEN := $(CURDIR)/bin/controller-gen
47-
CONTROLLER_GEN_VERSION ?= v0.9.2
47+
CONTROLLER_GEN_VERSION ?= v0.11.3
4848
$(CONTROLLER_GEN): ## Download controller-gen locally if necessary.
4949
GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_GEN_VERSION)
5050

@@ -58,13 +58,13 @@ $(ENVTEST): ## Download envtest-setup locally if necessary.
5858
GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
5959

6060
KUBECTL := $(CURDIR)/bin/kubectl
61-
KUBECTL_VERSION ?= v1.25.0
61+
KUBECTL_VERSION ?= v1.26.1
6262
$(KUBECTL): ## Download kubectl locally if necessary.
6363
curl -Lo $(PROJECT_DIR)/bin/kubectl "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl"
6464
chmod +x $(PROJECT_DIR)/bin/kubectl
6565

6666
KIND := $(CURDIR)/bin/kind
67-
KIND_VERSION ?= v0.14.0
67+
KIND_VERSION ?= v0.17.0
6868
$(KIND): ## Download kind locally if necessary.
6969
curl -Lo $(PROJECT_DIR)/bin/kind "https://kind.sigs.k8s.io/dl/${KIND_VERSION}/kind-linux-amd64"
7070
chmod +x $(PROJECT_DIR)/bin/kind

‎config/crd/bases/nodeops.k8s.preferred.jp_nodedisruptionbudgets.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.9.2
6+
controller-gen.kubebuilder.io/version: v0.11.1
77
creationTimestamp: null
88
name: nodedisruptionbudgets.nodeops.k8s.preferred.jp
99
spec:

‎config/crd/bases/nodeops.k8s.preferred.jp_nodeoperations.yaml

Lines changed: 253 additions & 32 deletions
Large diffs are not rendered by default.

‎config/crd/bases/nodeops.k8s.preferred.jp_nodeoperationtemplates.yaml

Lines changed: 282 additions & 30 deletions
Large diffs are not rendered by default.

‎config/crd/bases/nodeops.k8s.preferred.jp_noderemediations.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.9.2
6+
controller-gen.kubebuilder.io/version: v0.11.1
77
creationTimestamp: null
88
name: noderemediations.nodeops.k8s.preferred.jp
99
spec:

‎config/crd/bases/nodeops.k8s.preferred.jp_noderemediationtemplates.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.9.2
6+
controller-gen.kubebuilder.io/version: v0.11.1
77
creationTimestamp: null
88
name: noderemediationtemplates.nodeops.k8s.preferred.jp
99
spec:

‎controllers/suite_test.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ import (
2828

2929
"k8s.io/apimachinery/pkg/types"
3030

31-
. "github.com/onsi/ginkgo"
31+
. "github.com/onsi/ginkgo/v2"
3232
. "github.com/onsi/gomega"
33-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
3433
"sigs.k8s.io/controller-runtime/pkg/manager"
3534

3635
batchv1 "k8s.io/api/batch/v1"
@@ -58,9 +57,7 @@ var testEnv *envtest.Environment
5857
func TestAPIs(t *testing.T) {
5958
RegisterFailHandler(Fail)
6059

61-
RunSpecsWithDefaultAndCustomReporters(t,
62-
"Controller Suite",
63-
[]Reporter{printer.NewlineReporter{}})
60+
RunSpecs(t, "Controller Suite")
6461
}
6562

6663
var _ = BeforeSuite(func() {
@@ -126,7 +123,7 @@ var _ = BeforeSuite(func() {
126123
}
127124
return true
128125
}, time.Minute).Should(BeTrue())
129-
}, 60)
126+
})
130127

131128
var _ = AfterSuite(func() {
132129
By("tearing down the test environment")

‎go.mod

Lines changed: 30 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,30 @@ module github.com/pfnet-research/node-operation-controller
33
go 1.19
44

55
require (
6-
github.com/google/go-cmp v0.5.8
7-
github.com/onsi/ginkgo v1.16.5
8-
github.com/onsi/gomega v1.19.0
6+
github.com/google/go-cmp v0.5.9
7+
github.com/onsi/ginkgo/v2 v2.6.1
8+
github.com/onsi/gomega v1.24.1
99
github.com/stretchr/testify v1.8.0
10-
k8s.io/api v0.25.0
11-
k8s.io/apimachinery v0.25.0
12-
k8s.io/client-go v0.25.0
13-
sigs.k8s.io/controller-runtime v0.12.3
10+
k8s.io/api v0.26.1
11+
k8s.io/apimachinery v0.26.1
12+
k8s.io/client-go v0.26.1
13+
sigs.k8s.io/controller-runtime v0.14.1
1414
)
1515

1616
require (
17-
cloud.google.com/go/compute v1.9.0 // indirect
18-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
19-
github.com/Azure/go-autorest/autorest v0.11.28 // indirect
20-
github.com/Azure/go-autorest/autorest/adal v0.9.21 // indirect
21-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
22-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
23-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
2417
github.com/beorn7/perks v1.0.1 // indirect
25-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
18+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2619
github.com/davecgh/go-spew v1.1.1 // indirect
27-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
20+
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
2821
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
29-
github.com/fsnotify/fsnotify v1.5.4 // indirect
22+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
23+
github.com/fsnotify/fsnotify v1.6.0 // indirect
3024
github.com/go-logr/logr v1.2.3 // indirect
3125
github.com/go-logr/zapr v1.2.3 // indirect
3226
github.com/go-openapi/jsonpointer v0.19.5 // indirect
3327
github.com/go-openapi/jsonreference v0.20.0 // indirect
3428
github.com/go-openapi/swag v0.22.3 // indirect
3529
github.com/gogo/protobuf v1.3.2 // indirect
36-
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
3730
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3831
github.com/golang/protobuf v1.5.2 // indirect
3932
github.com/google/gnostic v0.6.9 // indirect
@@ -43,41 +36,38 @@ require (
4336
github.com/josharian/intern v1.0.0 // indirect
4437
github.com/json-iterator/go v1.1.12 // indirect
4538
github.com/mailru/easyjson v0.7.7 // indirect
46-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
39+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
4740
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4841
github.com/modern-go/reflect2 v1.0.2 // indirect
4942
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
50-
github.com/nxadm/tail v1.4.8 // indirect
5143
github.com/pkg/errors v0.9.1 // indirect
5244
github.com/pmezard/go-difflib v1.0.0 // indirect
53-
github.com/prometheus/client_golang v1.13.0 // indirect
54-
github.com/prometheus/client_model v0.2.0 // indirect
55-
github.com/prometheus/common v0.37.0 // indirect
56-
github.com/prometheus/procfs v0.8.0 // indirect
45+
github.com/prometheus/client_golang v1.14.0 // indirect
46+
github.com/prometheus/client_model v0.3.0 // indirect
47+
github.com/prometheus/common v0.39.0 // indirect
48+
github.com/prometheus/procfs v0.9.0 // indirect
5749
github.com/spf13/pflag v1.0.5 // indirect
5850
go.uber.org/atomic v1.10.0 // indirect
59-
go.uber.org/multierr v1.8.0 // indirect
60-
go.uber.org/zap v1.23.0 // indirect
61-
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
62-
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b // indirect
63-
golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 // indirect
64-
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
65-
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
66-
golang.org/x/text v0.3.7 // indirect
67-
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
51+
go.uber.org/multierr v1.9.0 // indirect
52+
go.uber.org/zap v1.24.0 // indirect
53+
golang.org/x/net v0.4.0 // indirect
54+
golang.org/x/oauth2 v0.3.0 // indirect
55+
golang.org/x/sys v0.3.0 // indirect
56+
golang.org/x/term v0.3.0 // indirect
57+
golang.org/x/text v0.5.0 // indirect
58+
golang.org/x/time v0.3.0 // indirect
6859
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
6960
google.golang.org/appengine v1.6.7 // indirect
7061
google.golang.org/protobuf v1.28.1 // indirect
7162
gopkg.in/inf.v0 v0.9.1 // indirect
72-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
7363
gopkg.in/yaml.v2 v2.4.0 // indirect
7464
gopkg.in/yaml.v3 v3.0.1 // indirect
75-
k8s.io/apiextensions-apiserver v0.25.0 // indirect
76-
k8s.io/component-base v0.25.0 // indirect
77-
k8s.io/klog/v2 v2.70.1 // indirect
78-
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
79-
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
80-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
65+
k8s.io/apiextensions-apiserver v0.26.0 // indirect
66+
k8s.io/component-base v0.26.0 // indirect
67+
k8s.io/klog/v2 v2.80.1 // indirect
68+
k8s.io/kube-openapi v0.0.0-20221207184640-f3cff1453715 // indirect
69+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
70+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
8171
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
8272
sigs.k8s.io/yaml v1.3.0 // indirect
8373
)

0 commit comments

Comments
 (0)