Merge branch 'main' into certificates_deletion

.github/workflows/lint-golangci.yml

@@ -27,3 +27,9 @@ jobs:
           version: v1.60.3
           args: --verbose
           working-directory: ./api
+      - name: golangci-lint for maintenancewindows module
+        uses: golangci/[email protected]
+        with:
+          version: v1.60.3
+          args: --verbose
+          working-directory: ./maintenancewindows

.vscode/launch.json

@@ -17,6 +17,75 @@
         "ENABLE_WEBHOOKS": "false"
       },
       "preLaunchTask": "Install CRDs"
-    }
+    },
+    {
+      "name": "Launch KLM Integration Tests - Package of current file",
+      "type": "go",
+      "request": "launch",
+      "mode": "test",
+      "program": "${fileDirname}",
+      "args": ["-test.v", "-ginkgo.flake-attempts=10"],
+      "env": {
+        // make sure you added the following to your VSCODE settings.json
+        "KUBEBUILDER_ASSETS": "${config:go.testEnvVars.KUBEBUILDER_ASSETS}"
+      },
+    },
+    {
+      "name": "Launch KLM E2E Test",
+      "type": "go",
+      "request": "launch",
+      "mode": "test",
+      "program": "${workspaceFolder}/tests/e2e",
+      "args": ["-test.timeout", "20m", "-ginkgo.v", "-ginkgo.focus", "${input:e2eTestTargetName}"],
+      "env": {
+        "KCP_KUBECONFIG": "${env:HOME}/.k3d/kcp-local.yaml",
+        "SKR_KUBECONFIG": "${env:HOME}/.k3d/skr-local.yaml",
+      }
+    },
+  ],
+  "inputs": [
+    {
+      // not all of the options work OOTB, see deploy-lifecycle-manager-e2e action.yaml for specific patches
+      "id": "e2eTestTargetName",
+      "type": "pickString",
+      "description": "E2E test target name",
+      "options": [
+        "KCP Kyma CR Deprovision With Foreground Propagation After SKR Cluster Removal",
+        "KCP Kyma CR Deprovision With Background Propagation After SKR Cluster Removal",
+        "Manage Module Metrics",
+        "Mandatory Module Metrics",
+        "Mandatory Module With Old Naming Pattern Metrics",
+        "Enqueue Event from Watcher",
+        "Module Status Decoupling With StatefulSet",
+        "Module Status Decoupling With Deployment",
+        "Module Without Default CR",
+        "Module Keep Consistent After Deploy",
+        "Mandatory Module Installation and Deletion",
+        "Mandatory Module With Old Naming Pattern Installation and Deletion",
+        "Non Blocking Kyma Module Deletion",
+        "Manifest Skip Reconciliation Label",
+        "Kyma Module Upgrade Under Deletion",
+        "Kyma Module with ModuleReleaseMeta Upgrade Under Deletion",
+        "Unmanaging Kyma Module",
+        "Purge Controller",
+        "Purge Metrics",
+        "Module Upgrade By Channel Switch",
+        "Module Upgrade By New Version",
+        "Module with ModuleReleaseMeta Upgrade By New Version",
+        "Module Install By Version",
+        "CA Certificate Rotation",
+        "Istio Gateway Secret Rotation",
+        "Self Signed Certificate Rotation",
+        "Misconfigured Kyma Secret",
+        "RBAC Privileges",
+        "OCM Format Module Template",
+        "ModuleReleaseMeta With Obsolete ModuleTemplate",
+        "ModuleReleaseMeta Watch Trigger",
+        "ModuleReleaseMeta Sync",
+        "KCP Kyma Module status on SKR connection lost",
+        "ModuleReleaseMeta Not Allowed Installation",
+        "Labelling SKR resources"
+      ]
+    },
   ]
 }

Makefile

@@ -174,4 +174,5 @@ fmt: ## Run go fmt against code.
 lint: ## Run golangci-lint against code.
 	GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANG_CI_LINT_VERSION)
 	$(LOCALBIN)/golangci-lint run --verbose -c .golangci.yaml
-	cd api && $(LOCALBIN)/golangci-lint run --verbose -c ../.golangci.yaml
+	pushd api; $(LOCALBIN)/golangci-lint run --verbose -c ../.golangci.yaml; popd
+	pushd maintenancewindows; $(LOCALBIN)/golangci-lint run --verbose -c ../.golangci.yaml; popd

api/go.mod

@@ -34,10 +34,10 @@ require (
 	github.com/x448/float16 v0.8.4 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
-	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sys v0.26.0 // indirect
-	golang.org/x/term v0.25.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/term v0.27.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/time v0.7.0 // indirect
 	google.golang.org/protobuf v1.35.1 // indirect

api/go.sum

@@ -95,8 +95,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
-golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
 golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -105,10 +105,10 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
-golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
-golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=

go.mod

@@ -21,7 +21,7 @@ require (
 	github.com/stretchr/testify v1.10.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/sync v0.10.0
-	golang.org/x/time v0.8.0
+	golang.org/x/time v0.9.0
 	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
 	ocm.software/ocm v0.19.0
 	sigs.k8s.io/controller-runtime v0.19.3

go.sum

@@ -1187,8 +1187,8 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
-golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
+golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=

maintenancewindows/README.md

@@ -0,0 +1,6 @@
+# Maitenance Windows Library for Kyma
+
+## Overview
+
+This module contains the code for calculating the maintenance windows during which a Kyma cluster can be updated. [Lifecycle Manager](https://github.com/kyma-project/lifecycle-manager) and other components of the Kyma Control Plane use this maintenance windows library.
+

maintenancewindows/go.mod

@@ -0,0 +1,11 @@
+module github.com/kyma-project/lifecycle-manager/maintenancewindows
+
+go 1.23.4
+
+require github.com/stretchr/testify v1.10.0
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

maintenancewindows/go.sum

@@ -0,0 +1,10 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=