Move custom CIDR e2e test to unit & dryrun tests (#3126)

* Move custom CIDR e2e test to unit & integration tests

Author: sgalsaleh

.github/workflows/ci.yaml

@@ -912,7 +912,6 @@ jobs:
           - TestSingleNodeResumeDisasterRecovery
           - TestMultiNodeHADisasterRecovery
           - TestSingleNodeInstallationNoopUpgrade
-          - TestCustomCIDR
           - TestLocalArtifactMirror
           - TestMultiNodeReset
           - TestCollectSupportBundle

.github/workflows/release-prod.yaml

@@ -527,7 +527,6 @@ jobs:
           - TestSingleNodeResumeDisasterRecovery
           - TestMultiNodeHADisasterRecovery
           - TestSingleNodeInstallationNoopUpgrade
-          - TestCustomCIDR
           - TestLocalArtifactMirror
           - TestMultiNodeReset
           - TestCollectSupportBundle

api/integration/linux/install/infra_test.go

@@ -171,7 +171,8 @@ func TestLinuxPostSetupInfra(t *testing.T) {
 		}
 		mock.InOrder(
 			k0sMock.On("IsInstalled").Return(false, nil),
-			k0sMock.On("WriteK0sConfig", mock.Anything, "eth0", "", "10.244.0.0/16", "10.96.0.0/12", mock.Anything, mock.Anything).Return(k0sConfig, nil),
+			k0sMock.On("NewK0sConfig", "eth0", false, "10.244.0.0/16", "10.96.0.0/12", mock.Anything, mock.Anything).Return(k0sConfig, nil),
+			k0sMock.On("WriteK0sConfig", mock.Anything, k0sConfig).Return(nil),
 			hostutilsMock.On("CreateSystemdUnitFiles", mock.Anything, mock.Anything, rc, hostname, false).Return(nil),
 			k0sMock.On("Install", rc, hostname).Return(nil),
 			k0sMock.On("WaitForK0s").Return(nil),
@@ -704,7 +705,8 @@ func TestLinuxPostSetupInfra(t *testing.T) {
 		k0sConfig := &k0sv1beta1.ClusterConfig{}
 		mock.InOrder(
 			k0sMock.On("IsInstalled").Return(false, nil),
-			k0sMock.On("WriteK0sConfig", mock.Anything, "eth0", "", "10.244.0.0/16", "10.96.0.0/12", mock.Anything, mock.Anything).Return(k0sConfig, nil),
+			k0sMock.On("NewK0sConfig", "eth0", false, "10.244.0.0/16", "10.96.0.0/12", mock.Anything, mock.Anything).Return(k0sConfig, nil),
+			k0sMock.On("WriteK0sConfig", mock.Anything, k0sConfig).Return(nil),
 			hostutilsMock.On("CreateSystemdUnitFiles", mock.Anything, mock.Anything, rc, hostname, false).Return(nil),
 			k0sMock.On("Install", rc, hostname).Return(errors.New("failed to install k0s")),
 		)

api/internal/managers/linux/infra/install.go

@@ -162,8 +162,11 @@ func (m *infraManager) installK0s(ctx context.Context, rc runtimeconfig.RuntimeC
 	logFn := m.logFn("k0s")
 
 	logFn("creating k0s configuration file")
-	k0sCfg, err = m.k0scli.WriteK0sConfig(ctx, rc.NetworkInterface(), m.airgapBundle, rc.PodCIDR(), rc.ServiceCIDR(), m.endUserConfig, nil)
+	k0sCfg, err = m.k0scli.NewK0sConfig(rc.NetworkInterface(), m.airgapBundle != "", rc.PodCIDR(), rc.ServiceCIDR(), m.endUserConfig, nil)
 	if err != nil {
+		return nil, fmt.Errorf("new k0s config: %w", err)
+	}
+	if err := m.k0scli.WriteK0sConfig(ctx, k0sCfg); err != nil {
 		return nil, fmt.Errorf("create config file: %w", err)
 	}