chore: Sync main into deletion mode feature

.github/actions/deploy-template-operator/action.yaml

@@ -46,12 +46,12 @@ runs:
       shell: bash
       run: |
         kubectl apply -f tests/moduletemplates/moduletemplate_template_operator_v2_fast.yaml
-    - name: Create Template Operator Module with final state and final deletion state as `Warning` and apply
+    - name: Create Template Operator Module with Deployment, with final state and final deletion state as `Warning` and apply
       working-directory: template-operator
-      if: ${{ matrix.e2e-test == 'module-status-decoupling'}}
+      if: ${{ matrix.e2e-test == 'module-status-decoupling-with-deployment'}}
       shell: bash
       run: |
-        pushd config/default
+        pushd config/overlays/deployment
         echo \
         "- op: replace
           path: /spec/template/spec/containers/0/args/1
@@ -62,24 +62,79 @@ runs:
         cat warning_patch.yaml
         kustomize edit add patch --path warning_patch.yaml --kind Deployment
         popd
-        kyma alpha create module --kubebuilder-project  --channel=regular --name kyma.project.io/module/template-operator --version 1.1.1 --path . --registry localhost:5111 --insecure --module-archive-version-overwrite /
+        make build-manifests
+        kyma alpha create module --module-config-file ./module-config.yaml --path . --registry localhost:5111 --insecure
         sed -i 's/localhost:5111/k3d-kcp-registry.localhost:5000/g' ./template.yaml
         kubectl get crds
         kubectl apply -f template.yaml
-    - name: Create Template Operator Module with non-working image and apply
+    - name: Create Template Operator Module with StatefulSet, with final state and final deletion state as `Warning` and apply
+      working-directory: template-operator
+      if: ${{ matrix.e2e-test == 'module-status-decoupling-with-statefulset'}}
+      shell: bash
+      run: |
+        pushd config/overlays/statefulset
+        echo \
+        "- op: replace
+          path: /spec/template/spec/containers/0/args/1
+          value: --final-state=Warning
+        - op: replace
+          path: /spec/template/spec/containers/0/args/2
+          value: --final-deletion-state=Warning" >> warning_patch.yaml
+        cat warning_patch.yaml
+        kustomize edit add patch --path warning_patch.yaml --kind StatefulSet
+        popd
+        make build-statefulset-manifests
+        kyma alpha create module --module-config-file ./module-config.yaml --path . --registry localhost:5111 --insecure
+        sed -i 's/localhost:5111/k3d-kcp-registry.localhost:5000/g' ./template.yaml
+        kubectl get crds
+        kubectl apply -f template.yaml
+    - name: Create non-working image patch for Template Operator Module and create associated module config file
+      working-directory: template-operator
+      if: ${{ matrix.e2e-test == 'module-status-decoupling-with-deployment'||
+        matrix.e2e-test == 'module-status-decoupling-with-statefulset'}}
+      shell: bash
+      run: |
+        echo "name: kyma-project.io/module/template-operator-misconfigured
+        channel: regular
+        version: v1.1.1
+        manifest: template-operator.yaml
+        security: sec-scanners-config.yaml
+        defaultCR: ./config/samples/default-sample-cr.yaml
+        annotations:
+          operator.kyma-project.io/doc-url: https://kyma-project.io" >> misconfigured-module-config.yaml
+    - name: Create Template Operator Module with Deployment, with non-working image and apply
       working-directory: template-operator
-      if: ${{ matrix.e2e-test == 'module-status-decoupling'}}
+      if: ${{ matrix.e2e-test == 'module-status-decoupling-with-deployment'}}
       shell: bash
       run: |
-        pushd config/default
+        pushd config/overlays/deployment
         echo \
         "- op: replace
           path: /spec/template/spec/containers/0/image
           value: non-working-path" >> image_patch.yaml
         cat image_patch.yaml
         kustomize edit add patch --path image_patch.yaml --kind Deployment
         popd
-        kyma alpha create module --kubebuilder-project  --channel=regular --name kyma.project.io/module/template-operator-misconfigured --version 1.1.1 --path . --registry localhost:5111 --insecure --module-archive-version-overwrite
+        make build-manifests
+        kyma alpha create module --module-config-file ./misconfigured-module-config.yaml --path . --registry localhost:5111 --insecure
+        sed -i 's/localhost:5111/k3d-kcp-registry.localhost:5000/g' ./template.yaml
+        kubectl get crds
+        kubectl apply -f template.yaml
+    - name: Create Template Operator Module with StatefulSet, with non-working image and apply
+      working-directory: template-operator
+      if: ${{ matrix.e2e-test == 'module-status-decoupling-with-statefulset'}}
+      shell: bash
+      run: |
+        pushd config/overlays/statefulset
+        echo \
+        "- op: replace
+          path: /spec/template/spec/containers/0/image
+          value: non-working-path" >> image_patch.yaml
+        cat image_patch.yaml
+        kustomize edit add patch --path image_patch.yaml --kind StatefulSet
+        popd
+        make build-statefulset-manifests
+        kyma alpha create module --module-config-file ./misconfigured-module-config.yaml --path . --registry localhost:5111 --insecure
         sed -i 's/localhost:5111/k3d-kcp-registry.localhost:5000/g' ./template.yaml
         kubectl get crds
         kubectl apply -f template.yaml

