Move addons and localhelm under workloads

Signed-off-by: Artiom Diomin <[email protected]>
kubermatic · May 22, 2024 · 6c2aa61 · 6c2aa61
1 parent e240d4f
commit 6c2aa61
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 10 deletions.
diff --git a/pkg/apis/kubeone/validation/validation.go b/pkg/apis/kubeone/validation/validation.go
@@ -27,9 +27,9 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 
-	"k8c.io/kubeone/pkg/addons"
 	kubeoneapi "k8c.io/kubeone/pkg/apis/kubeone"
 	"k8c.io/kubeone/pkg/semverutil"
+	"k8c.io/kubeone/pkg/workloads/addons"
 
 	"k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/apimachinery/pkg/util/validation/field"

diff --git a/pkg/cmd/addons.go b/pkg/cmd/addons.go
@@ -20,7 +20,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"k8c.io/kubeone/pkg/addons"
+	"k8c.io/kubeone/pkg/workloads/addons"
 )
 
 func addonsCmd(rootFlags *pflag.FlagSet) *cobra.Command {

diff --git a/pkg/cmd/local.go b/pkg/cmd/local.go
@@ -25,14 +25,14 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"k8c.io/kubeone/pkg/addons"
 	kubeoneapi "k8c.io/kubeone/pkg/apis/kubeone"
 	"k8c.io/kubeone/pkg/apis/kubeone/config"
 	kubeonev1beta2 "k8c.io/kubeone/pkg/apis/kubeone/v1beta2"
 	kubeonevalidation "k8c.io/kubeone/pkg/apis/kubeone/validation"
 	"k8c.io/kubeone/pkg/executor"
 	"k8c.io/kubeone/pkg/fail"
 	"k8c.io/kubeone/pkg/state"
+	"k8c.io/kubeone/pkg/workloads/addons"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/pkg/cmd/shared.go b/pkg/cmd/shared.go
@@ -32,20 +32,18 @@ import (
 	"github.com/spf13/pflag"
 	"golang.org/x/term"
 
-	"k8c.io/kubeone/pkg/addons"
 	kubeoneapi "k8c.io/kubeone/pkg/apis/kubeone"
 	"k8c.io/kubeone/pkg/apis/kubeone/config"
 	"k8c.io/kubeone/pkg/credentials"
 	"k8c.io/kubeone/pkg/fail"
 	"k8c.io/kubeone/pkg/state"
+	"k8c.io/kubeone/pkg/workloads/addons"
 
 	"k8s.io/apimachinery/pkg/util/sets"
 	ctrlruntimelog "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
-var (
-	defaultKubeVersion = ""
-)
+var defaultKubeVersion = ""
 
 const yes = "yes"
 
@@ -248,7 +246,7 @@ func initBackup(backupPath string) error {
 	}
 
 	// try to write to the file before doing anything else
-	backup, err := os.OpenFile(backupPath, os.O_RDWR|os.O_CREATE, 0600)
+	backup, err := os.OpenFile(backupPath, os.O_RDWR|os.O_CREATE, 0o600)
 	if err != nil {
 		return fail.Runtime(err, "opening backup file for write")
 	}

diff --git a/pkg/tasks/tasks.go b/pkg/tasks/tasks.go
@@ -17,18 +17,18 @@ limitations under the License.
 package tasks
 
 import (
-	"k8c.io/kubeone/pkg/addons"
 	"k8c.io/kubeone/pkg/certificate"
 	"k8c.io/kubeone/pkg/clusterstatus"
 	"k8c.io/kubeone/pkg/credentials"
 	"k8c.io/kubeone/pkg/fail"
 	"k8c.io/kubeone/pkg/features"
 	"k8c.io/kubeone/pkg/kubeconfig"
-	"k8c.io/kubeone/pkg/localhelm"
 	"k8c.io/kubeone/pkg/state"
 	"k8c.io/kubeone/pkg/templates/externalccm"
 	"k8c.io/kubeone/pkg/templates/machinecontroller"
 	"k8c.io/kubeone/pkg/templates/operatingsystemmanager"
+	"k8c.io/kubeone/pkg/workloads/addons"
+	"k8c.io/kubeone/pkg/workloads/localhelm"
 )
 
 type Tasks []Task
@@ -264,6 +264,10 @@ func WithResources(t Tasks) Tasks {
 				Operation:   "applying addons",
 				Description: "ensure embedded addons",
 			},
+			{
+				Fn:        nil,
+				Operation: "reconcile addons and helm releases",
+			},
 			{
 				Fn:          addons.EnsureUserAddons,
 				Operation:   "applying addons",

diff --git a/pkg/addons/applier.go → pkg/workloads/addons/applier.go b/pkg/addons/applier.go → pkg/workloads/addons/applier.go
diff --git a/pkg/addons/ensure.go → pkg/workloads/addons/ensure.go b/pkg/addons/ensure.go → pkg/workloads/addons/ensure.go
diff --git a/pkg/addons/helpers.go → pkg/workloads/addons/helpers.go b/pkg/addons/helpers.go → pkg/workloads/addons/helpers.go
diff --git a/pkg/addons/list.go → pkg/workloads/addons/list.go b/pkg/addons/list.go → pkg/workloads/addons/list.go
diff --git a/pkg/addons/manifest.go → pkg/workloads/addons/manifest.go b/pkg/addons/manifest.go → pkg/workloads/addons/manifest.go
diff --git a/pkg/addons/manifest_test.go → pkg/workloads/addons/manifest_test.go b/pkg/addons/manifest_test.go → pkg/workloads/addons/manifest_test.go
diff --git a/pkg/localhelm/helm3.go → pkg/workloads/localhelm/helm3.go b/pkg/localhelm/helm3.go → pkg/workloads/localhelm/helm3.go