Merge pull request #13170 from sbueringer/pr-fix-envtest-tests

🐛 Fix webhook envtest tests for Kubernetes < v1.35

Author: k8s-ci-robot

internal/webhooks/test/machinedrainrules_test.go

@@ -190,8 +190,7 @@ func Test_validate(t *testing.T) {
 					},
 				},
 			},
-			wantErr: "MachineDrainRule.cluster.x-k8s.io \"mdr\" is invalid: " +
-				"spec.machines: Invalid value: entries in machines must be unique",
+			wantErr: "entries in machines must be unique",
 		},
 		{
 			name: "Return error if pod selectors are not unique",
@@ -232,8 +231,7 @@ func Test_validate(t *testing.T) {
 					},
 				},
 			},
-			wantErr: "MachineDrainRule.cluster.x-k8s.io \"mdr\" is invalid: " +
-				"spec.pods: Invalid value: entries in pods must be unique",
+			wantErr: "entries in pods must be unique",
 		},
 	}
 
@@ -245,7 +243,7 @@ func Test_validate(t *testing.T) {
 
 			if tt.wantErr != "" {
 				g.Expect(err).To(HaveOccurred())
-				g.Expect(err.Error()).To(BeComparableTo(tt.wantErr))
+				g.Expect(err.Error()).To(ContainSubstring(tt.wantErr))
 			} else {
 				g.Expect(err).ToNot(HaveOccurred())
 				g.Expect(env.CleanupAndWait(ctx, tt.machineDrainRule)).To(Succeed())

internal/webhooks/test/machinehealthcheck_test.go

@@ -83,8 +83,7 @@ func Test_validateMachineHealthCheck(t *testing.T) {
 					},
 				},
 			},
-			wantErr: "MachineHealthCheck.cluster.x-k8s.io \"mhc\" is invalid: " +
-				"spec.checks.unhealthyMachineConditions[0].type: Invalid value: \"Ready\": type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
+			wantErr: "type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
 		},
 		{
 			name: "Return error if UnhealthyMachineCondition type is 'Available'",
@@ -111,8 +110,7 @@ func Test_validateMachineHealthCheck(t *testing.T) {
 					},
 				},
 			},
-			wantErr: "MachineHealthCheck.cluster.x-k8s.io \"mhc\" is invalid: " +
-				"spec.checks.unhealthyMachineConditions[0].type: Invalid value: \"Available\": type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
+			wantErr: "type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
 		},
 		{
 			name: "Return error if UnhealthyMachineCondition type is 'HealthCheckSucceeded'",
@@ -139,8 +137,7 @@ func Test_validateMachineHealthCheck(t *testing.T) {
 					},
 				},
 			},
-			wantErr: "MachineHealthCheck.cluster.x-k8s.io \"mhc\" is invalid: " +
-				"spec.checks.unhealthyMachineConditions[0].type: Invalid value: \"HealthCheckSucceeded\": type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
+			wantErr: "type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
 		},
 		{
 			name: "Return error if UnhealthyMachineCondition type is 'OwnerRemediated'",
@@ -167,8 +164,7 @@ func Test_validateMachineHealthCheck(t *testing.T) {
 					},
 				},
 			},
-			wantErr: "MachineHealthCheck.cluster.x-k8s.io \"mhc\" is invalid: " +
-				"spec.checks.unhealthyMachineConditions[0].type: Invalid value: \"OwnerRemediated\": type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
+			wantErr: "type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
 		},
 		{
 			name: "Return error if UnhealthyMachineCondition type is 'ExternallyRemediated'",
@@ -195,8 +191,7 @@ func Test_validateMachineHealthCheck(t *testing.T) {
 					},
 				},
 			},
-			wantErr: "MachineHealthCheck.cluster.x-k8s.io \"mhc\" is invalid: " +
-				"spec.checks.unhealthyMachineConditions[0].type: Invalid value: \"ExternallyRemediated\": type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
+			wantErr: "type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated",
 		},
 		{
 			name: "Return no error if UnhealthyMachineCondition type is allowed custom type",
@@ -234,7 +229,7 @@ func Test_validateMachineHealthCheck(t *testing.T) {
 
 			if tt.wantErr != "" {
 				g.Expect(err).To(HaveOccurred())
-				g.Expect(err.Error()).To(BeComparableTo(tt.wantErr))
+				g.Expect(err.Error()).To(ContainSubstring(tt.wantErr))
 			} else {
 				g.Expect(err).ToNot(HaveOccurred())
 				g.Expect(env.CleanupAndWait(ctx, tt.machineHealthCheck)).To(Succeed())