.github/workflows/test-e2e.yaml

@@ -30,7 +30,8 @@ jobs:
           - watcher-enqueue
           - kyma-deprovision-with-foreground-propagation
           - kyma-deprovision-with-background-propagation
-          - module-status-decoupling
+          - module-status-decoupling-with-statefulset
+          - module-status-decoupling-with-deployment
           - kyma-metrics
           - module-without-default-cr
           - module-consistency

api-version-compatibility-config.yaml

@@ -20,3 +20,5 @@ operator.kyma-project.io_moduletemplates.yaml:
     v1beta1:
       - .spec.properties.target
       - .spec.required[]|select(.=="target")
+    v1beta2:
+      - .spec.properties.customStateCheck.description

api/go.mod

@@ -4,7 +4,7 @@ go 1.22.4
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.1
-	github.com/open-component-model/ocm v0.11.0
+	github.com/open-component-model/ocm v0.12.0
 	k8s.io/apimachinery v0.30.3
 	sigs.k8s.io/controller-runtime v0.18.4
 )
@@ -39,20 +39,20 @@ require (
 	github.com/alibabacloud-go/tea-xml v1.1.3 // indirect
 	github.com/aliyun/credentials-go v1.3.1 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.27.0 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.27.16 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.16 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.3 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.7 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.7 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.30.0 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.27.21 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.21 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.8 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ecr v1.28.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ecr v1.29.1 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.18.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.9 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.20.9 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.28.10 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.21.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.29.1 // indirect
 	github.com/aws/smithy-go v1.20.2 // indirect
 	github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20231024185945-8841054dbdb8 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -65,7 +65,8 @@ require (
 	github.com/clbanning/mxj/v2 v2.7.0 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
-	github.com/containerd/containerd v1.7.17 // indirect
+	github.com/containerd/containerd v1.7.18 // indirect
+	github.com/containerd/errdefs v0.1.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
 	github.com/coreos/go-oidc/v3 v3.10.0 // indirect
@@ -75,9 +76,9 @@ require (
 	github.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7 // indirect
 	github.com/dimchansky/utfbom v1.1.1 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/cli v26.1.3+incompatible // indirect
+	github.com/docker/cli v27.0.1+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
-	github.com/docker/docker v26.1.3+incompatible // indirect
+	github.com/docker/docker v27.0.1+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.8.1 // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
@@ -132,14 +133,14 @@ require (
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.8 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
 	github.com/letsencrypt/boulder v0.0.0-20231026200631-000cd05d5491 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mandelsoft/filepath v0.0.0-20240223090642-3e2777258aa3 // indirect
-	github.com/mandelsoft/goutils v0.0.0-20240605100619-84d61423f421 // indirect
-	github.com/mandelsoft/logging v0.0.0-20240201091719-67180059d6bf // indirect
+	github.com/mandelsoft/goutils v0.0.0-20240623134558-383cb09dec16 // indirect
+	github.com/mandelsoft/logging v0.0.0-20240618075559-fdca28a87b0a // indirect
 	github.com/mandelsoft/spiff v1.7.0-beta-5 // indirect
 	github.com/mandelsoft/vfs v0.4.3 // indirect
 	github.com/marstr/guid v1.1.0 // indirect
@@ -213,15 +214,15 @@ require (
 	go.step.sm/crypto v0.44.2 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
 	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/oauth2 v0.20.0 // indirect
+	golang.org/x/mod v0.18.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/oauth2 v0.21.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/term v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/term v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/api v0.172.0 // indirect
@@ -233,10 +234,10 @@ require (
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	helm.sh/helm/v3 v3.15.1 // indirect
-	k8s.io/api v0.30.1 // indirect
-	k8s.io/apiextensions-apiserver v0.30.1 // indirect
-	k8s.io/client-go v0.30.1 // indirect
+	helm.sh/helm/v3 v3.15.2 // indirect
+	k8s.io/api v0.30.2 // indirect
+	k8s.io/apiextensions-apiserver v0.30.2 // indirect
+	k8s.io/client-go v0.30.2 // indirect
 	k8s.io/klog/v2 v2.120.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
 	k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect