Replace corev1.Handler by corev1.ProbeHandler

Consequence of kubernetes/api@cca52a0#diff-04e78d7bfddcb8b0b0fb2b950dbefcceb0af25bd827bfb41721f1280810a160a
thbkrkr · Dec 15, 2021 · 8537de1 · 8537de1
1 parent 6dd2b16
commit 8537de1
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/pkg/controller/apmserver/deployment_test.go b/pkg/controller/apmserver/deployment_test.go
@@ -174,7 +174,7 @@ func expectedDeploymentParams() testParams {
 							PeriodSeconds:       10,
 							SuccessThreshold:    1,
 							TimeoutSeconds:      5,
-							Handler: corev1.Handler{
+							ProbeHandler: corev1.ProbeHandler{
 								HTTPGet: &corev1.HTTPGetAction{
 									Port:   intstr.FromInt(8200),
 									Path:   "/",

diff --git a/pkg/controller/apmserver/pod.go b/pkg/controller/apmserver/pod.go
@@ -53,7 +53,7 @@ func readinessProbe(tls bool) corev1.Probe {
 		PeriodSeconds:       10,
 		SuccessThreshold:    1,
 		TimeoutSeconds:      5,
-		Handler: corev1.Handler{
+		ProbeHandler: corev1.ProbeHandler{
 			HTTPGet: &corev1.HTTPGetAction{
 				Port:   intstr.FromInt(HTTPPort),
 				Path:   "/",

diff --git a/pkg/controller/common/defaults/pod_template_test.go b/pkg/controller/common/defaults/pod_template_test.go
@@ -216,14 +216,14 @@ func TestPodTemplateBuilder_WithReadinessProbe(t *testing.T) {
 			name:        "no readiness probe in pod template: use default one",
 			PodTemplate: corev1.PodTemplateSpec{},
 			readinessProbe: corev1.Probe{
-				Handler: corev1.Handler{
+				ProbeHandler: corev1.ProbeHandler{
 					HTTPGet: &corev1.HTTPGetAction{
 						Path: "/probe",
 					},
 				},
 			},
 			want: &corev1.Probe{
-				Handler: corev1.Handler{
+				ProbeHandler: corev1.ProbeHandler{
 					HTTPGet: &corev1.HTTPGetAction{
 						Path: "/probe",
 					},
@@ -238,7 +238,7 @@ func TestPodTemplateBuilder_WithReadinessProbe(t *testing.T) {
 						{
 							Name: containerName,
 							ReadinessProbe: &corev1.Probe{
-								Handler: corev1.Handler{
+								ProbeHandler: corev1.ProbeHandler{
 									HTTPGet: &corev1.HTTPGetAction{
 										Path: "/user-provided",
 									},
@@ -249,14 +249,14 @@ func TestPodTemplateBuilder_WithReadinessProbe(t *testing.T) {
 				},
 			},
 			readinessProbe: corev1.Probe{
-				Handler: corev1.Handler{
+				ProbeHandler: corev1.ProbeHandler{
 					HTTPGet: &corev1.HTTPGetAction{
 						Path: "/probe",
 					},
 				},
 			},
 			want: &corev1.Probe{
-				Handler: corev1.Handler{
+				ProbeHandler: corev1.ProbeHandler{
 					HTTPGet: &corev1.HTTPGetAction{
 						Path: "/user-provided",
 					},

diff --git a/pkg/controller/elasticsearch/nodespec/readiness_probe.go b/pkg/controller/elasticsearch/nodespec/readiness_probe.go
@@ -20,7 +20,7 @@ func NewReadinessProbe() *corev1.Probe {
 		PeriodSeconds:       5,
 		SuccessThreshold:    1,
 		TimeoutSeconds:      5,
-		Handler: corev1.Handler{
+		ProbeHandler: corev1.ProbeHandler{
 			Exec: &corev1.ExecAction{
 				Command: []string{"bash", "-c", path.Join(volume.ScriptsVolumeMountPath, ReadinessProbeScriptConfigKey)},
 			},

diff --git a/pkg/controller/enterprisesearch/pod.go b/pkg/controller/enterprisesearch/pod.go
@@ -44,7 +44,7 @@ var (
 		PeriodSeconds:       10,
 		SuccessThreshold:    1,
 		TimeoutSeconds:      5,
-		Handler: corev1.Handler{
+		ProbeHandler: corev1.ProbeHandler{
 			Exec: &corev1.ExecAction{
 				Command: []string{"bash", path.Join(ReadinessProbeMountPath)},
 			},

diff --git a/pkg/controller/kibana/driver_test.go b/pkg/controller/kibana/driver_test.go
@@ -241,7 +241,7 @@ func TestDriverDeploymentParams(t *testing.T) {
 				params.PodTemplateSpec.Spec.Volumes = params.PodTemplateSpec.Spec.Volumes[1:]
 				params.PodTemplateSpec.Spec.InitContainers[0].VolumeMounts = params.PodTemplateSpec.Spec.InitContainers[0].VolumeMounts[1:]
 				params.PodTemplateSpec.Spec.Containers[0].VolumeMounts = params.PodTemplateSpec.Spec.Containers[0].VolumeMounts[1:]
-				params.PodTemplateSpec.Spec.Containers[0].ReadinessProbe.Handler.HTTPGet.Scheme = corev1.URISchemeHTTP
+				params.PodTemplateSpec.Spec.Containers[0].ReadinessProbe.ProbeHandler.HTTPGet.Scheme = corev1.URISchemeHTTP
 				params.PodTemplateSpec.Spec.Containers[0].Ports[0].Name = "http"
 				return params
 			}(),
@@ -571,7 +571,7 @@ func expectedDeploymentParams() deployment.Params {
 						PeriodSeconds:       10,
 						SuccessThreshold:    1,
 						TimeoutSeconds:      5,
-						Handler: corev1.Handler{
+						ProbeHandler: corev1.ProbeHandler{
 							HTTPGet: &corev1.HTTPGetAction{
 								Port:   intstr.FromInt(5601),
 								Path:   "/login",

diff --git a/pkg/controller/kibana/pod.go b/pkg/controller/kibana/pod.go
@@ -60,7 +60,7 @@ func readinessProbe(useTLS bool) corev1.Probe {
 		PeriodSeconds:       10,
 		SuccessThreshold:    1,
 		TimeoutSeconds:      5,
-		Handler: corev1.Handler{
+		ProbeHandler: corev1.ProbeHandler{
 			HTTPGet: &corev1.HTTPGetAction{
 				Port:   intstr.FromInt(network.HTTPPort),
 				Path:   "/login",

diff --git a/pkg/controller/maps/pod.go b/pkg/controller/maps/pod.go
@@ -46,7 +46,7 @@ func readinessProbe(useTLS bool) corev1.Probe {
 		PeriodSeconds:       10,
 		SuccessThreshold:    1,
 		TimeoutSeconds:      5,
-		Handler: corev1.Handler{
+		ProbeHandler: corev1.ProbeHandler{
 			HTTPGet: &corev1.HTTPGetAction{
 				Port:   intstr.FromInt(HTTPPort),
 				Path:   "/status",