Merge pull request #777 from k8s-infra-cherrypick-robot/cherry-pick-764-to-release-0.18

[release-0.18] 🐛 Fix appliedSpecHashAnnotation set if PreflightCheckPassed is not True

Author: k8s-ci-robot

internal/controller/coreprovider_to_providers.go

@@ -34,7 +34,7 @@ import (
 // It lists all the providers and if its PreflightCheckCondition is not True, this object will be added to the resulting request.
 // This means that notifications will only be sent to those objects that have not pass PreflightCheck.
 func newCoreProviderToProviderFuncMapForProviderList(k8sClient client.Client, providerList genericprovider.GenericProviderList) handler.MapFunc {
-	providerListType := fmt.Sprintf("%t", providerList)
+	providerListType := fmt.Sprintf("%T", providerList)
 
 	return func(ctx context.Context, obj client.Object) []reconcile.Request {
 		log := ctrl.LoggerFrom(ctx).WithValues("provider", map[string]string{"name": obj.GetName(), "namespace": obj.GetNamespace()}, "providerListType", providerListType)

internal/controller/genericprovider_controller.go

@@ -164,7 +164,7 @@ func (r *GenericProviderReconciler) Reconcile(ctx context.Context, req reconcile
 
 	r.Provider.SetAnnotations(annotations)
 
-	return res, err
+	return res, ignoreCoreProviderWaitError(err)
 }
 
 func patchProvider(ctx context.Context, provider operatorv1.GenericProvider, patchHelper *patch.Helper, options ...patch.Option) error {
@@ -206,7 +206,7 @@ func (r *GenericProviderReconciler) reconcile(ctx context.Context, provider gene
 
 		if !res.IsZero() || err != nil {
 			// the steps are sequential, so we must be complete before progressing.
-			return res, ignoreCoreProviderWaitError(err)
+			return res, err
 		}
 	}
 

internal/controller/genericprovider_controller_test.go

@@ -31,6 +31,7 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
 	"sigs.k8s.io/cluster-api/util/conditions"
+	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
@@ -200,7 +201,7 @@ func TestConfigSecretChangesAreAppliedToTheDeployment(t *testing.T) {
 
 	g.Eventually(
 		testDeploymentLabelValueGetter(ns.Name, testDeploymentName),
-		30*time.Second,
+		timeout,
 	).Should(BeEquivalentTo("initial-value"))
 
 	t.Log("Provider deployment deployed")
@@ -213,7 +214,7 @@ func TestConfigSecretChangesAreAppliedToTheDeployment(t *testing.T) {
 
 	g.Eventually(
 		testDeploymentLabelValueGetter(ns.Name, testDeploymentName),
-		30*time.Second,
+		timeout,
 	).Should(BeEquivalentTo("updated-value"))
 }
 
@@ -293,6 +294,17 @@ func TestReconcilerPreflightConditions(t *testing.T) {
 				g.Expect(env.CreateAndWait(ctx, p)).To(Succeed())
 			}
 
+			defer func() {
+				objs := []client.Object{
+					dummyConfigMap(tc.namespace),
+				}
+				for _, p := range tc.providers {
+					objs = append(objs, p)
+				}
+
+				g.Expect(env.CleanupAndWait(ctx, objs...)).To(Succeed())
+			}()
+
 			g.Eventually(func() bool {
 				for _, p := range tc.providers {
 					if err := env.Get(ctx, client.ObjectKeyFromObject(p), p); err != nil {
@@ -306,20 +318,6 @@ func TestReconcilerPreflightConditions(t *testing.T) {
 
 				return false
 			}, timeout).Should(BeEquivalentTo(true))
-
-			objs := []client.Object{}
-			for _, p := range tc.providers {
-				objs = append(objs, p)
-			}
-
-			objs = append(objs, &corev1.ConfigMap{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      testCurrentVersion,
-					Namespace: tc.namespace,
-				},
-			})
-
-			g.Expect(env.CleanupAndWait(ctx, objs...)).To(Succeed())
 		})
 	}
 }
@@ -395,6 +393,11 @@ releaseSeries:
 			t.Log("creating test provider", provider.GetName())
 			g.Expect(env.CreateAndWait(ctx, provider)).To(Succeed())
 
+			defer func() {
+				// Clean up
+				g.Expect(env.CleanupAndWait(ctx, []client.Object{provider, dummyFutureConfigMap(namespace, currentVersion), dummyFutureConfigMap(namespace, tc.newVersion)}...)).To(Succeed())
+			}()
+
 			g.Eventually(func() bool {
 				if err := env.Get(ctx, client.ObjectKeyFromObject(provider), provider); err != nil {
 					return false
@@ -509,24 +512,6 @@ releaseSeries:
 
 				return allSet
 			}, 2*time.Second).Should(BeTrue())
-
-			// Clean up
-			objs := []client.Object{provider}
-			objs = append(objs, &corev1.ConfigMap{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      currentVersion,
-					Namespace: namespace,
-				},
-			})
-
-			objs = append(objs, &corev1.ConfigMap{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      tc.newVersion,
-					Namespace: namespace,
-				},
-			})
-
-			g.Expect(env.CleanupAndWait(ctx, objs...)).To(Succeed())
 		})
 	}
 }
@@ -573,9 +558,7 @@ func TestProviderShouldNotBeInstalledWhenCoreProviderNotReady(t *testing.T) {
 			return false
 		}
 
