Skip to content
This repository was archived by the owner on Aug 12, 2025. It is now read-only.

Commit 24752c0

Browse files
committed
feat: update to 1.4 CAPI
Signed-off-by: Chris Privitere <[email protected]>
1 parent 0777e5e commit 24752c0

12 files changed

+228
-234
lines changed

Makefile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ endif
6969
## Binaries.
7070

7171
# Sync to controller-tools version in https://github.com/kubernetes-sigs/cluster-api/blob/v{VERSION}/hack/tools/go.mod
72-
CONTROLLER_GEN_VER := v0.10.0
72+
CONTROLLER_GEN_VER := v0.11.4
7373
CONTROLLER_GEN_BIN := controller-gen
7474
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
7575

7676
# Sync to k8s.io/* verisons in https://github.com/kubernetes-sigs/cluster-api/blob/v{VERSION}/go.mod
77-
CONVERSION_GEN_VER := v0.25.0
77+
CONVERSION_GEN_VER := v0.26.1
7878
CONVERSION_GEN_BIN := conversion-gen
7979
CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER)
8080

@@ -84,7 +84,7 @@ ENVSUBST_BIN := envsubst
8484
ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)
8585

8686
# Bump as necessary/desired to latest that supports our version of go at https://github.com/golangci/golangci-lint/releases
87-
GOLANGCI_LINT_VER := v1.52.1
87+
GOLANGCI_LINT_VER := v1.53.3
8888
GOLANGCI_LINT_BIN := golangci-lint
8989
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
9090

@@ -95,7 +95,7 @@ KUSTOMIZE_BIN := kustomize
9595
KUSTOMIZE := $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER)
9696

9797
# Sync to github.com/onsi/ginkgo verison in https://github.com/kubernetes-sigs/cluster-api/blob/v{VERSION}/go.mod
98-
GINKGO_VER := v2.6.0
98+
GINKGO_VER := v2.9.2
9999
GINKGO_BIN := ginkgo
100100
GINKGO := $(abspath $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER))
101101
GINKGO_PKG := github.com/onsi/ginkgo/v2/ginkgo
@@ -129,8 +129,6 @@ endif
129129
# Build time versioning details.
130130
LDFLAGS := $(shell hack/version.sh)
131131

132-
GOLANG_VERSION := 1.19.6
133-
134132
## --------------------------------------
135133
## Help
136134
## --------------------------------------

api/v1alpha3/zz_generated.conversion.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/infrastructure.cluster.x-k8s.io_packetclusters.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.10.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.11.4
87
name: packetclusters.infrastructure.cluster.x-k8s.io
98
spec:
109
group: infrastructure.cluster.x-k8s.io

config/crd/bases/infrastructure.cluster.x-k8s.io_packetmachines.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.10.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.11.4
87
name: packetmachines.infrastructure.cluster.x-k8s.io
98
spec:
109
group: infrastructure.cluster.x-k8s.io

config/crd/bases/infrastructure.cluster.x-k8s.io_packetmachinetemplates.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.10.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.11.4
87
name: packetmachinetemplates.infrastructure.cluster.x-k8s.io
98
spec:
109
group: infrastructure.cluster.x-k8s.io

config/rbac/role.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:
5-
creationTimestamp: null
65
name: manager-role
76
rules:
87
- apiGroups:

config/webhook/manifests.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
apiVersion: admissionregistration.k8s.io/v1
33
kind: MutatingWebhookConfiguration
44
metadata:
5-
creationTimestamp: null
65
name: mutating-webhook-configuration
76
webhooks:
87
- admissionReviewVersions:
@@ -75,7 +74,6 @@ webhooks:
7574
apiVersion: admissionregistration.k8s.io/v1
7675
kind: ValidatingWebhookConfiguration
7776
metadata:
78-
creationTimestamp: null
7977
name: validating-webhook-configuration
8078
webhooks:
8179
- admissionReviewVersions:

go.mod

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,28 @@ module sigs.k8s.io/cluster-api-provider-packet
33
go 1.19
44

