Merge branch 'main' into mandatorymodules_multipleversion

kyma-project · Dec 16, 2024 · 7a0b303 · 7a0b303
2 parents a18de2c + 0767ebb
commit 7a0b303
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/api/go.mod b/api/go.mod
@@ -4,7 +4,7 @@ go 1.23.4
 
 require (
 	github.com/Masterminds/semver/v3 v3.3.1
-	k8s.io/apimachinery v0.31.3
+	k8s.io/apimachinery v0.31.4
 	sigs.k8s.io/controller-runtime v0.19.3
 )
 

diff --git a/api/go.sum b/api/go.sum
@@ -143,8 +143,8 @@ k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0=
 k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk=
 k8s.io/apiextensions-apiserver v0.31.2 h1:W8EwUb8+WXBLu56ser5IudT2cOho0gAKeTOnywBLxd0=
 k8s.io/apiextensions-apiserver v0.31.2/go.mod h1:i+Geh+nGCJEGiCGR3MlBDkS7koHIIKWVfWeRFiOsUcM=
-k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4=
-k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
+k8s.io/apimachinery v0.31.4 h1:8xjE2C4CzhYVm9DGf60yohpNUh5AEBnPxCryPBECmlM=
+k8s.io/apimachinery v0.31.4/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
 k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc=
 k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

diff --git a/internal/controller/mandatorymodule/deletion_controller.go b/internal/controller/mandatorymodule/deletion_controller.go
@@ -143,7 +143,8 @@ func (r *DeletionReconciler) removeManifests(ctx context.Context, manifests []v1
 }
 
 func filterManifestsByAnnotationAndVersion(manifests []v1beta2.Manifest,
-	annotationKey, annotationValue string, version string) []v1beta2.Manifest {
+	annotationKey, annotationValue string, version string,
+) []v1beta2.Manifest {
 	filteredManifests := make([]v1beta2.Manifest, 0)
 	for _, manifest := range manifests {
 		if manifest.Annotations[annotationKey] == annotationValue && manifest.Spec.Version == version {

diff --git a/tests/e2e/moduletemplate/mandatory_moduletemplate_template_operator_v1.yaml b/tests/e2e/moduletemplate/mandatory_moduletemplate_template_operator_v1.yaml
@@ -5,6 +5,8 @@ metadata:
   namespace: kcp-system
   labels:
     "operator.kyma-project.io/module-name": "template-operator"
+  annotations:
+    "operator.kyma-project.io/module-version": "1.1.0-smoke-test"
 spec:
   mandatory: true
   channel: regular

diff --git a/tests/e2e/moduletemplate/mandatory_moduletemplate_template_operator_v2.yaml b/tests/e2e/moduletemplate/mandatory_moduletemplate_template_operator_v2.yaml
@@ -7,6 +7,7 @@ metadata:
     "operator.kyma-project.io/module-name": "template-operator"
   annotations:
     "operator.kyma-project.io/is-cluster-scoped": "false"
+    "operator.kyma-project.io/module-version": "1.1.0-smoke-test"
 spec:
   mandatory: true
   channel: regular