Skip to content

Commit

Permalink
chore: update Go to 1.19, Linux to 5.15.58
Browse files Browse the repository at this point in the history
See https://go.dev/doc/go1.19

Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
  • Loading branch information
smira committed Aug 2, 2022
1 parent 6fc38ba commit fe96e27
Show file tree
Hide file tree
Showing 113 changed files with 117 additions and 52 deletions.
8 changes: 4 additions & 4 deletions Makefile
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions go.work.sum
Expand Up @@ -30,10 +30,9 @@ golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
google.golang.org/genproto v0.0.0-20220718134204-073382fd740c h1:xDUAhRezFnKF6wopxkOfdWYvz2XCiRQzndyDdpwFgbc=
google.golang.org/genproto v0.0.0-20220718134204-073382fd740c/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE=
google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w=
google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
k8s.io/api v0.24.2 h1:g518dPU/L7VRLxWfcadQn2OnsiGWVOadTLpdnqgY2OI=
k8s.io/api v0.24.2/go.mod h1:AHqbSkTm6YrQ0ObxjO3Pmp/ubFF/KuM7jU+3khoBsOg=
k8s.io/apimachinery v0.24.2 h1:5QlH9SL2C8KMcrNJPor+LbXVTaZRReml7svPEh4OKDM=
Expand All @@ -55,7 +54,3 @@ k8s.io/kubectl v0.24.2/go.mod h1:+HIFJc0bA6Tzu5O/YcuUt45APAxnNL8LeMuXwoiGsPg=
k8s.io/kubelet v0.24.2 h1:VAvULig8RiylCtyxudgHV7nhKsLnNIrdVBCRD4bXQ3Y=
k8s.io/kubelet v0.24.2/go.mod h1:Xm9DkWQjwOs+uGOUIIGIPMvvmenvj0lDVOErvIKOOt0=
k8s.io/metrics v0.24.2/go.mod h1:5NWURxZ6Lz5gj8TFU83+vdWIVASx7W8lwPpHYCqopMo=
kernel.org/pub/linux/libs/security/libcap/cap v1.2.65 h1:gIDtZoGnKeoIZ7XaKRmljMib4JV/TsjUhSzAeShNl6U=
kernel.org/pub/linux/libs/security/libcap/cap v1.2.65/go.mod h1:Fp9fDSuNh1vVDA7sozXklfQ+LxXMpB5/H4hDR8eu+0s=
kernel.org/pub/linux/libs/security/libcap/psx v1.2.65 h1:v2G3aCgEMr8qh4GpOGMukkv92EE7jtY+Uh9mB7cAACk=
kernel.org/pub/linux/libs/security/libcap/psx v1.2.65/go.mod h1:+l6Ee2F59XiJ2I6WR5ObpC1utCQJZ/VLsEbQCD8RG24=
11 changes: 8 additions & 3 deletions hack/docgen/main.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions hack/release.toml
Expand Up @@ -91,9 +91,9 @@ vlan=eth1.5:eth1 ip=172.20.0.2::172.20.0.1:255.255.255.0::eth1.5:::::
[notes.updates]
title = "Component Updates"
description="""\
* Linux: 5.15.57
* Linux: 5.15.58
Talos is built with Go 1.18.4.
Talos is built with Go 1.19.
"""

[notes.talos-config-kernel-param-variable-substitution]
Expand Down
1 change: 1 addition & 0 deletions pkg/machinery/config/types/v1alpha1/bundle/bundle.go
Expand Up @@ -20,6 +20,7 @@ import (
)

