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

Author: laverya

.golangci.yml

@@ -32,6 +32,11 @@ linters-settings:
     - reflectvaluecompare
     - sortslice
     - unusedwrite
+  unused:
+    field-writes-are-uses: false
+    exported-fields-are-used: false
+    # parameters-are-used: false
+    local-variables-are-used: false
 
 issues:
   # Print all issues reported by all linters.

cmd/buildtools/k0s.go

@@ -24,18 +24,27 @@ var k0sImageComponents = map[string]addonComponent{
 		getWolfiPackageName: func(opts addonComponentOptions) string {
 			return "calico-node"
 		},
+		getWolfiPackageVersion: func(opts addonComponentOptions) string {
+			return getCalicoVersion(opts)
+		},
 	},
 	"quay.io/k0sproject/calico-cni": {
 		name: "calico-cni",
 		getWolfiPackageName: func(opts addonComponentOptions) string {
 			return "calico-cni"
 		},
+		getWolfiPackageVersion: func(opts addonComponentOptions) string {
+			return getCalicoVersion(opts)
+		},
 	},
 	"quay.io/k0sproject/calico-kube-controllers": {
 		name: "calico-kube-controllers",
 		getWolfiPackageName: func(opts addonComponentOptions) string {
 			return "calico-kube-controllers"
 		},
+		getWolfiPackageVersion: func(opts addonComponentOptions) string {
+			return getCalicoVersion(opts)
+		},
 	},
 	"registry.k8s.io/metrics-server/metrics-server": {
 		name: "metrics-server",
@@ -108,3 +117,11 @@ func getK0sVersion() (*semver.Version, error) {
 	}
 	return semver.MustParse(v), nil
 }
+
+func getCalicoVersion(opts addonComponentOptions) string {
+	// k0s < 1.32 is not compatible with calico 3.29+
+	if opts.k0sVersion.LessThan(semver.MustParse("1.32")) {
+		return "3.28"
+	}
+	return latestPatchVersion(opts.upstreamVersion)
+}

cmd/buildtools/utils.go

@@ -172,15 +172,6 @@ func FamiliarImageName(imageName string) string {
 	return reference.FamiliarName(ref)
 }
 
-func GetLatestGitHubRelease(ctx context.Context, owner, repo string) (string, error) {
-	client := github.NewClient(nil)
-	release, _, err := client.Repositories.GetLatestRelease(ctx, owner, repo)
-	if err != nil {
-		return "", err
-	}
-	return release.GetName(), nil
-}
-
 func latestPatchConstraint(s *semver.Version) string {
 	return fmt.Sprintf(">=%d.%d,<%d.%d", s.Major(), s.Minor(), s.Major(), s.Minor()+1)
 }

cmd/installer/cli/install.go

