diff --git a/api/v1/condition_types.go b/api/v1/condition_types.go deleted file mode 100644 index 39bbf116..00000000 --- a/api/v1/condition_types.go +++ /dev/null @@ -1,51 +0,0 @@ -/* -Copyright 2023 The Flux authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1 - -const ( - // HealthyCondition represents the last recorded - // health assessment result. - HealthyCondition string = "Healthy" - - // PruneFailedReason represents the fact that the - // pruning of the Kustomization failed. - PruneFailedReason string = "PruneFailed" - - // ArtifactFailedReason represents the fact that the - // source artifact download failed. - ArtifactFailedReason string = "ArtifactFailed" - - // BuildFailedReason represents the fact that the - // kustomize build failed. - BuildFailedReason string = "BuildFailed" - - // HealthCheckFailedReason represents the fact that - // one of the health checks failed. - HealthCheckFailedReason string = "HealthCheckFailed" - - // DependencyNotReadyReason represents the fact that - // one of the dependencies is not ready. - DependencyNotReadyReason string = "DependencyNotReady" - - // ReconciliationSucceededReason represents the fact that - // the reconciliation succeeded. - ReconciliationSucceededReason string = "ReconciliationSucceeded" - - // ReconciliationFailedReason represents the fact that - // the reconciliation failed. - ReconciliationFailedReason string = "ReconciliationFailed" -) diff --git a/internal/controller/kustomization_acl_test.go b/internal/controller/kustomization_acl_test.go index 59125cc2..f99b1c76 100644 --- a/internal/controller/kustomization_acl_test.go +++ b/internal/controller/kustomization_acl_test.go @@ -115,7 +115,7 @@ stringData: return resultK.Status.LastAppliedRevision == revision }, timeout, time.Second).Should(BeTrue()) - g.Expect(readyCondition.Reason).To(Equal(kustomizev1.ReconciliationSucceededReason)) + g.Expect(readyCondition.Reason).To(Equal(meta.ReconciliationSucceededReason)) }) t.Run("fails to reconcile from cross-namespace source", func(t *testing.T) { diff --git a/internal/controller/kustomization_controller.go b/internal/controller/kustomization_controller.go index 0e313ed2..1b2aa218 100644 --- a/internal/controller/kustomization_controller.go +++ b/internal/controller/kustomization_controller.go @@ -223,7 +223,7 @@ func (r *KustomizationReconciler) Reconcile(ctx context.Context, req ctrl.Reques // Resolve the source reference and requeue the reconciliation if the source is not found. artifactSource, err := r.getSource(ctx, obj) if err != nil { - conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.ArtifactFailedReason, err.Error()) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.ArtifactFailedReason, err.Error()) if apierrors.IsNotFound(err) { msg := fmt.Sprintf("Source '%s' not found", obj.Spec.SourceRef.String()) @@ -245,7 +245,7 @@ func (r *KustomizationReconciler) Reconcile(ctx context.Context, req ctrl.Reques // Requeue the reconciliation if the source artifact is not found. if artifactSource.GetArtifact() == nil { msg := fmt.Sprintf("Source artifact not found, retrying in %s", r.requeueDependency.String()) - conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.ArtifactFailedReason, msg) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.ArtifactFailedReason, msg) log.Info(msg) return ctrl.Result{RequeueAfter: r.requeueDependency}, nil } @@ -253,7 +253,7 @@ func (r *KustomizationReconciler) Reconcile(ctx context.Context, req ctrl.Reques // Check dependencies and requeue the reconciliation if the check fails. if len(obj.Spec.DependsOn) > 0 { if err := r.checkDependencies(ctx, obj, artifactSource); err != nil { - conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.DependencyNotReadyReason, err.Error()) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.DependencyNotReadyReason, err.Error()) msg := fmt.Sprintf("Dependencies do not meet ready condition, retrying in %s", r.requeueDependency.String()) log.Info(msg) r.event(obj, artifactSource.GetArtifact().Revision, eventv1.EventSeverityInfo, msg, nil) @@ -268,7 +268,7 @@ func (r *KustomizationReconciler) Reconcile(ctx context.Context, req ctrl.Reques // Requeue at the specified retry interval if the artifact tarball is not found. if errors.Is(reconcileErr, fetch.ErrFileNotFound) { msg := fmt.Sprintf("Source is not ready, artifact not found, retrying in %s", r.requeueDependency.String()) - conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.ArtifactFailedReason, msg) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.ArtifactFailedReason, msg) log.Info(msg) return ctrl.Result{RequeueAfter: r.requeueDependency}, nil } @@ -333,20 +333,20 @@ func (r *KustomizationReconciler) reconcile( os.Getenv("SOURCE_CONTROLLER_LOCALHOST"), ctrl.LoggerFrom(ctx), ).Fetch(src.GetArtifact().URL, src.GetArtifact().Digest, tmpDir); err != nil { - conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.ArtifactFailedReason, err.Error()) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.ArtifactFailedReason, err.Error()) return err } // check build path exists dirPath, err := securejoin.SecureJoin(tmpDir, obj.Spec.Path) if err != nil { - conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.ArtifactFailedReason, err.Error()) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.ArtifactFailedReason, err.Error()) return err } if _, err := os.Stat(dirPath); err != nil { err = fmt.Errorf("kustomization path not found: %w", err) - conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.ArtifactFailedReason, err.Error()) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.ArtifactFailedReason, err.Error()) return err } @@ -373,33 +373,33 @@ func (r *KustomizationReconciler) reconcile( // Create the Kubernetes client that runs under impersonation. kubeClient, statusPoller, err := impersonation.GetClient(ctx) if err != nil { - conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.ReconciliationFailedReason, err.Error()) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.ReconciliationFailedReason, err.Error()) return fmt.Errorf("failed to build kube client: %w", err) } // Generate kustomization.yaml if needed. k, err := runtime.DefaultUnstructuredConverter.ToUnstructured(obj) if err != nil { - conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.BuildFailedReason, err.Error()) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.BuildFailedReason, err.Error()) return err } err = r.generate(unstructured.Unstructured{Object: k}, tmpDir, dirPath) if err != nil { - conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.BuildFailedReason, err.Error()) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.BuildFailedReason, err.Error()) return err } // Build the Kustomize overlay and decrypt secrets if needed. resources, err := r.build(ctx, obj, unstructured.Unstructured{Object: k}, tmpDir, dirPath) if err != nil { - conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.BuildFailedReason, err.Error()) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.BuildFailedReason, err.Error()) return err } // Convert the build result into Kubernetes unstructured objects. objects, err := ssautil.ReadObjects(bytes.NewReader(resources)) if err != nil { - conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.BuildFailedReason, err.Error()) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.BuildFailedReason, err.Error()) return err } @@ -421,7 +421,7 @@ func (r *KustomizationReconciler) reconcile( // Validate and apply resources in stages. drifted, changeSet, err := r.apply(ctx, resourceManager, obj, revision, objects) if err != nil { - conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.ReconciliationFailedReason, err.Error()) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.ReconciliationFailedReason, err.Error()) return err } @@ -429,7 +429,7 @@ func (r *KustomizationReconciler) reconcile( newInventory := inventory.New() err = inventory.AddChangeSet(newInventory, changeSet) if err != nil { - conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.ReconciliationFailedReason, err.Error()) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.ReconciliationFailedReason, err.Error()) return err } @@ -439,13 +439,13 @@ func (r *KustomizationReconciler) reconcile( // Detect stale resources which are subject to garbage collection. staleObjects, err := inventory.Diff(oldInventory, newInventory) if err != nil { - conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.ReconciliationFailedReason, err.Error()) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.ReconciliationFailedReason, err.Error()) return err } // Run garbage collection for stale resources that do not have pruning disabled. if _, err := r.prune(ctx, resourceManager, obj, revision, staleObjects); err != nil { - conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.PruneFailedReason, err.Error()) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.PruneFailedReason, err.Error()) return err } @@ -459,7 +459,7 @@ func (r *KustomizationReconciler) reconcile( isNewRevision, drifted, changeSet.ToObjMetadataSet()); err != nil { - conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.HealthCheckFailedReason, err.Error()) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.HealthCheckFailedReason, err.Error()) return err } @@ -469,7 +469,7 @@ func (r *KustomizationReconciler) reconcile( // Mark the object as ready. conditions.MarkTrue(obj, meta.ReadyCondition, - kustomizev1.ReconciliationSucceededReason, + meta.ReconciliationSucceededReason, fmt.Sprintf("Applied revision: %s", revision)) return nil @@ -856,7 +856,7 @@ func (r *KustomizationReconciler) checkHealth(ctx context.Context, drifted bool, objects object.ObjMetadataSet) error { if len(obj.Spec.HealthChecks) == 0 && !obj.Spec.Wait { - conditions.Delete(obj, kustomizev1.HealthyCondition) + conditions.Delete(obj, meta.HealthyCondition) return nil } @@ -870,7 +870,7 @@ func (r *KustomizationReconciler) checkHealth(ctx context.Context, } if len(objects) == 0 { - conditions.Delete(obj, kustomizev1.HealthyCondition) + conditions.Delete(obj, meta.HealthyCondition) return nil } @@ -886,12 +886,12 @@ func (r *KustomizationReconciler) checkHealth(ctx context.Context, } // Find the previous health check result. - wasHealthy := apimeta.IsStatusConditionTrue(obj.Status.Conditions, kustomizev1.HealthyCondition) + wasHealthy := apimeta.IsStatusConditionTrue(obj.Status.Conditions, meta.HealthyCondition) // Update status with the reconciliation progress. message := fmt.Sprintf("Running health checks for revision %s with a timeout of %s", revision, obj.GetTimeout().String()) conditions.MarkReconciling(obj, meta.ProgressingReason, message) - conditions.MarkUnknown(obj, kustomizev1.HealthyCondition, meta.ProgressingReason, message) + conditions.MarkUnknown(obj, meta.HealthyCondition, meta.ProgressingReason, message) if err := r.patch(ctx, obj, patcher); err != nil { return fmt.Errorf("unable to update the healthy status to progressing: %w", err) } @@ -902,8 +902,8 @@ func (r *KustomizationReconciler) checkHealth(ctx context.Context, Timeout: obj.GetTimeout(), FailFast: r.FailFast, }); err != nil { - conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.HealthCheckFailedReason, err.Error()) - conditions.MarkFalse(obj, kustomizev1.HealthyCondition, kustomizev1.HealthCheckFailedReason, err.Error()) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.HealthCheckFailedReason, err.Error()) + conditions.MarkFalse(obj, meta.HealthyCondition, meta.HealthCheckFailedReason, err.Error()) return fmt.Errorf("health check failed after %s: %w", time.Since(checkStart).String(), err) } @@ -913,7 +913,7 @@ func (r *KustomizationReconciler) checkHealth(ctx context.Context, r.event(obj, revision, eventv1.EventSeverityInfo, msg, nil) } - conditions.MarkTrue(obj, kustomizev1.HealthyCondition, meta.SucceededReason, msg) + conditions.MarkTrue(obj, meta.HealthyCondition, meta.SucceededReason, msg) if err := r.patch(ctx, obj, patcher); err != nil { return fmt.Errorf("unable to update the healthy status to progressing: %w", err) } @@ -1077,7 +1077,7 @@ func (r *KustomizationReconciler) patch(ctx context.Context, // Configure the runtime patcher. patchOpts := []patch.Option{} ownedConditions := []string{ - kustomizev1.HealthyCondition, + meta.HealthyCondition, meta.ReadyCondition, meta.ReconcilingCondition, meta.StalledCondition, diff --git a/internal/controller/kustomization_dependson_test.go b/internal/controller/kustomization_dependson_test.go index 1c5724e2..100575e3 100644 --- a/internal/controller/kustomization_dependson_test.go +++ b/internal/controller/kustomization_dependson_test.go @@ -148,7 +148,7 @@ spec: g.Eventually(func() bool { _ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(kustomization), resultK) ready := apimeta.FindStatusCondition(resultK.Status.Conditions, meta.ReadyCondition) - return ready.Reason == kustomizev1.ArtifactFailedReason + return ready.Reason == meta.ArtifactFailedReason }, timeout, time.Second).Should(BeTrue()) }) @@ -160,7 +160,7 @@ spec: g.Eventually(func() bool { _ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(kustomization), resultK) ready := apimeta.FindStatusCondition(resultK.Status.Conditions, meta.ReadyCondition) - return ready.Reason == kustomizev1.ReconciliationSucceededReason + return ready.Reason == meta.ReconciliationSucceededReason }, timeout, time.Second).Should(BeTrue()) }) @@ -180,7 +180,7 @@ spec: g.Eventually(func() bool { _ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(kustomization), resultK) ready := apimeta.FindStatusCondition(resultK.Status.Conditions, meta.ReadyCondition) - return ready.Reason == kustomizev1.DependencyNotReadyReason + return ready.Reason == meta.DependencyNotReadyReason }, timeout, time.Second).Should(BeTrue()) }) } diff --git a/internal/controller/kustomization_force_test.go b/internal/controller/kustomization_force_test.go index d27bf85a..4432217d 100644 --- a/internal/controller/kustomization_force_test.go +++ b/internal/controller/kustomization_force_test.go @@ -169,6 +169,6 @@ stringData: kstatusCheck.CheckErr(ctx, resultK) - g.Expect(apimeta.IsStatusConditionTrue(resultK.Status.Conditions, kustomizev1.HealthyCondition)).To(BeTrue()) + g.Expect(apimeta.IsStatusConditionTrue(resultK.Status.Conditions, meta.HealthyCondition)).To(BeTrue()) }) } diff --git a/internal/controller/kustomization_impersonation_test.go b/internal/controller/kustomization_impersonation_test.go index eacbe16e..3bd9b27b 100644 --- a/internal/controller/kustomization_impersonation_test.go +++ b/internal/controller/kustomization_impersonation_test.go @@ -119,7 +119,7 @@ data: return resultK.Status.LastAppliedRevision == revision }, timeout, time.Second).Should(BeTrue()) - g.Expect(readyCondition.Reason).To(Equal(kustomizev1.ReconciliationSucceededReason)) + g.Expect(readyCondition.Reason).To(Equal(meta.ReconciliationSucceededReason)) }) t.Run("fails to reconcile impersonating the default service account", func(t *testing.T) { @@ -131,7 +131,7 @@ data: g.Eventually(func() bool { _ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(kustomization), resultK) readyCondition = apimeta.FindStatusCondition(resultK.Status.Conditions, meta.ReadyCondition) - return readyCondition.Reason == kustomizev1.ReconciliationFailedReason + return readyCondition.Reason == meta.ReconciliationFailedReason }, timeout, time.Second).Should(BeTrue()) g.Expect(readyCondition.Message).To(ContainSubstring("system:serviceaccount:%s:default", id)) @@ -187,7 +187,7 @@ data: return resultK.Status.LastAppliedRevision == revision }, timeout, time.Second).Should(BeTrue()) - g.Expect(readyCondition.Reason).To(Equal(kustomizev1.ReconciliationSucceededReason)) + g.Expect(readyCondition.Reason).To(Equal(meta.ReconciliationSucceededReason)) }) t.Run("can finalize impersonating service account", func(t *testing.T) { @@ -288,7 +288,7 @@ data: return apimeta.IsStatusConditionFalse(resultK.Status.Conditions, meta.ReadyCondition) }, timeout, time.Second).Should(BeTrue()) - g.Expect(readyCondition.Reason).To(Equal(kustomizev1.ReconciliationFailedReason)) + g.Expect(readyCondition.Reason).To(Equal(meta.ReconciliationFailedReason)) g.Expect(readyCondition.Message).To(ContainSubstring(`Secret "%s" not found`, secretName)) }) @@ -314,7 +314,7 @@ data: return resultK.Status.LastAppliedRevision == revision }, timeout, time.Second).Should(BeTrue()) - g.Expect(readyCondition.Reason).To(Equal(kustomizev1.ReconciliationSucceededReason)) + g.Expect(readyCondition.Reason).To(Equal(meta.ReconciliationSucceededReason)) }) } diff --git a/internal/controller/kustomization_validation_test.go b/internal/controller/kustomization_validation_test.go index 0e64456c..4f38ece7 100644 --- a/internal/controller/kustomization_validation_test.go +++ b/internal/controller/kustomization_validation_test.go @@ -120,7 +120,7 @@ func TestKustomizationReconciler_Validation(t *testing.T) { g.Eventually(func() bool { _ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(kustomization), &resultK) for _, c := range resultK.Status.Conditions { - if c.Reason == kustomizev1.BuildFailedReason { + if c.Reason == meta.BuildFailedReason { return true } } @@ -133,7 +133,7 @@ func TestKustomizationReconciler_Validation(t *testing.T) { g.Eventually(func() bool { _ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(overlayKs), &resultK) for _, c := range resultK.Status.Conditions { - if c.Reason == kustomizev1.BuildFailedReason { + if c.Reason == meta.BuildFailedReason { return true } } diff --git a/internal/controller/kustomization_varsub_test.go b/internal/controller/kustomization_varsub_test.go index 6e3b9432..841f46c4 100644 --- a/internal/controller/kustomization_varsub_test.go +++ b/internal/controller/kustomization_varsub_test.go @@ -164,7 +164,7 @@ stringData: g.Eventually(func() bool { _ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(inputK), resultK) for _, c := range resultK.Status.Conditions { - if c.Reason == kustomizev1.ReconciliationSucceededReason { + if c.Reason == meta.ReconciliationSucceededReason { return true } } @@ -178,7 +178,7 @@ stringData: t.Run("sets status", func(t *testing.T) { g.Expect(resultK.Status.LastAppliedRevision).To(Equal(revision)) g.Expect(apimeta.IsStatusConditionTrue(resultK.Status.Conditions, meta.ReadyCondition)).To(BeTrue()) - g.Expect(apimeta.IsStatusConditionTrue(resultK.Status.Conditions, kustomizev1.HealthyCondition)).To(BeTrue()) + g.Expect(apimeta.IsStatusConditionTrue(resultK.Status.Conditions, meta.HealthyCondition)).To(BeTrue()) }) t.Run("replaces vars", func(t *testing.T) { @@ -315,7 +315,7 @@ metadata: resultK := &kustomizev1.Kustomization{} _ = k8sClient.Get(ctx, client.ObjectKeyFromObject(inputK), resultK) for _, c := range resultK.Status.Conditions { - if c.Reason == kustomizev1.ReconciliationSucceededReason { + if c.Reason == meta.ReconciliationSucceededReason { return true } } @@ -456,7 +456,7 @@ data: resultK := &kustomizev1.Kustomization{} _ = k8sClient.Get(ctx, client.ObjectKeyFromObject(inputK), resultK) for _, c := range resultK.Status.Conditions { - if c.Reason == kustomizev1.ReconciliationSucceededReason { + if c.Reason == meta.ReconciliationSucceededReason { return true } } @@ -558,7 +558,7 @@ metadata: g.Eventually(func() bool { _ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(inputK), &resultK) for _, c := range resultK.Status.Conditions { - if c.Reason == kustomizev1.BuildFailedReason { + if c.Reason == meta.BuildFailedReason { return true } } diff --git a/internal/controller/kustomization_wait_test.go b/internal/controller/kustomization_wait_test.go index fdf03956..78b7a30e 100644 --- a/internal/controller/kustomization_wait_test.go +++ b/internal/controller/kustomization_wait_test.go @@ -127,8 +127,8 @@ parameters: }, timeout, time.Second).Should(BeTrue()) logStatus(t, resultK) - g.Expect(conditions.IsTrue(resultK, kustomizev1.HealthyCondition)).To(BeTrue()) - g.Expect(conditions.GetReason(resultK, kustomizev1.HealthyCondition)).To(BeIdenticalTo(meta.SucceededReason)) + g.Expect(conditions.IsTrue(resultK, meta.HealthyCondition)).To(BeTrue()) + g.Expect(conditions.GetReason(resultK, meta.HealthyCondition)).To(BeIdenticalTo(meta.SucceededReason)) g.Expect(resultK.Status.ObservedGeneration).To(BeIdenticalTo(resultK.Generation)) @@ -155,12 +155,12 @@ parameters: g.Eventually(func() bool { _ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(kustomization), resultK) - return isReconcileRunning(resultK) && conditions.IsUnknown(resultK, kustomizev1.HealthyCondition) + return isReconcileRunning(resultK) && conditions.IsUnknown(resultK, meta.HealthyCondition) }, timeout, time.Second).Should(BeTrue()) logStatus(t, resultK) expectedMessage := "Running health checks" - for _, c := range []string{meta.ReconcilingCondition, kustomizev1.HealthyCondition} { + for _, c := range []string{meta.ReconcilingCondition, meta.HealthyCondition} { g.Expect(conditions.GetReason(resultK, c)).To(BeIdenticalTo(meta.ProgressingReason)) g.Expect(conditions.GetMessage(resultK, c)).To(ContainSubstring(expectedMessage)) g.Expect(conditions.GetObservedGeneration(resultK, c)).To(BeIdenticalTo(resultK.Generation)) @@ -175,9 +175,9 @@ parameters: }, timeout, time.Second).Should(BeTrue()) logStatus(t, resultK) - for _, c := range []string{kustomizev1.HealthyCondition, meta.ReadyCondition} { + for _, c := range []string{meta.HealthyCondition, meta.ReadyCondition} { g.Expect(conditions.IsFalse(resultK, c)).To(BeTrue()) - g.Expect(conditions.GetReason(resultK, c)).To(BeIdenticalTo(kustomizev1.HealthCheckFailedReason)) + g.Expect(conditions.GetReason(resultK, c)).To(BeIdenticalTo(meta.HealthCheckFailedReason)) g.Expect(conditions.GetObservedGeneration(resultK, c)).To(BeIdenticalTo(resultK.Generation)) } @@ -212,13 +212,13 @@ parameters: logStatus(t, resultK) expectedMessage := "Health check passed" - g.Expect(conditions.IsTrue(resultK, kustomizev1.HealthyCondition)).To(BeTrue()) - g.Expect(conditions.GetReason(resultK, kustomizev1.HealthyCondition)).To(BeIdenticalTo(meta.SucceededReason)) - g.Expect(conditions.GetObservedGeneration(resultK, kustomizev1.HealthyCondition)).To(BeIdenticalTo(resultK.Generation)) - g.Expect(conditions.GetMessage(resultK, kustomizev1.HealthyCondition)).To(ContainSubstring(expectedMessage)) + g.Expect(conditions.IsTrue(resultK, meta.HealthyCondition)).To(BeTrue()) + g.Expect(conditions.GetReason(resultK, meta.HealthyCondition)).To(BeIdenticalTo(meta.SucceededReason)) + g.Expect(conditions.GetObservedGeneration(resultK, meta.HealthyCondition)).To(BeIdenticalTo(resultK.Generation)) + g.Expect(conditions.GetMessage(resultK, meta.HealthyCondition)).To(ContainSubstring(expectedMessage)) g.Expect(conditions.IsTrue(resultK, meta.ReadyCondition)).To(BeTrue()) - g.Expect(conditions.GetReason(resultK, meta.ReadyCondition)).To(BeIdenticalTo(kustomizev1.ReconciliationSucceededReason)) + g.Expect(conditions.GetReason(resultK, meta.ReadyCondition)).To(BeIdenticalTo(meta.ReconciliationSucceededReason)) g.Expect(conditions.GetObservedGeneration(resultK, meta.ReadyCondition)).To(BeIdenticalTo(resultK.Generation)) g.Expect(conditions.GetMessage(resultK, meta.ReadyCondition)).To(BeIdenticalTo(fmt.Sprintf("Applied revision: %s", revision))) @@ -249,7 +249,7 @@ parameters: logStatus(t, resultK) g.Expect(isReconcileSuccess(resultK)).To(BeTrue()) - g.Expect(conditions.IsTrue(resultK, kustomizev1.HealthyCondition)).To(BeTrue()) + g.Expect(conditions.IsTrue(resultK, meta.HealthyCondition)).To(BeTrue()) g.Expect(conditions.GetMessage(resultK, meta.ReadyCondition)).To(BeIdenticalTo(fmt.Sprintf("Applied revision: %s", revision))) g.Expect(resultK.Status.LastAttemptedRevision).To(BeIdenticalTo(resultK.Status.LastAppliedRevision))