// NewConfigBundle returns a new bundle.
//
//nolint:gocyclo,cyclop
func NewConfigBundle(opts ...Option) (*ConfigBundle, error) {
options := DefaultOptions()
Expand Down
1 change: 1 addition & 0 deletions pkg/machinery/config/types/v1alpha1/v1alpha1_provider.go
Expand Up @@ -1032,6 +1032,7 @@ func (i *InstallConfig) Disk() (string, error) {
}

// DiskMatchers implements the config.Provider interface.
//
//nolint:gocyclo
func (i *InstallConfig) DiskMatchers() []disk.Matcher {
if i.InstallDiskSelector != nil {
Expand Down
13 changes: 7 additions & 6 deletions pkg/machinery/config/types/v1alpha1/v1alpha1_types.go
Expand Up @@ -613,8 +613,8 @@ metadata:

// Config defines the v1alpha1 configuration file.
//
// examples:
// - value: configExample
// examples:
// - value: configExample
type Config struct {
// description: |
// Indicates the schema used to decode the contents.
Expand Down Expand Up @@ -650,8 +650,8 @@ type Config struct {

// MachineConfig represents the machine-specific config values.
//
// examples:
// - value: machineConfigExample
// examples:
// - value: machineConfigExample
type MachineConfig struct {
// description: |
// Defines the role of the machine within the cluster.
Expand Down Expand Up @@ -842,8 +842,8 @@ type MachineSeccompProfile struct {

// ClusterConfig represents the cluster-wide config values.
//
// examples:
// - value: clusterConfigExample
// examples:
// - value: clusterConfigExample
type ClusterConfig struct {
// description: |
// Globally unique identifier for this cluster (base64 encoded random 32 bytes).
Expand Down Expand Up @@ -1297,6 +1297,7 @@ func (m *InstallDiskSizeMatcher) Matcher(d *disk.Disk) bool {
}

// InstallDiskSizeMatchData contains data for comparison - Op and Size.
//
//docgen:nodoc
type InstallDiskSizeMatchData struct {
Op string
Expand Down
2 changes: 1 addition & 1 deletion pkg/machinery/config/types/v1alpha1/v1alpha1_types_doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions pkg/machinery/config/types/v1alpha1/v1alpha1_validation.go
Expand Up @@ -65,6 +65,7 @@ var (
type NetworkDeviceCheck func(*Device, map[string]string) ([]string, error)

// Validate implements the config.Provider interface.
//
//nolint:gocyclo,cyclop
func (c *Config) Validate(mode config.RuntimeMode, options ...config.ValidationOption) ([]string, error) {
var (
Expand Down Expand Up @@ -460,6 +461,7 @@ func ValidateNetworkDevices(d *Device, pairedInterfaces map[string]string, check
}

// CheckDeviceInterface ensures that the interface has been specified.
//
//nolint:gocyclo
func CheckDeviceInterface(d *Device, _ map[string]string) ([]string, error) {
var result *multierror.Error
Expand Down
4 changes: 2 additions & 2 deletions pkg/machinery/constants/constants.go
Expand Up @@ -13,7 +13,7 @@ import (

const (
// DefaultKernelVersion is the default Linux kernel version.
DefaultKernelVersion = "5.15.57-talos"
DefaultKernelVersion = "5.15.58-talos"

// KernelParamConfig is the kernel parameter name for specifying the URL.
// to the config.
Expand Down Expand Up @@ -697,7 +697,7 @@ const (
DBusClientSocketPath = "/run/dbus/system_bus_socket"

// GoVersion is the version of Go compiler this release was built with.
GoVersion = "go1.18.4"
GoVersion = "go1.19"

// KubernetesTalosAPIServiceName is the name of the Kubernetes service to access Talos API.
KubernetesTalosAPIServiceName = "talos"
Expand Down
1 change: 1 addition & 0 deletions pkg/machinery/extensions/config.go
Expand Up @@ -19,6 +19,7 @@ type Config struct {
}

// Layer defines overlay mount layer.
//
//gotagsrewrite:gen
type Layer struct {
Image string `yaml:"image" protobuf:"1"`
Expand Down
1 change: 1 addition & 0 deletions pkg/machinery/extensions/metadata.go
Expand Up @@ -11,6 +11,7 @@ type Manifest struct {
}

// Metadata describes base extension metadata.
//
//gotagsrewrite:gen
type Metadata struct {
Name string `yaml:"name" protobuf:"1"`
Expand Down
1 change: 0 additions & 1 deletion pkg/machinery/extensions/services/restartkind_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/machinery/gendata/data/extras
@@ -1 +1 @@
v1.2.0-alpha.0-1-g17a319f
v1.2.0-alpha.0-2-gda35a63
2 changes: 1 addition & 1 deletion pkg/machinery/gendata/data/pkgs
@@ -1 +1 @@
v1.2.0-alpha.0-23-gdcc0311
v1.2.0-alpha.0-25-g6feece4
1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/addressflag_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/adselect_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/arpalltargets_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/arpvalidate_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/bondmode_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/bondxmithashpolicy_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pkg/machinery/nethelpers/device.go
Expand Up @@ -20,6 +20,7 @@ type DeviceInfo struct {
}

// GetDeviceInfo get additional device information by reading /sys/ directory.
//
//nolint:gocyclo
func GetDeviceInfo(deviceName string) (*DeviceInfo, error) {
path := filepath.Join("/sys/class/net/", deviceName, "/device/")
Expand Down
1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/duplex_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/failovermac_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/family_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/lacprate_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/linkflag_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/linktype_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/operationalstate_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/port_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/primaryreselect_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/routeflag_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/routeprotocol_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/routetype_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/routingtable_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/scope_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/status_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/machinery/nethelpers/vlanprotocol_enumer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pkg/machinery/resources/cluster/affiliate.go
Expand Up @@ -66,6 +66,7 @@ func (r AffiliateRD) ResourceDefinition(resource.Metadata, AffiliateSpec) meta.R
}

// AffiliateSpec describes Affiliate state.
//
//gotagsrewrite:gen
type AffiliateSpec struct {
NodeID string `yaml:"nodeId" protobuf:"1"`
Expand Down
1 change: 1 addition & 0 deletions pkg/machinery/resources/cluster/config.go
Expand Up @@ -22,6 +22,7 @@ const ConfigID = resource.ID("cluster")
type Config = typed.Resource[ConfigSpec, ConfigRD]

// ConfigSpec describes KubeSpan configuration.
//
//gotagsrewrite:gen
type ConfigSpec struct {
DiscoveryEnabled bool `yaml:"discoveryEnabled" protobuf:"1"`
Expand Down
1 change: 1 addition & 0 deletions pkg/machinery/resources/cluster/identity.go
Expand Up @@ -23,6 +23,7 @@ type Identity = typed.Resource[IdentitySpec, IdentityRD]
//
// Note: IdentitySpec is persisted on disk in the STATE partition,
// so YAML serialization should be kept backwards compatible.
//
//gotagsrewrite:gen
type IdentitySpec struct {
// NodeID is a random value which is persisted across reboots,
Expand Down
1 change: 1 addition & 0 deletions pkg/machinery/resources/cluster/member.go
Expand Up @@ -22,6 +22,7 @@ const MemberType = resource.Type("Members.cluster.talos.dev")
type Member = typed.Resource[MemberSpec, MemberRD]

// MemberSpec describes Member state.
//
//gotagsrewrite:gen
type MemberSpec struct {
NodeID string `yaml:"nodeId" protobuf:"1"`
Expand Down

0 comments on commit fe96e27

Please sign in to comment.