@@ -13,7 +13,6 @@ import (
 	"time"
 
 	"github.com/gosimple/slug"
-	k0sconfig "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
 	k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
 	"github.com/replicatedhq/embedded-cluster/cmd/installer/goods"
 	"github.com/replicatedhq/embedded-cluster/cmd/installer/kotscli"
@@ -69,9 +68,7 @@ type InstallCmdFlags struct {
 	ignoreHostPreflights    bool
 	configValues            string
 
-	networkInterface               string
-	isAutoSelectedNetworkInterface bool
-	autoSelectNetworkInterfaceErr  error
+	networkInterface string
 
 	license *kotsv1beta1.License
 	proxy   *ecv1beta1.ProxySpec
@@ -194,10 +191,7 @@ func preRunInstall(cmd *cobra.Command, flags *InstallCmdFlags) error {
 	// if a network interface flag was not provided, attempt to discover it
 	if flags.networkInterface == "" {
 		autoInterface, err := determineBestNetworkInterface()
-		if err != nil {
-			flags.autoSelectNetworkInterfaceErr = err
-		} else {
-			flags.isAutoSelectedNetworkInterface = true
+		if err == nil {
 			flags.networkInterface = autoInterface
 		}
 	}
@@ -216,15 +210,22 @@ func preRunInstall(cmd *cobra.Command, flags *InstallCmdFlags) error {
 		flags.license = l
 	}
 
+	if flags.configValues != "" {
+		err := configutils.ValidateKotsConfigValues(flags.configValues)
+		if err != nil {
+			return fmt.Errorf("config values file is not valid: %w", err)
+		}
+	}
+
+	flags.isAirgap = flags.airgapBundle != ""
+
 	runtimeconfig.ApplyFlags(cmd.Flags())
 	os.Setenv("TMPDIR", runtimeconfig.EmbeddedClusterTmpSubDir())
 
 	if err := runtimeconfig.WriteToDisk(); err != nil {
 		return fmt.Errorf("unable to write runtime config to disk: %w", err)
 	}
 
-	flags.isAirgap = flags.airgapBundle != ""
-
 	return nil
 }
 
@@ -570,7 +571,7 @@ func materializeFiles(airgapBundle string) error {
 	}
 
 	if airgapBundle != "" {
-		mat.Infof("Materializing airgap installation files")
+		mat.Infof("Materializing air gap installation files")
 
 		// read file from path
 		rawfile, err := os.Open(airgapBundle)
@@ -1114,7 +1115,7 @@ func gatherVersionMetadata(withChannelRelease bool) (*types.ReleaseMetadata, err
 	}
 
 	additionalCharts := []ecv1beta1.Chart{}
-	additionalRepos := []k0sconfig.Repository{}
+	additionalRepos := []k0sv1beta1.Repository{}
 	if withChannelRelease {
 		additionalCharts = config.AdditionalCharts()
 		additionalRepos = config.AdditionalRepositories()

cmd/installer/cli/restore.go

@@ -39,7 +39,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
-	velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
 	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -1138,7 +1137,7 @@ func waitForVeleroRestoreCompleted(ctx context.Context, restoreName string) (*ve
 	}
 
 	for {
-		restore := velerov1api.Restore{}
+		restore := velerov1.Restore{}
 		err = kcli.Get(ctx, types.NamespacedName{Name: restoreName, Namespace: runtimeconfig.VeleroNamespace}, &restore)
 		if err != nil {
 			return nil, fmt.Errorf("unable to get restore: %w", err)
@@ -1412,7 +1411,7 @@ func restoreAppFromBackup(ctx context.Context, backup *velerov1.Backup, restore
 	restoreName := fmt.Sprintf("%s.restore", backup.Name)
 
 	// check if a restore object already exists
-	rest := velerov1api.Restore{}
+	rest := velerov1.Restore{}
 	err = kcli.Get(ctx, types.NamespacedName{Name: restoreName, Namespace: runtimeconfig.VeleroNamespace}, &rest)
 	if err != nil && !k8serrors.IsNotFound(err) {
 		return fmt.Errorf("unable to get restore: %w", err)
@@ -1454,7 +1453,7 @@ func restoreFromBackup(ctx context.Context, backup *velerov1.Backup, drComponent
 	restoreName := fmt.Sprintf("%s.%s", backup.Name, string(drComponent))
 
 	// check if a restore object already exists
-	rest := velerov1api.Restore{}
+	rest := velerov1.Restore{}
 	err = kcli.Get(ctx, types.NamespacedName{Name: restoreName, Namespace: runtimeconfig.VeleroNamespace}, &rest)
 	if err != nil && !k8serrors.IsNotFound(err) {
 		return fmt.Errorf("unable to get restore: %w", err)

cmd/installer/cli/restore_test.go

@@ -3,7 +3,6 @@ package cli
 import (
 	"context"
 	"embed"
-	_ "embed"
 	"io"
 	"io/fs"
 	"testing"

deploy/images/seaweedfs/apko.tmpl.yaml

@@ -9,6 +9,7 @@ contents:
     - wolfi-base
     - seaweedfs~${PACKAGE_VERSION}
     - fuse3 # for weed mount
+    - wget # for seaweedfs-bucket-hook
 
 accounts:
   groups:

e2e/kots-release-upgrade/cluster-config.yaml

@@ -79,7 +79,7 @@ spec:
           values: |
             image:
               repository: proxy.replicated.com/anonymous/bloomberg/goldpinger
-        - chartname: oci://registry-1.docker.io/bitnamicharts/memcached
+        - chartname: oci://proxy.replicated.com/anonymous/bitnamicharts/memcached
           name: memcached
           namespace: memcached
           values: |

hack/test-installation.yaml

@@ -41,7 +41,7 @@ spec:
             image:
               repository: proxy.replicated.com/anonymous/bloomberg/goldpinger
           version: 6.1.2
-        - chartname: oci://registry-1.docker.io/bitnamicharts/memcached
+        - chartname: oci://proxy.replicated.com/anonymous/bitnamicharts/memcached
           name: memcached
           namespace: memcached
           order: 4

kinds/apis/v1beta1/config_types.go

@@ -18,13 +18,10 @@ package v1beta1
 
 import (
 	"encoding/json"
-	"fmt"
 	"time"
 
-	jsonpatch "github.com/evanphx/json-patch"
 	k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	k8syaml "sigs.k8s.io/yaml"
 )
 
 // UnsupportedOverrides holds the config overrides used to configure
@@ -148,32 +145,6 @@ type Extensions struct {
 	Helm *Helm `json:"helm,omitempty"`
 }
 
-func ConvertTo(e Helm, t *k0sv1beta1.HelmExtensions) (*k0sv1beta1.HelmExtensions, error) {
-	j, err := json.Marshal(e)
-	if err != nil {
-		return t, fmt.Errorf("unable to convert extensions: %w", err)
-	}
-
-	if err = json.Unmarshal(j, t); err != nil {
-		return t, fmt.Errorf("unable to unmarshal to new type: %w", err)
-	}
-
-	return t, nil
-}
-
-func ConvertFrom(e k0sv1beta1.HelmExtensions, t *Helm) (*Helm, error) {
-	j, err := json.Marshal(e)
-	if err != nil {
-		return t, fmt.Errorf("unable to convert extensions: %w", err)
-	}
-
-	if err = json.Unmarshal(j, t); err != nil {
-		return t, fmt.Errorf("unable to unmarshal to new type: %w", err)
-	}
-
-	return t, nil
-}
-
 // ConfigSpec defines the desired state of Config
 type ConfigSpec struct {
 	Version string `json:"version,omitempty"`
@@ -201,35 +172,6 @@ func (c ConfigSpec) OverrideForBuiltIn(bi string) string {
 	return ""
 }
 
-// ApplyEndUserAddOnOverrides applies the end-user provided addon config on top
-// of the provided addon configuration (cfg).
-func (c *ConfigSpec) ApplyEndUserAddOnOverrides(name, cfg string) (string, error) {
-	patch := c.OverrideForBuiltIn(name)
-	if len(cfg) == 0 || len(patch) == 0 {
-		if len(cfg) == 0 {
-			return patch, nil
-		}
-		return cfg, nil
-	}
-	originalJSON, err := k8syaml.YAMLToJSON([]byte(cfg))
-	if err != nil {
-		return "", fmt.Errorf("unable to convert source yaml to json: %w", err)
-	}
-	patchJSON, err := k8syaml.YAMLToJSON([]byte(patch))
-	if err != nil {
-		return "", fmt.Errorf("unable to convert patch yaml to json: %w", err)
-	}
-	result, err := jsonpatch.MergePatch(originalJSON, patchJSON)
-	if err != nil {
-		return "", fmt.Errorf("unable to patch configuration: %w", err)
-	}
-	resultYAML, err := k8syaml.JSONToYAML(result)
-	if err != nil {
-		return "", fmt.Errorf("unable to convert result json to yaml: %w", err)
-	}
-	return string(resultYAML), nil
-}
-
 // ConfigStatus defines the observed state of Config
 type ConfigStatus struct {
 }