change: update deps

Author: iwilltry42

.golangci.yml

@@ -1,3 +1,23 @@
-linters-settings:
-  errcheck:
-    check-blank: false # to keep `_ = viper.BindPFlag(...)` from throwing errors
+version: "2"
+linters:
+  settings:
+    errcheck:
+      check-blank: false
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Dockerfile

@@ -4,7 +4,7 @@ ARG DOCKER_VERSION=27.3.1
 # -> golang image used solely for building the k3d binary  #
 # -> built executable can then be copied into other stages #
 ############################################################
-FROM golang:1.22.4 as builder
+FROM golang:1.24.4 AS builder
 ARG GIT_TAG_OVERRIDE
 WORKDIR /app
 RUN mkdir /tmp/empty
@@ -16,7 +16,7 @@ RUN make build -e GIT_TAG_OVERRIDE=${GIT_TAG_OVERRIDE} && bin/k3d version
 # -> k3d + some tools in a docker-in-docker container #
 # -> used e.g. in our CI pipelines for testing        #
 #######################################################
-FROM docker:$DOCKER_VERSION-dind as dind
+FROM docker:$DOCKER_VERSION-dind AS dind
 ARG OS
 ARG ARCH
 
@@ -40,7 +40,7 @@ COPY --from=builder /app/bin/k3d /bin/k3d
 # binary-only                           #
 # -> only the k3d binary.. nothing else #
 #########################################
-FROM scratch as binary-only
+FROM scratch AS binary-only
 # empty tmp directory to avoid errors when transforming the config file
 COPY --from=builder /tmp/empty /tmp
 COPY --from=builder /app/bin/k3d /bin/k3d

cmd/cluster/clusterCreate.go

@@ -144,7 +144,7 @@ func NewCmdClusterCreate() *cobra.Command {
 
 			// check if a cluster with that name exists already
 			if _, err := k3dCluster.ClusterGet(cmd.Context(), runtimes.SelectedRuntime, &clusterConfig.Cluster); err == nil {
-				l.Log().Fatalf("Failed to create cluster '%s' because a cluster with that name already exists", clusterConfig.Cluster.Name)
+				l.Log().Fatalf("Failed to create cluster '%s' because a cluster with that name already exists", clusterConfig.Name)
 			}
 
 			// create cluster
@@ -167,7 +167,7 @@ func NewCmdClusterCreate() *cobra.Command {
 				}
 				l.Log().Fatalln("Cluster creation FAILED, all changes have been rolled back!")
 			}
