Merge pull request #13168 from fabriziopandini/use-envtest-1.35

🌱 Use env test 1.35.0

Author: k8s-ci-robot

Makefile

@@ -44,7 +44,7 @@ export GO111MODULE=on
 #
 # Kubebuilder.
 #
-export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.34.0
+export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.35.0
 export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?= 60s
 export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?= 60s
 

internal/webhooks/test/machinedrainrules_test.go

@@ -191,7 +191,7 @@ func Test_validate(t *testing.T) {
 				},
 			},
 			wantErr: "MachineDrainRule.cluster.x-k8s.io \"mdr\" is invalid: " +
-				"spec.machines: Invalid value: \"array\": entries in machines must be unique",
+				"spec.machines: Invalid value: entries in machines must be unique",
 		},
 		{
 			name: "Return error if pod selectors are not unique",
@@ -233,7 +233,7 @@ func Test_validate(t *testing.T) {
 				},
 			},
 			wantErr: "MachineDrainRule.cluster.x-k8s.io \"mdr\" is invalid: " +
-				"spec.pods: Invalid value: \"array\": entries in pods must be unique",
+				"spec.pods: Invalid value: entries in pods must be unique",
 		},
 	}
 

internal/webhooks/test/machinehealthcheck_test.go

@@ -84,7 +84,7 @@ func Test_validateMachineHealthCheck(t *testing.T) {
 				},
 			},
 			wantErr: "MachineHealthCheck.cluster.x-k8s.io \"mhc\" is invalid: " +
-				"spec.checks.unhealthyMachineConditions[0].type: Invalid value: \"string\": type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
+				"spec.checks.unhealthyMachineConditions[0].type: Invalid value: \"Ready\": type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
 		},
 		{
 			name: "Return error if UnhealthyMachineCondition type is 'Available'",
@@ -112,7 +112,7 @@ func Test_validateMachineHealthCheck(t *testing.T) {
 				},
 			},
 			wantErr: "MachineHealthCheck.cluster.x-k8s.io \"mhc\" is invalid: " +
-				"spec.checks.unhealthyMachineConditions[0].type: Invalid value: \"string\": type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
+				"spec.checks.unhealthyMachineConditions[0].type: Invalid value: \"Available\": type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
 		},
 		{
 			name: "Return error if UnhealthyMachineCondition type is 'HealthCheckSucceeded'",
@@ -140,7 +140,7 @@ func Test_validateMachineHealthCheck(t *testing.T) {
 				},
 			},
 			wantErr: "MachineHealthCheck.cluster.x-k8s.io \"mhc\" is invalid: " +
-				"spec.checks.unhealthyMachineConditions[0].type: Invalid value: \"string\": type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
+				"spec.checks.unhealthyMachineConditions[0].type: Invalid value: \"HealthCheckSucceeded\": type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
 		},
 		{
 			name: "Return error if UnhealthyMachineCondition type is 'OwnerRemediated'",
@@ -168,7 +168,7 @@ func Test_validateMachineHealthCheck(t *testing.T) {
 				},
 			},
 			wantErr: "MachineHealthCheck.cluster.x-k8s.io \"mhc\" is invalid: " +
-				"spec.checks.unhealthyMachineConditions[0].type: Invalid value: \"string\": type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
+				"spec.checks.unhealthyMachineConditions[0].type: Invalid value: \"OwnerRemediated\": type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
 		},
 		{
 			name: "Return error if UnhealthyMachineCondition type is 'ExternallyRemediated'",
@@ -196,7 +196,7 @@ func Test_validateMachineHealthCheck(t *testing.T) {
 				},
 			},
 			wantErr: "MachineHealthCheck.cluster.x-k8s.io \"mhc\" is invalid: " +
-				"spec.checks.unhealthyMachineConditions[0].type: Invalid value: \"string\": type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
+				"spec.checks.unhealthyMachineConditions[0].type: Invalid value: \"ExternallyRemediated\": type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
 		},
 		{
 			name: "Return no error if UnhealthyMachineCondition type is allowed custom type",