Feature/121 apply blueprint continuously

CHANGELOG.md

@@ -12,13 +12,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#119] *breaking* sensitive dogu config can now only be referenced with secrets
   - it was not safe to have these values in clear text in the blueprint
 - [#119] we now support blueprint v2 CRs
-- [#121] health checks before and after applying the blueprint are now non-blocking
+- [#121] all health checks are now non-blocking
+- [#121] there are in general no steps anymore, which will block the reconciliation loop beyond some HTTP-Requests
+- [#121] *breaking* blueprints will now be executed as a continuous process
+  - the operator will now detect changes and will enforce the content of the blueprint
+- [#121] *breaking* the current state will now be reflected via conditions instead of the `statusPhase` field
+- [#121] *breaking* events were reworked, some events are now more general, some events got removed completely
+  - Note, that events are for humans. You should not compute them for automation as they have no consistency guarantees.
 
 ### Removed
 - [#119] *breaking* no support for v1 blueprint CRs anymore
   - make sure to persist your blueprints before upgrading
   - you need to transform your blueprints to the new v2 format yourself 
 - [#121] remove maintenance mode
+- [#121] *breaking* dogus will not be restarted by the blueprint operator anymore
+  - this is now the responsibility of the dogu operator
 
 ## [v2.7.0] - 2025-07-17
 ### Fixed

go.mod

@@ -6,13 +6,13 @@ require (
 	github.com/Masterminds/semver/v3 v3.3.1
 	github.com/cloudogu/ces-commons-lib v0.2.0
 	github.com/cloudogu/cesapp-lib v0.18.1
-	github.com/cloudogu/k8s-blueprint-lib/v2 v2.0.0-20250731163609-f388bd8c571c
+	github.com/cloudogu/k8s-blueprint-lib/v2 v2.0.0-20250820104829-95faf37d626a
 	github.com/cloudogu/k8s-component-operator v1.9.0
 	github.com/cloudogu/k8s-dogu-lib/v2 v2.8.0
 	github.com/cloudogu/k8s-registry-lib v0.5.1
 	github.com/cloudogu/remote-dogu-descriptor-lib v0.1.1
-	github.com/cloudogu/retry-lib v0.1.0
 	github.com/go-logr/logr v1.4.2
+	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/stretchr/testify v1.10.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
@@ -39,6 +39,7 @@ require (
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/chai2010/gettext-go v1.0.3 // indirect
+	github.com/cloudogu/retry-lib v0.1.0 // indirect
 	github.com/containerd/cgroups/v3 v3.0.5 // indirect
 	github.com/containerd/containerd v1.7.27 // indirect
 	github.com/containerd/errdefs v1.0.0 // indirect

go.sum

@@ -48,12 +48,8 @@ github.com/cloudogu/ces-commons-lib v0.2.0 h1:yOEZWFl4W9N3J/6fok4svE3UufK5GQQtyx
 github.com/cloudogu/ces-commons-lib v0.2.0/go.mod h1:4rvR2RTDDaz5a6OZ1fW27G0MOnl5I3ackeiHxt4gn3o=
 github.com/cloudogu/cesapp-lib v0.18.1 h1:LMdGktIefm/PuhdPqpLTPvjY1smO06EEGBbRSAaYi7U=
 github.com/cloudogu/cesapp-lib v0.18.1/go.mod h1:J05eXFxnz4enZblABlmiVTZaUtJ+LIhlJ2UF6l9jpDw=
-github.com/cloudogu/k8s-blueprint-lib/v2 v2.0.0-20250723132542-b0472a456ff0 h1:b3vbIIV1J8YtRCMkJC0EKB10DcTPDqVNda/FNX11E80=
-github.com/cloudogu/k8s-blueprint-lib/v2 v2.0.0-20250723132542-b0472a456ff0/go.mod h1:Qyi8M+HJMHJfhXN6Zotey/tXjFuJDM9RIXn+FjQaJAU=
-github.com/cloudogu/k8s-blueprint-lib/v2 v2.0.0-20250731094124-310a388d0c7f h1:05BZKhsUJrv4oHkmK4CbNd2/0egXqXup/sfHOOCWC/0=
-github.com/cloudogu/k8s-blueprint-lib/v2 v2.0.0-20250731094124-310a388d0c7f/go.mod h1:Qyi8M+HJMHJfhXN6Zotey/tXjFuJDM9RIXn+FjQaJAU=
-github.com/cloudogu/k8s-blueprint-lib/v2 v2.0.0-20250731163609-f388bd8c571c h1:o2hARW5ifab56Yjzxedc95wCBnjsJuF1k0bOfqUNXB0=
-github.com/cloudogu/k8s-blueprint-lib/v2 v2.0.0-20250731163609-f388bd8c571c/go.mod h1:Qyi8M+HJMHJfhXN6Zotey/tXjFuJDM9RIXn+FjQaJAU=
+github.com/cloudogu/k8s-blueprint-lib/v2 v2.0.0-20250820104829-95faf37d626a h1:aj5qH5Ejn+TstaHjt+8Y6vigIY5uVl59IWPVzaFlczU=
+github.com/cloudogu/k8s-blueprint-lib/v2 v2.0.0-20250820104829-95faf37d626a/go.mod h1:Qyi8M+HJMHJfhXN6Zotey/tXjFuJDM9RIXn+FjQaJAU=
 github.com/cloudogu/k8s-component-operator v1.9.0 h1:b1/gMcAPQBP93EIVTE1ctmAKFdVOqnTST+x6LOqu08g=
 github.com/cloudogu/k8s-component-operator v1.9.0/go.mod h1:BdWqwpZWHoSFOduQ3FzcVV4uGJNb+t0DUYlLBHQ9wwQ=
 github.com/cloudogu/k8s-dogu-lib/v2 v2.8.0 h1:ae+LtiY+J2/qIX1AUJLcVxx/FQvlstq9ViVMwlJD26Y=
@@ -321,6 +317,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
 github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 h1:Ii+DKncOVM8Cu1Hc+ETb5K+23HdAMvESYE3ZJ5b5cMI=

pkg/adapter/doguregistry/cache.go

@@ -0,0 +1,78 @@
+package doguregistry
+
+import (
+	"context"
+	"fmt"
+
+	cescommons "github.com/cloudogu/ces-commons-lib/dogu"
+	"github.com/cloudogu/cesapp-lib/core"
+	gocache "github.com/patrickmn/go-cache"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+)
+
+// TODO: We should move this implementation in the dogu-descriptor-lib, so others can profit from it as well.
+
+type Cache struct {
+	repository remoteDoguDescriptorRepository
+	cache      *gocache.Cache
+}
+
+func NewCache(repository remoteDoguDescriptorRepository, cache *gocache.Cache) *Cache {
+	return &Cache{
+		repository: repository,
+		cache:      cache,
+	}
+}
+
+func (c *Cache) GetLatest(ctx context.Context, name cescommons.QualifiedName) (*core.Dogu, error) {
+	// we cannot cache latest for sure
+	dogu, err := c.repository.GetLatest(ctx, name)
+	if err != nil {
+		return nil, err
+	}
+	version, err := core.ParseVersion(dogu.Version)
+	if err != nil {
+		return nil, fmt.Errorf("cannot populate cache as latest dogu version cannot be parsed from response: %w", err)
+	}
+	c.SetCached(
+		cescommons.QualifiedVersion{
+			Name:    name,
+			Version: version,
+		},
+		dogu,
+	)
+	return dogu, nil
+}
+
+func (c *Cache) Get(ctx context.Context, version cescommons.QualifiedVersion) (*core.Dogu, error) {
+	logger := log.FromContext(ctx).WithName("DoguDescriptorCache")
+	dogu, found := c.GetCached(version)
+	if found {
+		logger.V(2).Info("dogu descriptor cache hit", "dogu", version)
+		return dogu, nil
+	}
+
+	// cache missed
+	dogu, err := c.repository.Get(ctx, version)
+	if err != nil {
+		return nil, err
+	}
+	c.SetCached(version, dogu)
+	return dogu, nil
+}
+
+func cacheKeyFromReference(qualifiedDoguVersion cescommons.QualifiedVersion) string {
+	return fmt.Sprintf("%s:%s", qualifiedDoguVersion.Name.String(), qualifiedDoguVersion.Version.String())
+}
+
+func (c *Cache) GetCached(qualifiedDoguVersion cescommons.QualifiedVersion) (*core.Dogu, bool) {
+	cached, found := c.cache.Get(cacheKeyFromReference(qualifiedDoguVersion))
+	if found {
+		return cached.(*core.Dogu), found
+	}
+	return nil, found
+}
+
+func (c *Cache) SetCached(qualifiedDoguVersion cescommons.QualifiedVersion, dogu *core.Dogu) {
+	c.cache.SetDefault(cacheKeyFromReference(qualifiedDoguVersion), dogu)
+}

pkg/adapter/doguregistry/remote.go

@@ -3,17 +3,13 @@ package doguregistry
 import (
 	"context"
 	"errors"
-	"fmt"
+
 	cescommons "github.com/cloudogu/ces-commons-lib/dogu"
 	cloudoguerrors "github.com/cloudogu/ces-commons-lib/errors"
 	"github.com/cloudogu/cesapp-lib/core"
-	"github.com/cloudogu/retry-lib/retry"
-
 	"github.com/cloudogu/k8s-blueprint-operator/v2/pkg/domainservice"
 )
 
-var maxTries = 20
-
 type Remote struct {
 	repository remoteDoguDescriptorRepository
 }
@@ -23,27 +19,24 @@ func NewRemote(repository remoteDoguDescriptorRepository) *Remote {
 }
 
 func (r *Remote) GetDogu(ctx context.Context, qualifiedDoguVersion cescommons.QualifiedVersion) (*core.Dogu, error) {
-	dogu := &core.Dogu{}
-	err := retry.OnError(maxTries, cloudoguerrors.IsConnectionError, func() error {
-		var err error
-		dogu, err = r.repository.Get(ctx, qualifiedDoguVersion)
-		return err
-	})
+	// do not retry here. If any error happens, just reconcile later. We only do retries in application level.
+	// This makes the code way easier and non-blocking.
+	dogu, err := r.repository.Get(ctx, qualifiedDoguVersion)
 	if err != nil {
-		// this is ugly, maybe do it better in cesapp-lib?
 		if cloudoguerrors.IsNotFoundError(err) {
-			return nil, &domainservice.NotFoundError{
-				WrappedError: err,
-				Message:      fmt.Sprintf("dogu %q with version %q could not be found", qualifiedDoguVersion.Name, qualifiedDoguVersion.Version.Raw),
-			}
-		}
-
-		return nil, &domainservice.InternalError{
-			WrappedError: err,
-			Message:      fmt.Sprintf("failed to get dogu %q with version %q", qualifiedDoguVersion.Name, qualifiedDoguVersion.Version.Raw),
+			return nil, domainservice.NewNotFoundError(
+				err,
+				"dogu %q with version %q could not be found",
+				qualifiedDoguVersion.Name, qualifiedDoguVersion.Version.Raw,
+			)
+		} else {
+			return nil, domainservice.NewInternalError(
+				err,
+				"failed to get dogu %q with version %q",
+				qualifiedDoguVersion.Name, qualifiedDoguVersion.Version.Raw,
+			)
 		}
 	}
-
 	return dogu, nil
 }
 

pkg/adapter/doguregistry/remote_test.go

@@ -3,13 +3,14 @@ package doguregistry
 import (
 	"context"
 	"fmt"
+	"testing"
+
 	cescommons "github.com/cloudogu/ces-commons-lib/dogu"
 	cloudoguerrors "github.com/cloudogu/ces-commons-lib/errors"
 	"github.com/cloudogu/cesapp-lib/core"
 	"github.com/cloudogu/k8s-blueprint-operator/v2/pkg/domainservice"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"testing"
 )
 
 func TestNewRemote(t *testing.T) {

pkg/adapter/kubernetes/blueprintcr/v2/blueprintSpecCRRepository.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+
 	v2 "github.com/cloudogu/k8s-blueprint-lib/v2/api/v2"
 	serializerv2 "github.com/cloudogu/k8s-blueprint-operator/v2/pkg/adapter/kubernetes/blueprintcr/v2/serializer"
 	corev1 "k8s.io/api/core/v1"
@@ -64,17 +65,22 @@ func (repo *blueprintSpecRepo) GetById(ctx context.Context, blueprintId string)
 		return nil, err
 	}
 
+	conditions := &blueprintCR.Status.Conditions
+	if conditions == nil {
+		conditions = &[]domain.Condition{}
+	}
+
 	blueprintSpec := &domain.BlueprintSpec{
 		Id:                 blueprintId,
 		EffectiveBlueprint: effectiveBlueprint,
 		StateDiff:          stateDiff,
+		Conditions:         conditions,
 		Config: domain.BlueprintConfiguration{
 			IgnoreDoguHealth:         blueprintCR.Spec.IgnoreDoguHealth,
 			IgnoreComponentHealth:    blueprintCR.Spec.IgnoreComponentHealth,
 			AllowDoguNamespaceSwitch: blueprintCR.Spec.AllowDoguNamespaceSwitch,
 			DryRun:                   blueprintCR.Spec.DryRun,
 		},
-		Status: domain.StatusPhase(blueprintCR.Status.Phase),
 	}
 
 	blueprint, blueprintErr := serializerv2.ConvertToBlueprintDomain(blueprintCR.Spec.Blueprint)
@@ -118,13 +124,13 @@ func (repo *blueprintSpecRepo) Update(ctx context.Context, spec *domain.Blueprin
 			CreationTimestamp: metav1.Time{},
 		},
 		Status: v2.BlueprintStatus{
-			Phase:              v2.StatusPhase(spec.Status),
 			EffectiveBlueprint: effectiveBlueprint,
 			StateDiff:          serializerv2.ConvertToStateDiffDTO(spec.StateDiff),
+			Conditions:         *spec.Conditions,
 		},
 	}
 
-	logger.Info("update blueprint CR status")
+	logger.V(2).Info("update blueprint CR status")
 
 	CRAfterUpdate, err := repo.blueprintClient.UpdateStatus(ctx, updatedBlueprint, metav1.UpdateOptions{})
 	if err != nil {