new custom state check

api/v1beta1/moduletemplate_conversion.go

@@ -16,7 +16,6 @@ func (src *ModuleTemplate) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.Data = src.Spec.Data
 	dst.Spec.Descriptor = src.Spec.Descriptor
 	dst.Spec.CustomStateCheck = src.Spec.CustomStateCheck
-
 	return nil
 }
 

api/v1beta1/moduletemplate_types.go

@@ -76,8 +76,7 @@ type ModuleTemplateSpec struct {
 	// hint by downstream controllers to determine which client implementation to use for working with the Module
 	Target Target `json:"target"`
 
-	// CustomStateCheck for advanced Module State determination
-	CustomStateCheck *v1beta2.CustomStateCheck `json:"customStateCheck,omitempty"`
+	CustomStateCheck []*v1beta2.CustomStateCheck `json:"customStateCheck,omitempty"`
 }
 
 //+kubebuilder:object:root=true

api/v1beta2/moduletemplate_types.go

@@ -104,16 +104,18 @@ type ModuleTemplateSpec struct {
 	//+kubebuilder:pruning:PreserveUnknownFields
 	Descriptor runtime.RawExtension `json:"descriptor"`
 
-	// CustomStateCheck for advanced Module State determination
-	CustomStateCheck *CustomStateCheck `json:"customStateCheck,omitempty"`
+	CustomStateCheck []*CustomStateCheck `json:"customStateCheck,omitempty"`
 }
 
 type CustomStateCheck struct {
 	// JSONPath specifies the JSON path to the state variable in the Module CR
 	JSONPath string `json:"jsonPath"`
 
-	// Value is the value at the JSONPath for which the Module CR state is set to "Ready" in Kyma CR
+	// Value is the value at the JSONPath for which the Module CR state should map with MappedState
 	Value string `json:"value"`
+
+	// MappedState is the Kyma CR State
+	MappedState State `json:"mappedState"`
 }
 
 func (m *ModuleTemplate) GetDescriptor() (*Descriptor, error) {

api/v1beta2/operator_annotations.go

@@ -6,8 +6,9 @@ const (
 	// OwnedByAnnotation defines the resource managing the resource. Differing from ManagedBy
 	// in that it does not reference controllers. Used by the runtime-watcher to determine the
 	// corresponding CR in KCP.
-	OwnedByAnnotation         = OperatorPrefix + Separator + "owned-by"
-	OwnedByFormat             = "%s/%s"
-	SyncStrategyAnnotation    = "sync-strategy"
-	IsClusterScopedAnnotation = OperatorPrefix + Separator + "is-cluster-scoped"
+	OwnedByAnnotation          = OperatorPrefix + Separator + "owned-by"
+	OwnedByFormat              = "%s/%s"
+	SyncStrategyAnnotation     = "sync-strategy"
+	IsClusterScopedAnnotation  = OperatorPrefix + Separator + "is-cluster-scoped"
+	CustomStateCheckAnnotation = OperatorPrefix + Separator + "custom-state-check"
 )

config/crd/bases/operator.kyma-project.io_moduletemplates.yaml

@@ -50,20 +50,32 @@ spec:
                 pattern: ^[a-z]+$
                 type: string
               customStateCheck:
-                description: CustomStateCheck for advanced Module State determination
-                properties:
-                  jsonPath:
-                    description: JSONPath specifies the JSON path to the state variable
-                      in the Module CR
-                    type: string
-                  value:
-                    description: Value is the value at the JSONPath for which the
-                      Module CR state is set to "Ready" in Kyma CR
-                    type: string
-                required:
-                - jsonPath
-                - value
-                type: object
+                items:
+                  properties:
+                    jsonPath:
+                      description: JSONPath specifies the JSON path to the state variable
+                        in the Module CR
+                      type: string
+                    mappedState:
+                      description: MappedState is the Kyma CR State
+                      enum:
+                      - Processing
+                      - Deleting
+                      - Ready
+                      - Error
+                      - ""
+                      - Warning
+                      type: string
+                    value:
+                      description: Value is the value at the JSONPath for which the
+                        Module CR state should map with MappedState
+                      type: string
+                  required:
+                  - jsonPath
+                  - mappedState
+                  - value
+                  type: object
+                type: array
               data:
                 description: Data is the default set of attributes that are used to
                   generate the Module. It contains a default set of values for a given
@@ -140,20 +152,32 @@ spec:
                 pattern: ^[a-z]+$
                 type: string
               customStateCheck:
-                description: CustomStateCheck for advanced Module State determination
-                properties:
-                  jsonPath:
-                    description: JSONPath specifies the JSON path to the state variable
-                      in the Module CR
-                    type: string
-                  value:
-                    description: Value is the value at the JSONPath for which the
-                      Module CR state is set to "Ready" in Kyma CR
-                    type: string
-                required:
-                - jsonPath
-                - value
-                type: object
+                items:
+                  properties:
+                    jsonPath:
+                      description: JSONPath specifies the JSON path to the state variable
+                        in the Module CR
+                      type: string
+                    mappedState:
+                      description: MappedState is the Kyma CR State
+                      enum:
+                      - Processing
+                      - Deleting
+                      - Ready
+                      - Error
+                      - ""
+                      - Warning
+                      type: string
+                    value:
+                      description: Value is the value at the JSONPath for which the
+                        Module CR state should map with MappedState
+                      type: string
+                  required:
+                  - jsonPath
+                  - mappedState
+                  - value
+                  type: object
+                type: array
               data:
                 description: Data is the default set of attributes that are used to
                   generate the Module. It contains a default set of values for a given

controllers/manifest_controller/manifest_controller_helper_test.go

@@ -23,8 +23,6 @@ import (
 	"github.com/google/go-containerregistry/pkg/v1/types"
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/rand"
-	"k8s.io/apimachinery/pkg/util/uuid"
 )
 
 const CredSecretLabelKeyForTest = "operator.kyma-project.io/oci-registry-cred" //nolint:gosec
@@ -94,18 +92,6 @@ func createOCIImageSpec(name, repo string, enableCredSecretSelector bool) v1beta
 	return imageSpec
 }
 
