Downgrade k8s v0.23.x to v0.22.8 (#360)

* Revert update to K8s 0.23.x This introduces some breaking changes that make integration with most of the eco-system hard
spotify · Apr 11, 2022 · aca1de7 · aca1de7
1 parent 3d4d4b0
commit aca1de7
Show file tree

Hide file tree

Showing 7 changed files with 132 additions and 568 deletions.
diff --git a/apis/flinkcluster/v1beta1/flinkcluster_default.go b/apis/flinkcluster/v1beta1/flinkcluster_default.go
@@ -131,7 +131,7 @@ func _SetJobManagerDefault(jmSpec *JobManagerSpec, flinkVersion *version.Version
 	}
 
 	var livenessProbe = corev1.Probe{
-		ProbeHandler: corev1.ProbeHandler{
+		Handler: corev1.Handler{
 			TCPSocket: &corev1.TCPSocketAction{
 				Port: intstr.FromInt(int(*jmSpec.Ports.RPC)),
 			},
@@ -147,7 +147,7 @@ func _SetJobManagerDefault(jmSpec *JobManagerSpec, flinkVersion *version.Version
 	jmSpec.LivenessProbe = &livenessProbe
 
 	var readinessProbe = corev1.Probe{
-		ProbeHandler: corev1.ProbeHandler{
+		Handler: corev1.Handler{
 			TCPSocket: &corev1.TCPSocketAction{
 				Port: intstr.FromInt(int(*jmSpec.Ports.RPC)),
 			},
@@ -202,7 +202,7 @@ func _SetTaskManagerDefault(tmSpec *TaskManagerSpec, flinkVersion *version.Versi
 	}
 
 	var livenessProbe = corev1.Probe{
-		ProbeHandler: corev1.ProbeHandler{
+		Handler: corev1.Handler{
 			TCPSocket: &corev1.TCPSocketAction{
 				Port: intstr.FromInt(int(*tmSpec.Ports.RPC)),
 			},
@@ -218,7 +218,7 @@ func _SetTaskManagerDefault(tmSpec *TaskManagerSpec, flinkVersion *version.Versi
 	tmSpec.LivenessProbe = &livenessProbe
 
 	var readinessProbe = corev1.Probe{
-		ProbeHandler: corev1.ProbeHandler{
+		Handler: corev1.Handler{
 			TCPSocket: &corev1.TCPSocketAction{
 				Port: intstr.FromInt(int(*tmSpec.Ports.RPC)),
 			},

diff --git a/apis/flinkcluster/v1beta1/flinkcluster_default_test.go b/apis/flinkcluster/v1beta1/flinkcluster_default_test.go
@@ -60,7 +60,7 @@ func TestSetDefault(t *testing.T) {
 	resources := DefaultResources
 	tmReplicas := int32(DefaultTaskManagerReplicas)
 	var defaultJmReadinessProbe = corev1.Probe{
-		ProbeHandler: corev1.ProbeHandler{
+		Handler: corev1.Handler{
 			TCPSocket: &corev1.TCPSocketAction{
 				Port: intstr.FromInt(int(defaultJmRPCPort)),
 			},
@@ -71,7 +71,7 @@ func TestSetDefault(t *testing.T) {
 		FailureThreshold:    60,
 	}
 	var defaultJmLivenessProbe = corev1.Probe{
-		ProbeHandler: corev1.ProbeHandler{
+		Handler: corev1.Handler{
 			TCPSocket: &corev1.TCPSocketAction{
 				Port: intstr.FromInt(int(defaultJmRPCPort)),
 			},
@@ -82,7 +82,7 @@ func TestSetDefault(t *testing.T) {
 		FailureThreshold:    5,
 	}
 	var defaultTmReadinessProbe = corev1.Probe{
-		ProbeHandler: corev1.ProbeHandler{
+		Handler: corev1.Handler{
 			TCPSocket: &corev1.TCPSocketAction{
 				Port: intstr.FromInt(int(defaultTmRPCPort)),
 			},
@@ -93,7 +93,7 @@ func TestSetDefault(t *testing.T) {
 		FailureThreshold:    60,
 	}
 	var defaultTmLivenessProbe = corev1.Probe{
-		ProbeHandler: corev1.ProbeHandler{
+		Handler: corev1.Handler{
 			TCPSocket: &corev1.TCPSocketAction{
 				Port: intstr.FromInt(int(defaultTmRPCPort)),
 			},
@@ -218,7 +218,7 @@ func TestSetNonDefault(t *testing.T) {
 	}
 	tmReplicas := int32(DefaultTaskManagerReplicas)
 	var jmReadinessProbe = corev1.Probe{
-		ProbeHandler: corev1.ProbeHandler{
+		Handler: corev1.Handler{
 			TCPSocket: &corev1.TCPSocketAction{
 				Port: intstr.FromInt(int(jmRPCPort)),
 			},
@@ -228,7 +228,7 @@ func TestSetNonDefault(t *testing.T) {
 		FailureThreshold:    600,
 	}
 	var jmLivenessProbe = corev1.Probe{
-		ProbeHandler: corev1.ProbeHandler{
+		Handler: corev1.Handler{
 			TCPSocket: &corev1.TCPSocketAction{
 				Port: intstr.FromInt(int(jmRPCPort)),
 			},
@@ -238,7 +238,7 @@ func TestSetNonDefault(t *testing.T) {
 		FailureThreshold:    50,
 	}
 	var tmReadinessProbe = corev1.Probe{
-		ProbeHandler: corev1.ProbeHandler{
+		Handler: corev1.Handler{
 			TCPSocket: &corev1.TCPSocketAction{
 				Port: intstr.FromInt(int(tmRPCPort)),
 			},
@@ -249,7 +249,7 @@ func TestSetNonDefault(t *testing.T) {
 		FailureThreshold:    600,
 	}
 	var tmLivenessProbe = corev1.Probe{
-		ProbeHandler: corev1.ProbeHandler{
+		Handler: corev1.Handler{
 			TCPSocket: &corev1.TCPSocketAction{
 				Port: intstr.FromInt(int(tmRPCPort)),
 			},
@@ -327,7 +327,7 @@ func TestSetNonDefault(t *testing.T) {
 	_SetDefault(&cluster)
 
 	var jmExpectedReadinessProbe = corev1.Probe{
-		ProbeHandler: corev1.ProbeHandler{
+		Handler: corev1.Handler{
 			TCPSocket: &corev1.TCPSocketAction{
 				Port: intstr.FromInt(int(jmRPCPort)),
 			},
@@ -338,7 +338,7 @@ func TestSetNonDefault(t *testing.T) {
 		FailureThreshold:    600,
 	}
 	var jmExpectedLivenessProbe = corev1.Probe{
-		ProbeHandler: corev1.ProbeHandler{
+		Handler: corev1.Handler{
 			TCPSocket: &corev1.TCPSocketAction{
 				Port: intstr.FromInt(int(jmRPCPort)),
 			},