Compile against Kubernetes 1.26

api/v1/coherence_types.go

@@ -1708,7 +1708,7 @@ func (in *PortSpecWithSSL) AddSSLVolumes(sts *appsv1.StatefulSet, c *corev1.Cont
 			VolumeSource: corev1.VolumeSource{
 				Secret: &corev1.SecretVolumeSource{
 					SecretName:  *in.SSL.Secrets,
-					DefaultMode: pointer.Int32Ptr(int32(0777)),
+					DefaultMode: pointer.Int32(int32(0777)),
 				},
 			},
 		})

api/v1/coherence_webhook_test.go

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * http://oss.oracle.com/licenses/upl.
  *
@@ -403,7 +403,7 @@ func TestValidateCreateReplicasWhenReplicasIsPositive(t *testing.T) {
 
 	current := &coh.Coherence{
 		Spec: coh.CoherenceResourceSpec{
-			Replicas: pointer.Int32Ptr(19),
+			Replicas: pointer.Int32(19),
 		},
 	}
 
@@ -416,7 +416,7 @@ func TestValidateCreateReplicasWhenReplicasIsZero(t *testing.T) {
 
 	current := &coh.Coherence{
 		Spec: coh.CoherenceResourceSpec{
-			Replicas: pointer.Int32Ptr(19),
+			Replicas: pointer.Int32(19),
 		},
 	}
 
@@ -430,7 +430,7 @@ func TestValidateCreateReplicasWhenReplicasIsInvalid(t *testing.T) {
 	current := &coh.Coherence{
 		ObjectMeta: metav1.ObjectMeta{Name: "foo"},
 		Spec: coh.CoherenceResourceSpec{
-			Replicas: pointer.Int32Ptr(-1),
+			Replicas: pointer.Int32(-1),
 		},
 	}
 
@@ -458,7 +458,7 @@ func TestValidateUpdateReplicasWhenReplicasIsPositive(t *testing.T) {
 
 	current := &coh.Coherence{
 		Spec: coh.CoherenceResourceSpec{
-			Replicas: pointer.Int32Ptr(19),
+			Replicas: pointer.Int32(19),
 		},
 	}
 
@@ -475,7 +475,7 @@ func TestValidateUpdateReplicasWhenReplicasIsZero(t *testing.T) {
 
 	current := &coh.Coherence{
 		Spec: coh.CoherenceResourceSpec{
-			Replicas: pointer.Int32Ptr(19),
+			Replicas: pointer.Int32(19),
 		},
 	}
 
@@ -493,7 +493,7 @@ func TestValidateUpdateReplicasWhenReplicasIsInvalid(t *testing.T) {
 	current := &coh.Coherence{
 		ObjectMeta: metav1.ObjectMeta{Name: "foo"},
 		Spec: coh.CoherenceResourceSpec{
-			Replicas: pointer.Int32Ptr(-1),
+			Replicas: pointer.Int32(-1),
 		},
 	}
 
@@ -599,12 +599,12 @@ func TestValidateNodePortsOnCreateWithValidPorts(t *testing.T) {
 				{
 					Name:     "p1",
 					Port:     1234,
-					NodePort: pointer.Int32Ptr(30000),
+					NodePort: pointer.Int32(30000),
 				},
 				{
 					Name:     "p2",
 					Port:     1235,
-					NodePort: pointer.Int32Ptr(32767),
+					NodePort: pointer.Int32(32767),
 				},
 			},
 		},
@@ -624,17 +624,17 @@ func TestValidateNodePortsOnCreateWithInvalidPort(t *testing.T) {
 				{
 					Name:     "p1",
 					Port:     1234,
-					NodePort: pointer.Int32Ptr(30000),
+					NodePort: pointer.Int32(30000),
 				},
 				{
 					Name:     "p2",
 					Port:     1235,
-					NodePort: pointer.Int32Ptr(32767),
+					NodePort: pointer.Int32(32767),
 				},
 				{
 					Name:     "p3",
 					Port:     1235,
-					NodePort: pointer.Int32Ptr(1234),
+					NodePort: pointer.Int32(1234),
 				},
 			},
 		},
@@ -654,12 +654,12 @@ func TestValidateNodePortsOnUpdateWithValidPorts(t *testing.T) {
 				{
 					Name:     "p1",
 					Port:     1234,
-					NodePort: pointer.Int32Ptr(30000),
+					NodePort: pointer.Int32(30000),
 				},
 				{
 					Name:     "p2",
 					Port:     1235,
-					NodePort: pointer.Int32Ptr(32767),
+					NodePort: pointer.Int32(32767),
 				},
 			},
 		},
@@ -684,17 +684,17 @@ func TestValidateNodePortsOnUpdateWithInvalidPort(t *testing.T) {
 				{
 					Name:     "p1",
 					Port:     1234,
-					NodePort: pointer.Int32Ptr(30000),
+					NodePort: pointer.Int32(30000),
 				},
 				{
 					Name:     "p2",
 					Port:     1235,
-					NodePort: pointer.Int32Ptr(32767),
+					NodePort: pointer.Int32(32767),
 				},
 				{
 					Name:     "p3",
 					Port:     1235,
-					NodePort: pointer.Int32Ptr(1234),
+					NodePort: pointer.Int32(1234),
 				},
 			},
 		},

api/v1/create_statefulset_additional_ports_test.go

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * http://oss.oracle.com/licenses/upl.
  */
@@ -152,7 +152,7 @@ func TestCreateStatefulSetWithMetricsPortWhenMetricsPortValueSpecified(t *testin
 	spec := coh.CoherenceResourceSpec{
 		Coherence: &coh.CoherenceSpec{
 			Metrics: &coh.PortSpecWithSSL{
-				Port: pointer.Int32Ptr(1234),
+				Port: pointer.Int32(1234),
 			},
 		},
 		Ports: []coh.NamedPortSpec{np},
@@ -185,7 +185,7 @@ func TestCreateStatefulSetWithMetricsPortAndServicePortWhenNoPortValueSpecified(
 	np := coh.NamedPortSpec{
 		Name: coh.PortNameMetrics,
 		Service: &coh.ServiceSpec{
-			Port: pointer.Int32Ptr(1234),
+			Port: pointer.Int32(1234),
 		},
 	}
 
@@ -220,14 +220,14 @@ func TestCreateStatefulSetWithMetricsPortAndServicePortWhenMetricsPortValueSpeci
 	np := coh.NamedPortSpec{
 		Name: coh.PortNameMetrics,
 		Service: &coh.ServiceSpec{
-			Port: pointer.Int32Ptr(1234),
+			Port: pointer.Int32(1234),
 		},
 	}
 
 	spec := coh.CoherenceResourceSpec{
 		Coherence: &coh.CoherenceSpec{
 			Metrics: &coh.PortSpecWithSSL{
-				Port: pointer.Int32Ptr(9876),
+				Port: pointer.Int32(9876),
 			},
 		},
 		Ports: []coh.NamedPortSpec{np},
@@ -296,7 +296,7 @@ func TestCreateStatefulSetWithManagementPortWhenManagementPortValueSpecified(t *
 	spec := coh.CoherenceResourceSpec{
 		Coherence: &coh.CoherenceSpec{
 			Management: &coh.PortSpecWithSSL{
-				Port: pointer.Int32Ptr(1234),
+				Port: pointer.Int32(1234),
 			},
 		},
 		Ports: []coh.NamedPortSpec{np},
@@ -329,7 +329,7 @@ func TestCreateStatefulSetWithManagementPortAndServicePortWhenNoPortValueSpecifi
 	np := coh.NamedPortSpec{
 		Name: coh.PortNameManagement,
 		Service: &coh.ServiceSpec{
-			Port: pointer.Int32Ptr(1234),
+			Port: pointer.Int32(1234),
 		},
 	}
 
@@ -364,14 +364,14 @@ func TestCreateStatefulSetWithManagementPortAndServicePortWhenManagementPortValu
 	np := coh.NamedPortSpec{
 		Name: coh.PortNameManagement,
 		Service: &coh.ServiceSpec{
-			Port: pointer.Int32Ptr(1234),
+			Port: pointer.Int32(1234),
 		},
 	}
 
 	spec := coh.CoherenceResourceSpec{
 		Coherence: &coh.CoherenceSpec{
 			Management: &coh.PortSpecWithSSL{
-				Port: pointer.Int32Ptr(9876),
+				Port: pointer.Int32(9876),
 			},
 		},
 		Ports: []coh.NamedPortSpec{np},

api/v1/create_statefulset_coherencespec_persistence_test.go

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * http://oss.oracle.com/licenses/upl.
  */
@@ -35,7 +35,7 @@ func TestCreateStatefulSetWithPersistenceModeOnDemand(t *testing.T) {
 	spec := coh.CoherenceResourceSpec{
 		Coherence: &coh.CoherenceSpec{
 			Persistence: &coh.PersistenceSpec{
-				Mode: pointer.StringPtr("on-demand"),
+				Mode: pointer.String("on-demand"),
 			},
 		},
 	}
@@ -55,7 +55,7 @@ func TestCreateStatefulSetWithPersistenceModeActive(t *testing.T) {
 	spec := coh.CoherenceResourceSpec{
 		Coherence: &coh.CoherenceSpec{
 			Persistence: &coh.PersistenceSpec{
-				Mode: pointer.StringPtr("active"),
+				Mode: pointer.String("active"),
 			},
 		},
 	}
@@ -74,7 +74,7 @@ func TestCreateStatefulSetWithPersistenceModeActiveAsync(t *testing.T) {
 	spec := coh.CoherenceResourceSpec{
 		Coherence: &coh.CoherenceSpec{
 			Persistence: &coh.PersistenceSpec{
-				Mode: pointer.StringPtr("active-async"),
+				Mode: pointer.String("active-async"),
 			},
 		},
 	}

api/v1/create_statefulset_test.go

@@ -49,7 +49,7 @@ func TestCreateStatefulSetWithName(t *testing.T) {
 func TestCreateStatefulSetWithReplicas(t *testing.T) {
 	// create a spec with a name
 	spec := coh.CoherenceResourceSpec{
-		Replicas: pointer.Int32Ptr(50),
+		Replicas: pointer.Int32(50),
 	}
 
 	// Create the test deployment
@@ -347,7 +347,7 @@ func TestCreateStatefulSetWithTolerations(t *testing.T) {
 
 func TestCreateStatefulSetWithSecurityContext(t *testing.T) {
 	ctx := corev1.PodSecurityContext{
-		RunAsUser:    pointer.Int64Ptr(1000),
+		RunAsUser:    pointer.Int64(1000),
 		RunAsNonRoot: boolPtr(true),
 	}
 
@@ -370,7 +370,7 @@ func TestCreateStatefulSetWithContainerSecurityContext(t *testing.T) {
 		Capabilities: &corev1.Capabilities{
 			Add: []corev1.Capability{"foo"},
 		},
-		RunAsUser:    pointer.Int64Ptr(1000),
+		RunAsUser:    pointer.Int64(1000),
 		RunAsNonRoot: boolPtr(true),
 	}
 
@@ -483,29 +483,29 @@ func TestCreateStatefulSetWithActiveDeadlineSeconds(t *testing.T) {
 
 func TestCreateStatefulSetWithEnableServiceLinksFalse(t *testing.T) {
 	spec := coh.CoherenceResourceSpec{
-		EnableServiceLinks: pointer.BoolPtr(false),
+		EnableServiceLinks: pointer.Bool(false),
 	}
 
 	// Create the test deployment
 	deployment := createTestDeployment(spec)
 	// Create expected StatefulSet
 	stsExpected := createMinimalExpectedStatefulSet(deployment)
-	stsExpected.Spec.Template.Spec.EnableServiceLinks = pointer.BoolPtr(false)
+	stsExpected.Spec.Template.Spec.EnableServiceLinks = pointer.Bool(false)
 
 	// assert that the StatefulSet is as expected
 	assertStatefulSetCreation(t, deployment, stsExpected)
 }
 
 func TestCreateStatefulSetWithEnableServiceLinksTrue(t *testing.T) {
 	spec := coh.CoherenceResourceSpec{
-		EnableServiceLinks: pointer.BoolPtr(true),
+		EnableServiceLinks: pointer.Bool(true),
 	}
 
 	// Create the test deployment
 	deployment := createTestDeployment(spec)
 	// Create expected StatefulSet
 	stsExpected := createMinimalExpectedStatefulSet(deployment)
-	stsExpected.Spec.Template.Spec.EnableServiceLinks = pointer.BoolPtr(true)
+	stsExpected.Spec.Template.Spec.EnableServiceLinks = pointer.Bool(true)
 
 	// assert that the StatefulSet is as expected
 	assertStatefulSetCreation(t, deployment, stsExpected)

api/v1/create_wka_services_test.go

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * http://oss.oracle.com/licenses/upl.
  */
@@ -180,7 +180,7 @@ func TestCreateWKAServiceForDeploymentWithClusterName(t *testing.T) {
 			Name:      "test",
 		},
 		Spec: coh.CoherenceResourceSpec{
-			Cluster: pointer.StringPtr("test-cluster"),
+			Cluster: pointer.String("test-cluster"),
 		},
 	}
 

controllers/statefulset/probe.go

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * http://oss.oracle.com/licenses/upl.
  */
@@ -167,7 +167,7 @@ func (in *CoherenceProbe) ExecuteProbe(ctx context.Context, deployment *coh.Cohe
 				log.Info("Using pod " + pod.Name + " to execute probe")
 			}
 
-			ha, err := in.RunProbe(pod, probe)
+			ha, err := in.RunProbe(ctx, pod, probe)
 			if err == nil {
 				log.Info(fmt.Sprintf("Executed probe using pod %s result=%t", pod.Name, ha))
 				return ha
@@ -195,10 +195,10 @@ func (in *CoherenceProbe) IsPodReady(pod corev1.Pod) (bool, string) {
 	return false, string(pod.Status.Phase)
 }
 
-func (in *CoherenceProbe) RunProbe(pod corev1.Pod, handler *coh.Probe) (bool, error) {
+func (in *CoherenceProbe) RunProbe(ctx context.Context, pod corev1.Pod, handler *coh.Probe) (bool, error) {
 	switch {
 	case handler.Exec != nil:
-		return in.ProbeUsingExec(pod, handler)
+		return in.ProbeUsingExec(ctx, pod, handler)
 	case handler.HTTPGet != nil:
 		return in.ProbeUsingHTTP(pod, handler)
 	case handler.TCPSocket != nil:
@@ -208,7 +208,7 @@ func (in *CoherenceProbe) RunProbe(pod corev1.Pod, handler *coh.Probe) (bool, er
 	}
 }
 
-func (in *CoherenceProbe) ProbeUsingExec(pod corev1.Pod, handler *coh.Probe) (bool, error) {
+func (in *CoherenceProbe) ProbeUsingExec(ctx context.Context, pod corev1.Pod, handler *coh.Probe) (bool, error) {
 	req := &mgmt.ExecRequest{
 		Pod:       pod.Name,
 		Container: coh.ContainerNameCoherence,
@@ -218,7 +218,7 @@ func (in *CoherenceProbe) ProbeUsingExec(pod corev1.Pod, handler *coh.Probe) (bo
 		Timeout:   handler.GetTimeout(),
 	}
 
-	exitCode, _, _, err := mgmt.PodExec(req, in.Config)
+	exitCode, _, _, err := mgmt.PodExec(ctx, req, in.Config)
 
 	log.Info(fmt.Sprintf("Exec Probe: '%s' result=%d error=%s", strings.Join(handler.Exec.Command, ", "), exitCode, err))
 

controllers/statefulset/statefulset_controller.go

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * http://oss.oracle.com/licenses/upl.
  */
@@ -275,8 +275,8 @@ func buildActionJob(actionName string, actionJob *coh.ActionJob, deployment *coh
 					Kind:               deployment.Kind,
 					Name:               deployment.Name,
 					UID:                deployment.UID,
-					Controller:         pointer.BoolPtr(true),
-					BlockOwnerDeletion: pointer.BoolPtr(false),
+					Controller:         pointer.Bool(true),
+					BlockOwnerDeletion: pointer.Bool(false),
 				},
 			},
 		},