-			l.Log().Infof("Cluster '%s' created successfully!", clusterConfig.Cluster.Name)
+			l.Log().Infof("Cluster '%s' created successfully!", clusterConfig.Name)
 
 			/**************
 			 * Kubeconfig *
@@ -179,7 +179,7 @@ func NewCmdClusterCreate() *cobra.Command {
 			}
 
 			if clusterConfig.KubeconfigOpts.UpdateDefaultKubeconfig {
-				l.Log().Debugf("Updating default kubeconfig with a new context for cluster %s", clusterConfig.Cluster.Name)
+				l.Log().Debugf("Updating default kubeconfig with a new context for cluster %s", clusterConfig.Name)
 				if _, err := k3dCluster.KubeconfigGetWrite(cmd.Context(), runtimes.SelectedRuntime, &clusterConfig.Cluster, "", &k3dCluster.WriteKubeConfigOptions{UpdateExisting: true, OverwriteExisting: false, UpdateCurrentContext: simpleCfg.Options.KubeconfigOptions.SwitchCurrentContext}); err != nil {
 					l.Log().Warningln(err)
 				}
@@ -192,12 +192,12 @@ func NewCmdClusterCreate() *cobra.Command {
 			// print information on how to use the cluster with kubectl
 			l.Log().Infoln("You can now use it like this:")
 			if clusterConfig.KubeconfigOpts.UpdateDefaultKubeconfig && !clusterConfig.KubeconfigOpts.SwitchCurrentContext {
-				fmt.Printf("kubectl config use-context %s\n", fmt.Sprintf("%s-%s", k3d.DefaultObjectNamePrefix, clusterConfig.Cluster.Name))
+				fmt.Printf("kubectl config use-context %s\n", fmt.Sprintf("%s-%s", k3d.DefaultObjectNamePrefix, clusterConfig.Name))
 			} else if !clusterConfig.KubeconfigOpts.SwitchCurrentContext {
 				if runtime.GOOS == "windows" {
-					fmt.Printf("$env:KUBECONFIG=(%s kubeconfig write %s)\n", os.Args[0], clusterConfig.Cluster.Name)
+					fmt.Printf("$env:KUBECONFIG=(%s kubeconfig write %s)\n", os.Args[0], clusterConfig.Name)
 				} else {
-					fmt.Printf("export KUBECONFIG=$(%s kubeconfig write %s)\n", os.Args[0], clusterConfig.Cluster.Name)
+					fmt.Printf("export KUBECONFIG=$(%s kubeconfig write %s)\n", os.Args[0], clusterConfig.Name)
 				}
 			}
 			fmt.Println("kubectl cluster-info")

cmd/cluster/clusterList.go

@@ -164,14 +164,15 @@ func PrintClusters(clusters []*k3d.Cluster, flags clusterFlags) {
 		}
 	}
 
-	if outputFormat == "json" {
+	switch outputFormat {
+	case "json":
 		b, err := json.Marshal(jsonOutputEntries)
 		if err != nil {
 			fmt.Println(err)
 			return
 		}
 		fmt.Println(string(b))
-	} else if outputFormat == "yaml" {
+	case "yaml":
 		b, err := yaml.Marshal(jsonOutputEntries)
 		if err != nil {
 			fmt.Println(err)

cmd/kubeconfig/kubeconfigGet.go

@@ -56,7 +56,7 @@ func NewCmdKubeconfigGet() *cobra.Command {
 		ValidArgsFunction: util.ValidArgsAvailableClusters,
 		Args: func(cmd *cobra.Command, args []string) error {
 			if (len(args) < 1 && !getKubeconfigFlags.all) || (len(args) > 0 && getKubeconfigFlags.all) {
-				return fmt.Errorf("Need to specify one or more cluster names *or* set `--all` flag")
+				return fmt.Errorf("need to specify one or more cluster names *or* set `--all` flag")
 			}
 			return nil
 		},

cmd/root.go

@@ -283,7 +283,7 @@ func NewCmdVersionLs() *cobra.Command {
 		string(VersionLsSortOff):  VersionLsSortOff,
 	}
 
-	var imageRepos map[string]string = map[string]string{
+	var imageRepos = map[string]string{
 		"k3d":       "ghcr.io/k3d-io/k3d",
 		"k3d-tools": "ghcr.io/k3d-io/k3d-tools",
 		"k3d-proxy": "ghcr.io/k3d-io/k3d-proxy",

cmd/util/filter.go

@@ -64,12 +64,12 @@ func SplitFiltersFromFlag(flag string) (string, []string, error) {
 
 	// max number of pieces after split = 2 (only one @ allowed in flag)
 	if len(newsplit) > 2 {
-		return "", nil, fmt.Errorf("Invalid flag '%s': only one unescaped '@' allowed for node filter(s) (Escape literal '@' with '\\')", flag)
+		return "", nil, fmt.Errorf("invalid flag '%s': only one unescaped '@' allowed for node filter(s) (Escape literal '@' with '\\')", flag)
 	}
 
 	// trailing or leading '@'
 	if len(newsplit) < 2 {
-		return "", nil, fmt.Errorf("Invalid flag '%s' includes unescaped '@' but is missing a node filter (Escape literal '@' with '\\')", flag)
+		return "", nil, fmt.Errorf("invalid flag '%s' includes unescaped '@' but is missing a node filter (Escape literal '@' with '\\')", flag)
 	}
 
 	return newsplit[0], strings.Split(newsplit[1], ";"), nil

cmd/util/listings.go

@@ -82,7 +82,7 @@ func PrintNodes(nodes []*k3d.Node, outputFormat string, headers *[]string, nodeP
 		fmt.Println(string(b))
 	} else {
 		for _, node := range nodes {
-			if !(outputFormat == "json" || outputFormat == "yaml") {
+			if outputFormat != "json" && outputFormat != "yaml" {
 				nodePrinter.Print(tabwriter, node)
 			}
 		}

cmd/util/ports.go

@@ -41,14 +41,14 @@ func ParsePortExposureSpec(exposedPortSpec, internalPort string) (*k3d.ExposureO
 	match := apiPortRegexp.FindStringSubmatch(exposedPortSpec)
 
 	if len(match) == 0 {
-		return nil, fmt.Errorf("Failed to parse Port Exposure specification '%s': Format must be [(HostIP|HostName):]HostPort", exposedPortSpec)
+		return nil, fmt.Errorf("failed to parse Port Exposure specification '%s': Format must be [(HostIP|HostName):]HostPort", exposedPortSpec)
 	}
 
 	submatches := util.MapSubexpNames(apiPortRegexp.SubexpNames(), match)
 
 	// no port specified (or not matched via regex)
 	if submatches["port"] == "" {
-		return nil, fmt.Errorf("Failed to find port in Port Exposure spec '%s'", exposedPortSpec)
+		return nil, fmt.Errorf("failed to find port in Port Exposure spec '%s'", exposedPortSpec)
 	}
 
 	api := &k3d.ExposureOpts{}
@@ -58,7 +58,7 @@ func ParsePortExposureSpec(exposedPortSpec, internalPort string) (*k3d.ExposureO
 		l.Log().Tracef("Port Exposure: found hostname: %s", submatches["hostname"])
 		addrs, err := net.LookupHost(submatches["hostname"])
 		if err != nil {
-			return nil, fmt.Errorf("Failed to lookup host '%s' specified for Port Exposure: %+v", submatches["hostname"], err)
+			return nil, fmt.Errorf("failed to lookup host '%s' specified for Port Exposure: %+v", submatches["hostname"], err)
 		}
 		api.Host = submatches["hostname"]
 		for _, addr := range addrs {
@@ -67,7 +67,7 @@ func ParsePortExposureSpec(exposedPortSpec, internalPort string) (*k3d.ExposureO
 			}
 		}
 		if submatches["hostip"] == "" {
-			return nil, fmt.Errorf("Failed to lookup IPv4 address for host '%s'", submatches["hostname"])
+			return nil, fmt.Errorf("failed to lookup IPv4 address for host '%s'", submatches["hostname"])
 		}
 	}
 

docgen/go.mod

@@ -1,6 +1,6 @@
 module github.com/k3d-io/k3d/docgen
 
-go 1.22.4
+go 1.24.4
 
 require github.com/spf13/cobra v1.8.0