Merge pull request #38 from digitalocean/sachinsingh/DELI-6917

Upgrade client-go to 1.29.11 and go to 1.21

Makefile

@@ -21,9 +21,9 @@ ENVTEST := digitalocean/k8s-env-test
 # Digest of the currently used envtest image
 ENVTEST_DIGEST := sha256:f2d8c1e431bf079f48854e2910da8e66cb5b829380a8052f5d7ecaf49a341896
 
-K8S_VERSION := 1.28.7
+K8S_VERSION := 1.29.11
 ETCD_VERSION := 3.5.0
-GO_VERSION := 1.19
+GO_VERSION := 1.21
 
 ifeq ($(strip $(shell git status --porcelain 2>/dev/null)),)
 	GIT_TREE_STATE=clean

api/netbox/v1beta1/netboxip.go

@@ -24,7 +24,7 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 // +genclient
@@ -110,13 +110,13 @@ var tagSchema = &apiextensionsv1.JSONSchemaProps{
 	Properties: map[string]apiextensionsv1.JSONSchemaProps{
 		"name": apiextensionsv1.JSONSchemaProps{
 			Type:      "string",
-			MinLength: pointer.Int64(1),
-			MaxLength: pointer.Int64(100),
+			MinLength: ptr.To[int64](1),
+			MaxLength: ptr.To[int64](100),
 		},
 		"slug": apiextensionsv1.JSONSchemaProps{
 			Type:      "string",
-			MinLength: pointer.Int64(1),
-			MaxLength: pointer.Int64(100),
+			MinLength: ptr.To[int64](1),
+			MaxLength: ptr.To[int64](100),
 			Pattern:   tagSlugRegexp,
 		},
 	},
@@ -130,15 +130,15 @@ var NetBoxIPValidationSchema = &apiextensionsv1.CustomResourceValidation{
 				Properties: map[string]apiextensionsv1.JSONSchemaProps{
 					"address": apiextensionsv1.JSONSchemaProps{
 						Type:      "string",
-						MinLength: pointer.Int64(1),
+						MinLength: ptr.To[int64](1),
 						// actual validation happens when unmarshaling, here we only
 						// make sure the addess is not empty (empty addresses will not
 						// produce an error when unmarshaled)
 					},
 					"dnsName": apiextensionsv1.JSONSchemaProps{
 						Type:      "string",
-						MinLength: pointer.Int64(1),
-						MaxLength: pointer.Int64(253),
+						MinLength: ptr.To[int64](1),
+						MaxLength: ptr.To[int64](253),
 						Pattern:   dnsNameRegexp,
 					},
 					"tags": apiextensionsv1.JSONSchemaProps{
@@ -150,7 +150,7 @@ var NetBoxIPValidationSchema = &apiextensionsv1.CustomResourceValidation{
 					"description": apiextensionsv1.JSONSchemaProps{
 						Type: "string",
 						// limit set by NetBox
-						MaxLength: pointer.Int64(200),
+						MaxLength: ptr.To[int64](200),
 					},
 				},
 			},

cmd/netbox-ip-controller/integration_test.go

@@ -42,7 +42,6 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"go.uber.org/zap"
 	corev1 "k8s.io/api/core/v1"
-	v1 "k8s.io/api/core/v1"
 	apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	kubeerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -371,7 +370,7 @@ func TestClean(t *testing.T) {
 			},
 			ObjectMeta: metav1.ObjectMeta{
 				Name:       name,
-				Namespace:  v1.NamespaceDefault,
+				Namespace:  corev1.NamespaceDefault,
 				Finalizers: []string{netboxipctrl.IPFinalizer},
 			},
 			Spec: v1beta1.NetBoxIPSpec{
@@ -381,7 +380,7 @@ func TestClean(t *testing.T) {
 		}
 
 		var err error
-		ip, err = env.KubeCRDClient.NetboxV1beta1().NetBoxIPs(v1.NamespaceDefault).Create(context.Background(), ip, metav1.CreateOptions{})
+		ip, err = env.KubeCRDClient.NetboxV1beta1().NetBoxIPs(corev1.NamespaceDefault).Create(context.Background(), ip, metav1.CreateOptions{})
 		if err != nil {
 			t.Fatalf("creating netboxip: %q\n", err)
 		}

go.mod

@@ -1,10 +1,10 @@
 module github.com/digitalocean/netbox-ip-controller
 
-go 1.19
+go 1.21
 
 require (
 	github.com/go-logr/zapr v1.2.4
-	github.com/google/go-cmp v0.5.9
+	github.com/google/go-cmp v0.6.0
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/hashicorp/go-multierror v1.0.0
 	github.com/hashicorp/go-retryablehttp v0.7.1
@@ -13,11 +13,11 @@ require (
 	github.com/spf13/viper v1.11.0
 	go.uber.org/zap v1.25.0
 	golang.org/x/time v0.3.0
-	k8s.io/api v0.28.7
+	k8s.io/api v0.29.11
 	k8s.io/apiextensions-apiserver v0.28.7
-	k8s.io/apimachinery v0.28.7
-	k8s.io/client-go v0.28.7
-	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
+	k8s.io/apimachinery v0.29.11
+	k8s.io/client-go v0.29.11
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 	sigs.k8s.io/controller-runtime v0.16.1
 )
 
@@ -28,17 +28,17 @@ require (
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/cel-go v0.16.1 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
@@ -71,7 +71,7 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
 	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/oauth2 v0.8.0 // indirect
+	golang.org/x/oauth2 v0.10.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/term v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
@@ -86,9 +86,9 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiserver v0.28.7 // indirect
 	k8s.io/component-base v0.28.7 // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
+	k8s.io/klog/v2 v2.110.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )