chore: update Go to 1.19, Linux to 5.15.58

Dockerfile

@@ -95,7 +95,8 @@ RUN ["/toolchain/bin/mkdir", "/bin", "/tmp"]
 RUN ["/toolchain/bin/ln", "-svf", "/toolchain/bin/bash", "/bin/sh"]
 RUN ["/toolchain/bin/ln", "-svf", "/toolchain/etc/ssl", "/etc/ssl"]
 ARG GOLANGCILINT_VERSION
-RUN curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/${GOLANGCILINT_VERSION}/install.sh | bash -s -- -b /toolchain/bin ${GOLANGCILINT_VERSION}
+RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCILINT_VERSION} \
+	&& mv /go/bin/golangci-lint /toolchain/go/bin/golangci-lint
 ARG GOIMPORTS_VERSION
 RUN --mount=type=cache,target=/.cache go install golang.org/x/tools/cmd/goimports@${GOIMPORTS_VERSION} \
     && mv /go/bin/goimports /toolchain/go/bin/goimports

Makefile

@@ -13,10 +13,10 @@ DOCKER_LOGIN_ENABLED ?= true
 NAME = Talos
 
 ARTIFACTS := _out
-TOOLS ?= ghcr.io/siderolabs/tools:v1.2.0-alpha.0-4-g0d669dd
-PKGS ?= v1.2.0-alpha.0-23-gdcc0311
-EXTRAS ?= v1.2.0-alpha.0-1-g17a319f
-GO_VERSION ?= 1.18
+TOOLS ?= ghcr.io/siderolabs/tools:v1.2.0-alpha.0-6-gcd35510
+PKGS ?= v1.2.0-alpha.0-25-g6feece4
+EXTRAS ?= v1.2.0-alpha.0-2-gda35a63
+GO_VERSION ?= 1.19
 GOIMPORTS_VERSION ?= v0.1.11
 GOFUMPT_VERSION ?= v0.3.0
 GOLANGCILINT_VERSION ?= v1.47.2

cmd/installer/cmd/iso.go

