Enable kstatus checks

controllers/kustomization_force_test.go

@@ -137,7 +137,7 @@ stringData:
  }, timeout, time.Second).Should(BeTrue())
  logStatus(t, resultK)
 
- //kstatusCheck.CheckErr(ctx, resultK)
+ kstatusCheck.CheckErr(ctx, resultK)
 
  t.Run("emits validation error event", func(t *testing.T) {
  events := getEvents(resultK.GetName(), map[string]string{"kustomize.toolkit.fluxcd.io/revision": revision})
@@ -166,7 +166,7 @@ stringData:
  }, timeout, time.Second).Should(BeTrue())
  logStatus(t, resultK)
 
- //kstatusCheck.CheckErr(ctx, resultK)
+ kstatusCheck.CheckErr(ctx, resultK)
 
  g.Expect(apimeta.IsStatusConditionTrue(resultK.Status.Conditions, kustomizev1.HealthyCondition)).To(BeTrue())
  })

controllers/kustomization_wait_test.go

@@ -131,7 +131,7 @@ parameters:
 
  g.Expect(resultK.Status.ObservedGeneration).To(BeIdenticalTo(resultK.Generation))
 
- //kstatusCheck.CheckErr(ctx, resultK)
+ kstatusCheck.CheckErr(ctx, resultK)
  })
 
  t.Run("reports progressing status", func(t *testing.T) {
@@ -164,6 +164,7 @@ parameters:
  g.Expect(conditions.GetMessage(resultK, c)).To(ContainSubstring(expectedMessage))
  g.Expect(conditions.GetObservedGeneration(resultK, c)).To(BeIdenticalTo(resultK.Generation))
  }
+ kstatusInProgressCheck.CheckErr(ctx, resultK)
  })
 
  t.Run("reports unhealthy status", func(t *testing.T) {
@@ -186,7 +187,7 @@ parameters:
  g.Expect(resultK.Status.LastHandledReconcileAt).To(BeIdenticalTo(reconcileRequestAt))
  g.Expect(resultK.Status.ObservedGeneration).To(BeIdenticalTo(resultK.Generation - 1))
 
- //kstatusCheck.CheckErr(ctx, resultK)
+ kstatusCheck.CheckErr(ctx, resultK)
  })
 
  t.Run("emits unhealthy event", func(t *testing.T) {
@@ -222,7 +223,7 @@ parameters:
 
  g.Expect(resultK.Status.ObservedGeneration).To(BeIdenticalTo(resultK.Generation))
 
- //kstatusCheck.CheckErr(ctx, resultK)
+ kstatusCheck.CheckErr(ctx, resultK)
  })
 
  t.Run("emits recovery event", func(t *testing.T) {
@@ -252,7 +253,7 @@ parameters:
 
  g.Expect(resultK.Status.LastAttemptedRevision).To(BeIdenticalTo(resultK.Status.LastAppliedRevision))
 
- //kstatusCheck.CheckErr(ctx, resultK)
+ kstatusCheck.CheckErr(ctx, resultK)
  })
 
  t.Run("emits event for the new revision", func(t *testing.T) {

controllers/suite_test.go

@@ -23,7 +23,6 @@ import (
  "math/rand"
  "os"
  "path/filepath"
- "sigs.k8s.io/yaml"
  "testing"
  "time"
 
@@ -38,6 +37,7 @@ import (
  "sigs.k8s.io/controller-runtime/pkg/envtest"
  controllerLog "sigs.k8s.io/controller-runtime/pkg/log"
  "sigs.k8s.io/controller-runtime/pkg/log/zap"
+ "sigs.k8s.io/yaml"
 
  "github.com/fluxcd/pkg/apis/meta"
  "github.com/fluxcd/pkg/runtime/conditions"
@@ -63,15 +63,16 @@ const (
 const vaultVersion = "1.2.2"
 
 var (
- reconciler *KustomizationReconciler
- k8sClient client.Client
- testEnv *testenv.Environment
- testServer *testserver.ArtifactServer
- testMetricsH controller.Metrics
- ctx = ctrl.SetupSignalHandler()
- kubeConfig []byte
- kstatusCheck *kcheck.Checker
- debugMode = os.Getenv("DEBUG_TEST") != ""
+ reconciler *KustomizationReconciler
+ k8sClient client.Client
+ testEnv *testenv.Environment
+ testServer *testserver.ArtifactServer
+ testMetricsH controller.Metrics
+ ctx = ctrl.SetupSignalHandler()
+ kubeConfig []byte
+ kstatusCheck *kcheck.Checker
+ kstatusInProgressCheck *kcheck.Checker
+ debugMode = os.Getenv("DEBUG_TEST") != ""
 )
 
 func runInContext(registerControllers func(*testenv.Environment), run func() error, crdPath string) error {
@@ -166,6 +167,12 @@ func TestMain(m *testing.M) {
  &kcheck.Conditions{
  NegativePolarity: []string{meta.StalledCondition, meta.ReconcilingCondition},
  })
+ // Disable fetch for the in-progress kstatus checker so that it can be
+ // asked to evaluate snapshot of an object. This is needed to prevent
+ // the object status from changing right before the checker fetches it
+ // for inspection.
+ kstatusInProgressCheck = kcheck.NewInProgressChecker(testEnv.Client)
+ kstatusInProgressCheck.DisableFetch = true
  reconciler = &KustomizationReconciler{
  ControllerName: controllerName,
  Client: testEnv,

go.mod

@@ -26,7 +26,7 @@ require (
  github.com/fluxcd/pkg/apis/meta v0.18.0
  github.com/fluxcd/pkg/http/fetch v0.3.0
  github.com/fluxcd/pkg/kustomize v0.12.0
- github.com/fluxcd/pkg/runtime v0.24.0
+ github.com/fluxcd/pkg/runtime v0.26.0
  github.com/fluxcd/pkg/ssa v0.22.0
  github.com/fluxcd/pkg/tar v0.2.0
  github.com/fluxcd/pkg/testserver v0.4.0

go.sum

@@ -230,8 +230,8 @@ github.com/fluxcd/pkg/http/fetch v0.3.0 h1:/mLj0IzTx+GhR09etzMJsBoNQ0qeOx9cSdeUg
 github.com/fluxcd/pkg/http/fetch v0.3.0/go.mod h1:dHTDYIeL0ZAQ9mHM6ZS4VProxho+Atm73MHJ55yj0Sg=
 github.com/fluxcd/pkg/kustomize v0.12.0 h1:4MQdbP3M8NTIcr8TgNMxRCN+2xZoMWtCDDS3RiOT+8M=
 github.com/fluxcd/pkg/kustomize v0.12.0/go.mod h1:awHID4OKe2/WAfTFg4u0fURXZPUkrIslSZNSPX9MEFQ=
-github.com/fluxcd/pkg/runtime v0.24.0 h1:rQmm5Xq8K7f8xcPj1oNOInM1x4YwmgTucZJOP51Xmr4=
-github.com/fluxcd/pkg/runtime v0.24.0/go.mod h1:I2T+HWVNzX0cxm9TgH+SVNHTwqlmEDiSke43JXsq9iY=
+github.com/fluxcd/pkg/runtime v0.26.0 h1:j78f52xzpbR8xOvvemGwbGt4BLxpn9FOzim5tngOYvo=
+github.com/fluxcd/pkg/runtime v0.26.0/go.mod h1:I2T+HWVNzX0cxm9TgH+SVNHTwqlmEDiSke43JXsq9iY=
 github.com/fluxcd/pkg/ssa v0.22.0 h1:HvJTuiYLZMxCjin7bAqBgnc2RjSqEfYrMbV5yINoM64=
 github.com/fluxcd/pkg/ssa v0.22.0/go.mod h1:QND0ZNOQ5EzFxoNKfjUxE9J46AbRK3WKF8YkURwbVg0=
 github.com/fluxcd/pkg/tar v0.2.0 h1:HEUHgONQYsJGeZZ4x6h5nQU9Aox1I4T3bOp1faWTqf8=