Merge remote-tracking branch 'origin/main' into k0s-1-29

Author: laverya

.github/workflows/ci.yaml

@@ -136,7 +136,7 @@ jobs:
 
   build-current:
     name: Build current
-    runs-on: embedded-cluster
+    runs-on: embedded-cluster-2
     needs:
       - git-sha
     outputs:
@@ -206,7 +206,7 @@ jobs:
 
   build-legacydr:
     name: Build legacy DR
-    runs-on: embedded-cluster
+    runs-on: embedded-cluster-2
     needs:
       - git-sha
     outputs:
@@ -275,7 +275,7 @@ jobs:
 
   build-previous-k0s:
     name: Build previous k0s
-    runs-on: embedded-cluster
+    runs-on: embedded-cluster-2
     needs:
       - git-sha
     outputs:
@@ -380,7 +380,7 @@ jobs:
 
   build-upgrade:
     name: Build upgrade
-    runs-on: embedded-cluster
+    runs-on: embedded-cluster-2
     needs:
       - git-sha
     outputs:
@@ -777,19 +777,19 @@ jobs:
           - TestInstallWithMITMProxy
         include:
           - test: TestMultiNodeAirgapUpgrade
-            runner: embedded-cluster
+            runner: embedded-cluster-2
           - test: TestMultiNodeAirgapUpgradeSameK0s
-            runner: embedded-cluster
+            runner: embedded-cluster-2
           - test: TestMultiNodeAirgapUpgradePreviousStable
-            runner: embedded-cluster
+            runner: embedded-cluster-2
           - test: TestAirgapUpgradeFromEC18
-            runner: embedded-cluster
+            runner: embedded-cluster-2
           - test: TestSingleNodeAirgapDisasterRecovery
-            runner: embedded-cluster
+            runner: embedded-cluster-2
           - test: TestMultiNodeAirgapHAInstallation
-            runner: embedded-cluster
+            runner: embedded-cluster-2
           - test: TestMultiNodeAirgapHADisasterRecovery
-            runner: embedded-cluster
+            runner: embedded-cluster-2
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -802,7 +802,7 @@ jobs:
       - uses: ./.github/actions/e2e
         with:
           test-name: '${{ matrix.test }}'
-          is-large-runner: ${{ matrix.runner == 'embedded-cluster' }}
+          is-large-runner: ${{ matrix.runner == 'embedded-cluster-2' }}
           airgap-license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_AIRGAP_LICENSE_ID }}
           snapshot-license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_SNAPSHOT_LICENSE_ID }}
           snapshot-license: ${{ secrets.STAGING_EMBEDDED_CLUSTER_SNAPSHOT_LICENSE }}
@@ -833,7 +833,7 @@ jobs:
       matrix:
         include:
           - test: TestFiveNodesAirgapUpgrade
-            runner: embedded-cluster
+            runner: embedded-cluster-2
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -846,7 +846,7 @@ jobs:
       - uses: ./.github/actions/e2e
         with:
           test-name: '${{ matrix.test }}'
-          is-large-runner: ${{ matrix.runner == 'embedded-cluster' }}
+          is-large-runner: ${{ matrix.runner == 'embedded-cluster-2' }}
           airgap-license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_AIRGAP_LICENSE_ID }}
           snapshot-license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_SNAPSHOT_LICENSE_ID }}
           snapshot-license: ${{ secrets.STAGING_EMBEDDED_CLUSTER_SNAPSHOT_LICENSE }}

.github/workflows/release-prod.yaml

@@ -545,21 +545,21 @@ jobs:
           - TestInstallWithMITMProxy
         include:
           - test: TestMultiNodeAirgapUpgrade
-            runner: embedded-cluster
+            runner: embedded-cluster-2
           - test: TestMultiNodeAirgapUpgradeSameK0s
-            runner: embedded-cluster
+            runner: embedded-cluster-2
           - test: TestMultiNodeAirgapUpgradePreviousStable
-            runner: embedded-cluster
+            runner: embedded-cluster-2
           - test: TestAirgapUpgradeFromEC18
-            runner: embedded-cluster
+            runner: embedded-cluster-2
           - test: TestSingleNodeAirgapDisasterRecovery
-            runner: embedded-cluster
+            runner: embedded-cluster-2
           - test: TestMultiNodeAirgapHAInstallation
-            runner: embedded-cluster
+            runner: embedded-cluster-2
           - test: TestMultiNodeAirgapHADisasterRecovery
-            runner: embedded-cluster
+            runner: embedded-cluster-2
           - test: TestFiveNodesAirgapUpgrade
-            runner: embedded-cluster
+            runner: embedded-cluster-2
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -572,7 +572,7 @@ jobs:
       - uses: ./.github/actions/e2e
         with:
           test-name: '${{ matrix.test }}'
-          is-large-runner: ${{ matrix.runner == 'embedded-cluster' }}
+          is-large-runner: ${{ matrix.runner == 'embedded-cluster-2' }}
           airgap-license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_AIRGAP_LICENSE_ID }}
           snapshot-license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_SNAPSHOT_LICENSE_ID }}
           snapshot-license: ${{ secrets.STAGING_EMBEDDED_CLUSTER_SNAPSHOT_LICENSE }}

kinds/apis/v1beta1/installation_types.go

@@ -48,6 +48,10 @@ const (
 	InstallationSourceTypeConfigMap string = "ConfigMap"
 )
 
+const (
+	DisableReconcileConditionType = "DisableReconcile"
+)
+
 // ConfigSecretEntryName holds the entry name we are looking for in the secret
 // that holds the embedded cluster configuration.
 const ConfigSecretEntryName = "config.yaml"

operator/charts/embedded-cluster-operator/templates/embedded-cluster-operator-clusterrole.yaml

@@ -40,7 +40,6 @@ rules:
   resources:
   - persistentvolumes
   - persistentvolumeclaims
-  - pods
   verbs:
   - delete
   - get
@@ -50,7 +49,9 @@ rules:
   - ""
   resources:
   - configmaps
+  - pods
   verbs:
+  - create
   - get
   - list
   - watch

operator/controllers/installation_controller.go

@@ -557,7 +557,7 @@ func (r *InstallationReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	// are going to operate only on the newest one (sorting by installation
 	// name).
 	log := ctrl.LoggerFrom(ctx)
-	installs, err := kubeutils.ListInstallations(ctx, r.Client)
+	installs, err := kubeutils.ListCRDInstallations(ctx, r.Client)
 	if err != nil {
 		return ctrl.Result{}, fmt.Errorf("failed to list installations: %w", err)
 	}
@@ -590,6 +590,11 @@ func (r *InstallationReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		return ctrl.Result{}, nil
 	}
 
+	if k8sutil.CheckConditionStatus(in.Status, v1beta1.DisableReconcileConditionType) == metav1.ConditionTrue {
+		log.Info("Installation reconciliation is disabled, reconciliation ended")
+		return ctrl.Result{}, nil
+	}
+
 	// if this installation points to a cluster configuration living on
 	// a secret we need to fetch this configuration before moving on.
 	// at this stage we bail out with an error if we can't fetch or

operator/pkg/cli/migrate_v2.go

@@ -39,7 +39,6 @@ func MigrateV2Cmd() *cobra.Command {
 
 			return nil
 		},
-		// NOTE: the top level command is unused in the product but can be used for testing.
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := cmd.Context()