-func NewTestManifest(prefix string) *v1beta2.Manifest {
-	return &v1beta2.Manifest{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      fmt.Sprintf("%s-%d", prefix, rand.Intn(999999)),
-			Namespace: metav1.NamespaceDefault,
-			Labels: map[string]string{
-				v1beta2.KymaName: string(uuid.NewUUID()),
-			},
-		},
-	}
-}
-
 func withInvalidInstallImageSpec(enableResource bool) func(manifest *v1beta2.Manifest) error {
 	return func(manifest *v1beta2.Manifest) error {
 		invalidImageSpec := createOCIImageSpec("invalid-image-spec", "domain.invalid", false)

controllers/manifest_controller/manifest_controller_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/kyma-project/lifecycle-manager/api/v1beta2"
 	declarative "github.com/kyma-project/lifecycle-manager/internal/declarative/v2"
 	"github.com/kyma-project/lifecycle-manager/pkg/ocmextensions"
+	"github.com/kyma-project/lifecycle-manager/pkg/testutils"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
@@ -35,7 +36,7 @@ var _ = Describe(
 				givenCondition func(manifest *v1beta2.Manifest) error,
 				expectManifestState func(manifestName string) error,
 			) {
-				manifest := NewTestManifest("oci")
+				manifest := testutils.NewTestManifest("oci")
 				Eventually(givenCondition, standardTimeout, standardInterval).
 					WithArguments(manifest).Should(Succeed())
 				Eventually(expectManifestState, standardTimeout, standardInterval).
@@ -81,7 +82,7 @@ var _ = Describe(
 		)
 
 		It("Manifest should be in Error state with no auth secret found error message", func() {
-			manifestWithInstall := NewTestManifest("private-oci-registry")
+			manifestWithInstall := testutils.NewTestManifest("private-oci-registry")
 			Eventually(withValidInstallImageSpec(installName, false, true), standardTimeout, standardInterval).
 				WithArguments(manifestWithInstall).Should(Succeed())
 			Eventually(func() string {

controllers/manifest_controller/ready_check_test.go

@@ -7,6 +7,7 @@ import (
 
 	declarative "github.com/kyma-project/lifecycle-manager/internal/declarative/v2"
 	"github.com/kyma-project/lifecycle-manager/internal/manifest"
+	"github.com/kyma-project/lifecycle-manager/pkg/testutils"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -33,7 +34,7 @@ var _ = Describe("Manifest readiness check", Ordered, func() {
 		},
 	)
 	It("Install OCI specs including an nginx deployment", func() {
-		testManifest := NewTestManifest("custom-check-oci")
+		testManifest := testutils.NewTestManifest("custom-check-oci")
 		manifestName := testManifest.GetName()
 		validImageSpec := createOCIImageSpec(installName, server.Listener.Addr().String(), false)
 		imageSpecByte, err := json.Marshal(validImageSpec)