@@ -9,7 +9,6 @@ import (
 	_ "embed"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -123,7 +122,7 @@ func runISOCmd() error {
 		return err
 	}
 
-	if err = ioutil.WriteFile(cfgPath, grubCfg.Bytes(), 0o666); err != nil {
+	if err = os.WriteFile(cfgPath, grubCfg.Bytes(), 0o666); err != nil {
 		return err
 	}
 

cmd/installer/pkg/install/manifest_test.go

@@ -7,7 +7,6 @@ package install_test
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -51,7 +50,7 @@ func (suite *manifestSuite) SetupTest() {
 
 	var err error
 
-	suite.disk, err = ioutil.TempFile("", "talos")
+	suite.disk, err = os.CreateTemp("", "talos")
 	suite.Require().NoError(err)
 
 	suite.Require().NoError(suite.disk.Truncate(diskSize))
@@ -200,8 +199,8 @@ func (suite *manifestSuite) verifyBlockdevice(manifest *install.Manifest, curren
 
 	if next != "" {
 		suite.Assert().NoError(os.MkdirAll(filepath.Join(tempDir, "boot", next), 0o700))
-		suite.Assert().NoError(ioutil.WriteFile(filepath.Join(tempDir, "boot", next, "kernel"), []byte("LINUX!"), 0o660))
-		suite.Assert().NoError(ioutil.WriteFile(filepath.Join(tempDir, "system", "state", "config.yaml"), []byte("#!yaml"), 0o660))
+		suite.Assert().NoError(os.WriteFile(filepath.Join(tempDir, "boot", next, "kernel"), []byte("LINUX!"), 0o660))
+		suite.Assert().NoError(os.WriteFile(filepath.Join(tempDir, "system", "state", "config.yaml"), []byte("#!yaml"), 0o660))
 
 		buf := []byte(next)
 
@@ -214,7 +213,7 @@ func (suite *manifestSuite) verifyBlockdevice(manifest *install.Manifest, curren
 		suite.Assert().NoError(f.Close())
 	}
 
-	suite.Assert().NoError(ioutil.WriteFile(filepath.Join(tempDir, "var", "content"), []byte("data"), 0o600))
+	suite.Assert().NoError(os.WriteFile(filepath.Join(tempDir, "var", "content"), []byte("data"), 0o600))
 }
 
 func (suite *manifestSuite) TestExecuteManifestClean() {
@@ -324,7 +323,7 @@ func (suite *manifestSuite) TestTargetInstall() {
 	dir := suite.T().TempDir()
 
 	// Create a tempfile for local copy
-	src, err := ioutil.TempFile(dir, "example")
+	src, err := os.CreateTemp(dir, "example")
 	suite.Require().NoError(err)
 
 	suite.Require().NoError(src.Close())

cmd/installer/pkg/ova/ova.go

@@ -9,7 +9,6 @@ import (
 	"crypto/sha256"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -26,6 +25,7 @@ SHA256({{ .OVF }})= {{ .OVFSHA }}
 `
 
 // OVF format reference: https://www.dmtf.org/standards/ovf.
+//
 //nolint:lll
 const ovfTpl = `<?xml version="1.0" encoding="UTF-8"?>
 <!--Generated by VMware ovftool 4.3.0 (build-7948156), UTC time: 2019-10-31T01:41:10.540841Z-->
@@ -138,9 +138,10 @@ const ovfTpl = `<?xml version="1.0" encoding="UTF-8"?>
 `
 
 // CreateOVAFromRAW creates an OVA from a RAW disk.
+//
 //nolint:gocyclo
 func CreateOVAFromRAW(name, src, out, arch string) (err error) {
-	dir, err := ioutil.TempDir("/tmp", "talos")
+	dir, err := os.MkdirTemp("/tmp", "talos")
 	if err != nil {
 		return err
 	}
@@ -186,11 +187,11 @@ func CreateOVAFromRAW(name, src, out, arch string) (err error) {
 	//nolint:errcheck
 	defer os.RemoveAll(dir)
 
-	if err = ioutil.WriteFile(filepath.Join(dir, name+".mf"), []byte(mf), 0o666); err != nil {
+	if err = os.WriteFile(filepath.Join(dir, name+".mf"), []byte(mf), 0o666); err != nil {
 		return err
 	}
 
-	if err = ioutil.WriteFile(filepath.Join(dir, name+".ovf"), []byte(ovf), 0o666); err != nil {
+	if err = os.WriteFile(filepath.Join(dir, name+".ovf"), []byte(ovf), 0o666); err != nil {
 		return err
 	}
 

cmd/talosctl/cmd/mgmt/gen/ca.go

@@ -6,7 +6,7 @@ package gen
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -40,15 +40,15 @@ var genCACmd = &cobra.Command{
 			return fmt.Errorf("error generating CA: %w", err)
 		}
 
-		if err := ioutil.WriteFile(genCACmdFlags.organization+".crt", ca.CrtPEM, 0o600); err != nil {
+		if err := os.WriteFile(genCACmdFlags.organization+".crt", ca.CrtPEM, 0o600); err != nil {
 			return fmt.Errorf("error writing CA certificate: %w", err)
 		}
 
-		if err := ioutil.WriteFile(genCACmdFlags.organization+".sha256", []byte(x509.Hash(ca.Crt)), 0o600); err != nil {
+		if err := os.WriteFile(genCACmdFlags.organization+".sha256", []byte(x509.Hash(ca.Crt)), 0o600); err != nil {
 			return fmt.Errorf("error writing certificate hash: %w", err)
 		}
 
-		if err := ioutil.WriteFile(genCACmdFlags.organization+".key", ca.KeyPEM, 0o600); err != nil {
+		if err := os.WriteFile(genCACmdFlags.organization+".key", ca.KeyPEM, 0o600); err != nil {
 			return fmt.Errorf("error writing key: %w", err)
 		}
 

cmd/talosctl/cmd/mgmt/gen/config.go

@@ -6,7 +6,6 @@ package gen
 
 import (
 	"fmt"
-	"io/ioutil"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -236,7 +235,7 @@ func writeV1Alpha1Config(args []string) error {
 
 	fullFilePath := filepath.Join(genConfigCmdFlags.outputDir, "talosconfig")
 
-	if err = ioutil.WriteFile(fullFilePath, data, 0o644); err != nil {
+	if err = os.WriteFile(fullFilePath, data, 0o644); err != nil {
 		return fmt.Errorf("%w", err)
 	}
 

cmd/talosctl/cmd/mgmt/gen/crt.go

@@ -8,7 +8,7 @@ import (
 	stdlibx509 "crypto/x509"
 	"encoding/pem"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -31,7 +31,7 @@ var genCrtCmd = &cobra.Command{
 	Long:  ``,
 	Args:  cobra.NoArgs,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		caBytes, err := ioutil.ReadFile(genCrtCmdFlags.ca + ".crt")
+		caBytes, err := os.ReadFile(genCrtCmdFlags.ca + ".crt")
 		if err != nil {
 			return fmt.Errorf("error reading CA cert: %s", err)
 		}
@@ -46,7 +46,7 @@ var genCrtCmd = &cobra.Command{
 			return fmt.Errorf("error parsing cert: %s", err)
 		}
 
-		keyBytes, err := ioutil.ReadFile(genCrtCmdFlags.ca + ".key")
+		keyBytes, err := os.ReadFile(genCrtCmdFlags.ca + ".key")
 		if err != nil {
 			return fmt.Errorf("error reading key file: %s", err)
 		}
@@ -61,7 +61,7 @@ var genCrtCmd = &cobra.Command{
 			return fmt.Errorf("error parsing EC key: %s", err)
 		}
 
-		csrBytes, err := ioutil.ReadFile(genCrtCmdFlags.csr)
+		csrBytes, err := os.ReadFile(genCrtCmdFlags.csr)
 		if err != nil {
 			return fmt.Errorf("error reading CSR: %s", err)
 		}
@@ -81,7 +81,7 @@ var genCrtCmd = &cobra.Command{
 			return fmt.Errorf("error signing certificate: %s", err)
 		}
 
-		if err = ioutil.WriteFile(genCrtCmdFlags.name+".crt", signedCrt.X509CertificatePEM, 0o600); err != nil {
+		if err = os.WriteFile(genCrtCmdFlags.name+".crt", signedCrt.X509CertificatePEM, 0o600); err != nil {
 			return fmt.Errorf("error writing certificate: %s", err)
 		}
 

cmd/talosctl/cmd/mgmt/gen/csr.go

@@ -8,8 +8,8 @@ import (
 	stdlibx509 "crypto/x509"
 	"encoding/pem"
 	"fmt"
-	"io/ioutil"
 	"net"
+	"os"
 	"path"
 	"strings"
 
@@ -33,7 +33,7 @@ var genCSRCmd = &cobra.Command{
 	Long:  ``,
 	Args:  cobra.NoArgs,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		keyBytes, err := ioutil.ReadFile(genCSRCmdFlags.key)
+		keyBytes, err := os.ReadFile(genCSRCmdFlags.key)
 		if err != nil {
 			return fmt.Errorf("error reading key: %s", err)
 		}
@@ -69,7 +69,7 @@ var genCSRCmd = &cobra.Command{
 			return fmt.Errorf("error generating CSR: %s", err)
 		}
 
-		if err := ioutil.WriteFile(strings.TrimSuffix(genCSRCmdFlags.key, path.Ext(genCSRCmdFlags.key))+".csr", csr.X509CertificateRequestPEM, 0o600); err != nil {
+		if err := os.WriteFile(strings.TrimSuffix(genCSRCmdFlags.key, path.Ext(genCSRCmdFlags.key))+".csr", csr.X509CertificateRequestPEM, 0o600); err != nil {
 			return fmt.Errorf("error writing CSR: %s", err)
 		}
 

cmd/talosctl/cmd/mgmt/gen/key.go

@@ -6,7 +6,7 @@ package gen
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 
 	"github.com/spf13/cobra"
 	"github.com/talos-systems/crypto/x509"
@@ -30,7 +30,7 @@ var genKeyCmd = &cobra.Command{
 			return fmt.Errorf("error generating key: %w", err)
 		}
 
-		if err := ioutil.WriteFile(genKeyCmdFlags.name+".key", key.PrivateKeyPEM, 0o600); err != nil {
+		if err := os.WriteFile(genKeyCmdFlags.name+".key", key.PrivateKeyPEM, 0o600); err != nil {
 			return fmt.Errorf("error writing key: %w", err)
 		}
 

cmd/talosctl/cmd/mgmt/gen/keypair.go

@@ -6,8 +6,8 @@ package gen
 
 import (
 	"fmt"
-	"io/ioutil"
 	"net"
+	"os"
 
 	"github.com/spf13/cobra"
 	"github.com/talos-systems/crypto/x509"
@@ -43,10 +43,10 @@ var genKeypairCmd = &cobra.Command{
 		if err != nil {
 			return fmt.Errorf("error generating CA: %s", err)
 		}
-		if err := ioutil.WriteFile(genKeypairCmdFlags.organization+".crt", ca.CrtPEM, 0o600); err != nil {
+		if err := os.WriteFile(genKeypairCmdFlags.organization+".crt", ca.CrtPEM, 0o600); err != nil {
 			return fmt.Errorf("error writing certificate: %s", err)
 		}
-		if err := ioutil.WriteFile(genKeypairCmdFlags.organization+".key", ca.KeyPEM, 0o600); err != nil {
+		if err := os.WriteFile(genKeypairCmdFlags.organization+".key", ca.KeyPEM, 0o600); err != nil {
 			return fmt.Errorf("error writing key: %s", err)
 		}
 

cmd/talosctl/cmd/mgmt/gen/secrets.go

@@ -6,7 +6,7 @@ package gen
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v3"
@@ -69,7 +69,7 @@ func writeSecretsBundleToFile(bundle *generate.SecretsBundle) error {
 		return err
 	}
 
-	return ioutil.WriteFile(genSecretsCmdFlags.outputFile, bundleBytes, 0o600)
+	return os.WriteFile(genSecretsCmdFlags.outputFile, bundleBytes, 0o600)
 }
 
 func init() {

cmd/talosctl/cmd/talos/apply-config.go

@@ -7,7 +7,7 @@ package talos
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"strings"
 	"time"
 
@@ -56,7 +56,7 @@ var applyConfigCmd = &cobra.Command{
 		}
 
 		if applyConfigCmdFlags.filename != "" {
-			cfgBytes, e = ioutil.ReadFile(applyConfigCmdFlags.filename)
+			cfgBytes, e = os.ReadFile(applyConfigCmdFlags.filename)
 			if e != nil {
 				return fmt.Errorf("failed to read configuration from %q: %w", applyConfigCmdFlags.filename, e)
 			}

cmd/talosctl/cmd/talos/config.go

@@ -11,7 +11,6 @@ import (
 	"encoding/base64"
 	"encoding/pem"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"sort"
 	"strings"
@@ -158,17 +157,17 @@ var configAddCmd = &cobra.Command{
 			return fmt.Errorf("error reading config: %w", err)
 		}
 
-		caBytes, err := ioutil.ReadFile(configAddCmdFlags.ca)
+		caBytes, err := os.ReadFile(configAddCmdFlags.ca)
 		if err != nil {
 			return fmt.Errorf("error reading CA: %w", err)
 		}
 
-		crtBytes, err := ioutil.ReadFile(configAddCmdFlags.crt)
+		crtBytes, err := os.ReadFile(configAddCmdFlags.crt)
 		if err != nil {
 			return fmt.Errorf("error reading certificate: %w", err)
 		}
 
-		keyBytes, err := ioutil.ReadFile(configAddCmdFlags.key)
+		keyBytes, err := os.ReadFile(configAddCmdFlags.key)
 		if err != nil {
 			return fmt.Errorf("error reading key: %w", err)
 		}

cmd/talosctl/cmd/talos/get.go

@@ -208,8 +208,9 @@ func getResourcesResponse(args []string, clientmsg *[]client.ResourceResponse) f
 	}
 }
 
-//nolint:gocyclo
 // completeResource represents tab complete options for `get` and `get *` commands.
+//
+//nolint:gocyclo
 func completeResource(resourceType string, hasAliasses bool, completeDot bool) []string {
 	var (
 		resourceResponse []client.ResourceResponse

cmd/talosctl/cmd/talos/kubeconfig.go

@@ -8,7 +8,6 @@ import (
 	"bufio"
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -120,7 +119,7 @@ Otherwise kubeconfig will be written to PWD or [local-path] if specified.`,
 				return extractAndMerge(data, localPath)
 			}
 
-			return ioutil.WriteFile(localPath, data, 0o640)
+			return os.WriteFile(localPath, data, 0o640)
 		})
 	},
 }

cmd/talosctl/cmd/talos/pcap.go

@@ -155,9 +155,10 @@ func dumpPackets(r io.Reader) error {
 // parseBPFInstructions parses the BPF raw instructions in 'tcpdump -dd' format.
 //
 // Example:
-//   { 0x30, 0, 0, 0x00000000 },
-//   { 0x54, 0, 0, 0x000000f0 },
-//   { 0x15, 0, 8, 0x00000060 },
+//
+//	{ 0x30, 0, 0, 0x00000000 },
+//	{ 0x54, 0, 0, 0x000000f0 },
+//	{ 0x15, 0, 8, 0x00000060 },
 func parseBPFInstructions(in string) ([]*machine.BPFInstruction, error) {
 	in = strings.TrimSpace(in)