Fixes #3629 (#3924)

Signed-off-by: appiepollo14 <[email protected]>
Co-authored-by: appiepollo14 <[email protected]>

Author: kubermatic-bot

pkg/addons/ensure.go

@@ -206,7 +206,7 @@ func EnsureUserAddons(s *state.State) error {
 		}
 	}
 
-	for _, embeddedAddon := range s.Cluster.Addons.OnlyAddons() {
+	for _, embeddedAddon := range s.Cluster.Addons.DeclaredAddonsOnly() {
 		if _, ok := embeddedAddons[embeddedAddon.Name]; ok {
 			continue
 		}

pkg/addons/helpers.go

@@ -359,7 +359,7 @@ func EmbeddedAddonsOnly(addons *kubeoneapi.Addons) (bool, error) {
 	}
 
 	// Iterate over addons specified in the KubeOneCluster object
-	for _, addon := range addons.OnlyAddons() {
+	for _, addon := range addons.DeclaredAddonsOnly() {
 		embedded := false
 		// Iterate over embedded addons directory to check if the addon exists
 		for _, embeddedAddon := range embeddedAddons {

pkg/addons/list.go

@@ -107,7 +107,7 @@ func List(s *state.State, outputFormat string) error {
 			}
 		}
 
-		for _, embeddedAddon := range s.Cluster.Addons.OnlyAddons() {
+		for _, embeddedAddon := range s.Cluster.Addons.DeclaredAddonsOnly() {
 			combinedAddons[embeddedAddon.Name] = addonItem{
 				Name:   embeddedAddon.Name,
 				Status: addonStatusInstall,

pkg/addons/manifest.go

@@ -61,7 +61,7 @@ func (a *applier) getManifestsFromDirectory(st *state.State, fsys fs.FS, addonNa
 		disableTemplating = false
 	)
 	if st.Cluster.Addons.Enabled() {
-		for _, addon := range st.Cluster.Addons.OnlyAddons() {
+		for _, addon := range st.Cluster.Addons.DeclaredAddonsOnly() {
 			if addon.Name == addonName {
 				addonParams = addon.Params
 				disableTemplating = addon.DisableTemplating

pkg/apis/kubeone/helpers.go

@@ -395,11 +395,15 @@ func (r *RegistryConfiguration) InsecureRegistryAddress() string {
 	return insecureRegistry
 }
 
+// Enabled returns whether addons are enabled.
+// this is true when either an addonsPath is provided or the addonsRef are provided
 func (ads *Addons) Enabled() bool {
-	return ads != nil && len(ads.Addons) > 0
+	return ads != nil && (ads.Path != "" || len(ads.Addons) > 0)
 }
 
-func (ads *Addons) OnlyAddons() []Addon {
+// DeclaredAddonsOnly returns a slice of Addons which are declared in the kubeone config manifest
+// it does not return any addons which might exist in the addons' path.
+func (ads *Addons) DeclaredAddonsOnly() []Addon {
 	if ads == nil {
 		return nil
 	}

pkg/apis/kubeone/helpers_test.go

@@ -271,3 +271,69 @@ func TestDefaultAssetConfiguration(t *testing.T) {
 		})
 	}
 }
+
+func TestAddons_Enabled(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		name   string
+		addons *Addons
+		want   bool
+	}{
+		{
+			name:   "nil addons",
+			addons: nil,
+			want:   false,
+		},
+		{
+			name:   "empty addons struct",
+			addons: &Addons{},
+			want:   false,
+		},
+		{
+			name: "only path set",
+			addons: &Addons{
+				Path: "addons/",
+			},
+			want: true,
+		},
+		{
+			name: "one addon reference (Addon)",
+			addons: &Addons{
+				Addons: []AddonRef{
+					{Addon: &Addon{}},
+				},
+			},
+			want: true,
+		},
+		{
+			name: "one addon reference (HelmRelease)",
+			addons: &Addons{
+				Addons: []AddonRef{
+					{HelmRelease: &HelmRelease{}},
+				},
+			},
+			want: true,
+		},
+		{
+			name: "path + addon ref",
+			addons: &Addons{
+				Path: "addons/",
+				Addons: []AddonRef{
+					{Addon: &Addon{Name: "addon1"}},
+				},
+			},
+			want: true,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+			got := tc.addons.Enabled()
+			if got != tc.want {
+				t.Errorf("Enabled() = %v, want %v", got, tc.want)
+			}
+		})
+	}
+}

pkg/cmd/local.go

@@ -92,13 +92,13 @@ func (opts *localOpts) BuildState() (*state.State, error) {
 		}
 
 		// Check if only embedded addons are being used; path is not required for embedded addons and no validation is required
-		embeddedAddonsOnly, err := addons.EmbeddedAddonsOnly(s.Cluster.Addons)
+		_, err = addons.EmbeddedAddonsOnly(s.Cluster.Addons)
 		if err != nil {
 			return nil, err
 		}
 
-		// If custom addons are being used then addons path is required and should be a valid directory
-		if !embeddedAddonsOnly {
+		// If an addons path is provided, that should be a valid directory
+		if addonsPath != "" {
 			if _, err := os.Stat(addonsPath); os.IsNotExist(err) {
 				return nil, fail.Runtime(err, "checking addons directory")
 			}

pkg/cmd/shared.go

@@ -86,13 +86,13 @@ func (opts *globalOptions) BuildState() (*state.State, error) {
 		}
 
 		// Check if only embedded addons are being used; path is not required for embedded addons and no validation is required
-		embeddedAddonsOnly, err := addons.EmbeddedAddonsOnly(s.Cluster.Addons)
+		_, err = addons.EmbeddedAddonsOnly(s.Cluster.Addons)
 		if err != nil {
 			return nil, err
 		}
 
-		// If custom addons are being used then addons path is required and should be a valid directory
-		if !embeddedAddonsOnly {
+		// If an addons path is provided, that should be a valid directory
+		if addonsPath != "" {
 			if _, err := os.Stat(addonsPath); os.IsNotExist(err) {
 				return nil, fail.Runtime(err, "checking addons directory")
 			}