-		providerInstalled := conditions.Get(coreProvider, operatorv1.ProviderInstalledCondition)
-
-		return providerInstalled != nil && providerInstalled.Status == corev1.ConditionFalse
+		return conditions.Has(coreProvider, operatorv1.ProviderInstalledCondition) && conditions.IsFalse(coreProvider, operatorv1.ProviderInstalledCondition)
 	}, timeout).Should(BeEquivalentTo(true))
 
 	g.Consistently(func() bool {
@@ -589,6 +572,88 @@ func TestProviderShouldNotBeInstalledWhenCoreProviderNotReady(t *testing.T) {
 	}, timeout/3).Should(BeEquivalentTo(true))
 }
 
+func TestReconcilerPreflightConditionsFromCoreProviderEvents(t *testing.T) {
+	namespace := "test-core-provider-events"
+	coreProvider := &operatorv1.CoreProvider{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "cluster-api",
+		},
+		Spec: operatorv1.CoreProviderSpec{
+			ProviderSpec: operatorv1.ProviderSpec{
+				Version: testCurrentVersion,
+			},
+		},
+	}
+	infrastructureProvider := &operatorv1.InfrastructureProvider{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "vsphere",
+		},
+		Spec: operatorv1.InfrastructureProviderSpec{
+			ProviderSpec: operatorv1.ProviderSpec{
+				Version: testCurrentVersion,
+			},
+		},
+	}
+
+	g := NewWithT(t)
+	t.Log("Ensure namespace exists", namespace)
+	g.Expect(env.EnsureNamespaceExists(ctx, namespace)).To(Succeed())
+
+	g.Expect(env.CreateAndWait(ctx, dummyConfigMap(namespace))).To(Succeed())
+
+	for _, p := range []genericprovider.GenericProvider{coreProvider, infrastructureProvider} {
+		insertDummyConfig(p)
+		p.SetNamespace(namespace)
+		t.Log("creating test provider", p.GetName())
+		g.Expect(env.CreateAndWait(ctx, p)).To(Succeed())
+	}
+
+	defer func() {
+		g.Expect(env.CleanupAndWait(ctx, []client.Object{coreProvider, infrastructureProvider, dummyConfigMap(namespace)}...)).To(Succeed())
+	}()
+
+	g.Eventually(func() bool {
+		if err := env.Get(ctx, client.ObjectKeyFromObject(infrastructureProvider), infrastructureProvider); err != nil {
+			return false
+		}
+
+		if conditions.Has(infrastructureProvider, operatorv1.PreflightCheckCondition) && conditions.IsFalse(infrastructureProvider, operatorv1.PreflightCheckCondition) {
+			return true
+		}
+
+		return false
+	}, timeout).Should(BeEquivalentTo(true))
+
+	g.Eventually(func() bool {
+		if err := env.Get(ctx, client.ObjectKeyFromObject(coreProvider), coreProvider); err != nil {
+			return false
+		}
+
+		if conditions.IsTrue(coreProvider, operatorv1.PreflightCheckCondition) && conditions.IsTrue(coreProvider, operatorv1.ProviderInstalledCondition) {
+			return true
+		}
+
+		return false
+	}, timeout).Should(BeEquivalentTo(true))
+
+	patchHelper, err := patch.NewHelper(coreProvider, env)
+	g.Expect(err).ToNot(HaveOccurred())
+	conditions.MarkTrue(coreProvider, clusterv1.ReadyCondition)
+	g.Expect(patchHelper.Patch(ctx, coreProvider)).To(Succeed())
+
+	g.Eventually(func() bool {
+		if err := env.Get(ctx, client.ObjectKeyFromObject(infrastructureProvider), infrastructureProvider); err != nil {
+			return false
+		}
+
+		if conditions.IsTrue(infrastructureProvider, operatorv1.PreflightCheckCondition) {
+			return true
+		}
+
+		return false
+	}, timeout).Should(BeEquivalentTo(true))
+}
+
 func TestProviderConfigSecretChanges(t *testing.T) {
 	testCases := []struct {
 		name           string
@@ -859,6 +924,11 @@ func TestProviderSpecChanges(t *testing.T) {
 			t.Log("creating test provider", provider.GetName())
 			g.Expect(env.CreateAndWait(ctx, provider.DeepCopy())).To(Succeed())
 
+			defer func() {
+				// Clean up
+				g.Expect(env.Cleanup(ctx, provider, dummyConfigMap(namespace))).To(Succeed())
+			}()
+
 			g.Eventually(generateExpectedResultChecker(provider, specHash, corev1.ConditionTrue), timeout).Should(BeEquivalentTo(true))
 
 			g.Eventually(func() error {
@@ -886,9 +956,6 @@ func TestProviderSpecChanges(t *testing.T) {
 			} else {
 				g.Eventually(generateExpectedResultChecker(provider, "", corev1.ConditionFalse), timeout).Should(BeEquivalentTo(true))
 			}
-
-			// Clean up
-			g.Expect(env.Cleanup(ctx, provider, ns)).To(Succeed())
 		})
 	}
 }

internal/controller/secrets_to_providers.go

@@ -38,7 +38,7 @@ const (
 // It lists all the providers matching spec.configSecret.name values with the secret name querying by index.
 // If the provider references a secret without a namespace, it will assume the secret is in the same namespace as the provider.
 func newSecretToProviderFuncMapForProviderList(k8sClient client.Client, providerList genericprovider.GenericProviderList) handler.MapFunc {
-	providerListType := fmt.Sprintf("%t", providerList)
+	providerListType := fmt.Sprintf("%T", providerList)
 
 	return func(ctx context.Context, secret client.Object) []reconcile.Request {
 		log := ctrl.LoggerFrom(ctx).WithValues("secret", map[string]string{"name": secret.GetName(), "namespace": secret.GetNamespace()}, "providerListType", providerListType)