55
require (
6-
github.com/equinix-labs/metal-go v0.17.0
7-
github.com/onsi/gomega v1.24.1
6+
github.com/equinix-labs/metal-go v0.21.0
7+
github.com/onsi/gomega v1.27.5
88
github.com/pkg/errors v0.9.1
99
github.com/spf13/cobra v1.6.1
1010
github.com/spf13/pflag v1.0.5
11-
k8s.io/api v0.25.10
12-
k8s.io/apimachinery v0.25.10
13-
k8s.io/client-go v0.25.10
14-
k8s.io/component-base v0.25.10
11+
k8s.io/api v0.26.1
12+
k8s.io/apimachinery v0.26.1
13+
k8s.io/client-go v0.26.1
14+
k8s.io/component-base v0.26.1
1515
k8s.io/klog/v2 v2.80.1
16-
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
17-
sigs.k8s.io/cluster-api v1.3.7
18-
sigs.k8s.io/controller-runtime v0.13.1
16+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
17+
sigs.k8s.io/cluster-api v1.4.6
18+
sigs.k8s.io/controller-runtime v0.14.6
1919
)
2020

2121
require (
2222
github.com/beorn7/perks v1.0.1 // indirect
2323
github.com/blang/semver v3.5.1+incompatible // indirect
24-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
24+
github.com/blang/semver/v4 v4.0.0 // indirect
25+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2526
github.com/coredns/caddy v1.1.0 // indirect
26-
github.com/coredns/corefile-migration v1.0.20 // indirect
27+
github.com/coredns/corefile-migration v1.0.21 // indirect
2728
github.com/davecgh/go-spew v1.1.1 // indirect
2829
github.com/docker/distribution v2.8.2+incompatible // indirect
2930
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
@@ -34,10 +35,10 @@ require (
3435
github.com/go-openapi/jsonpointer v0.19.5 // indirect
3536
github.com/go-openapi/jsonreference v0.20.0 // indirect
3637
github.com/go-openapi/swag v0.22.3 // indirect
37-
github.com/gobuffalo/flect v0.3.0 // indirect
38+
github.com/gobuffalo/flect v1.0.2 // indirect
3839
github.com/gogo/protobuf v1.3.2 // indirect
3940
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
40-
github.com/golang/protobuf v1.5.2 // indirect
41+
github.com/golang/protobuf v1.5.3 // indirect
4142
github.com/google/gnostic v0.6.9 // indirect
4243
github.com/google/go-cmp v0.5.9 // indirect
4344
github.com/google/gofuzz v1.2.0 // indirect
@@ -47,30 +48,30 @@ require (
4748
github.com/josharian/intern v1.0.0 // indirect
4849
github.com/json-iterator/go v1.1.12 // indirect
4950
github.com/mailru/easyjson v0.7.7 // indirect
50-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
51+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
5152
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5253
github.com/modern-go/reflect2 v1.0.2 // indirect
5354
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5455
github.com/opencontainers/go-digest v1.0.0 // indirect
55-
github.com/prometheus/client_golang v1.13.0 // indirect
56-
github.com/prometheus/client_model v0.2.0 // indirect
56+
github.com/prometheus/client_golang v1.14.0 // indirect
57+
github.com/prometheus/client_model v0.3.0 // indirect
5758
github.com/prometheus/common v0.37.0 // indirect
5859
github.com/prometheus/procfs v0.8.0 // indirect
59-
golang.org/x/net v0.8.0 // indirect
60-
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
61-
golang.org/x/sys v0.6.0 // indirect
62-
golang.org/x/term v0.6.0 // indirect
63-
golang.org/x/text v0.8.0 // indirect
64-
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
60+
golang.org/x/net v0.13.0 // indirect
61+
golang.org/x/oauth2 v0.6.0 // indirect
62+
golang.org/x/sys v0.10.0 // indirect
63+
golang.org/x/term v0.10.0 // indirect
64+
golang.org/x/text v0.11.0 // indirect
65+
golang.org/x/time v0.3.0 // indirect
6566
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
6667
google.golang.org/appengine v1.6.7 // indirect
67-
google.golang.org/protobuf v1.28.1 // indirect
68+
google.golang.org/protobuf v1.30.0 // indirect
6869
gopkg.in/inf.v0 v0.9.1 // indirect
6970
gopkg.in/yaml.v2 v2.4.0 // indirect
7071
gopkg.in/yaml.v3 v3.0.1 // indirect
71-
k8s.io/apiextensions-apiserver v0.25.0 // indirect
72+
k8s.io/apiextensions-apiserver v0.26.1 // indirect
7273
k8s.io/cluster-bootstrap v0.25.0 // indirect
73-
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
74+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
7475
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
7576
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
7677
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)