Skip to content

chore: update dependencies (2026-09-11) #14355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
talos-bot merged 4 commits into from
Sep 14, 2026
Merged

chore: update dependencies (2026-09-11) #14355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
817a479
chore: update tools and pkgs
majabojarska Sep 11, 2026
0129eac
chore: update helm, cilium cli
majabojarska Sep 11, 2026
fe4bd64
chore: update integration k8s helm charts
majabojarska Sep 11, 2026
8fe3121
chore: update dockerfile syntax
majabojarska Sep 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .custom-gcl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v2.12.2
version: v2.13.2
plugins:
- module: github.com/siderolabs/talos/tools/loglinter
import: github.com/siderolabs/talos/tools/loglinter/plugin
Expand Down
3 changes: 2 additions & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ linters:
- embeddedstructfieldcheck
- err113
- errorlint
- exhaustruct
- exhaustruct # new version exhaustruct_v5
- exhaustruct_v5
- forcetypeassert
- funcorder
- funlen
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# syntax = docker/dockerfile-upstream:1.26.0-labs
# syntax = docker/dockerfile-upstream:1.27.0-labs

# Meta args applied to stage base names.

Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ ARTIFACTS := _out
EMBED_TARGET ?= embed

TOOLS_PREFIX ?= ghcr.io/siderolabs/tools
TOOLS ?= v1.15.0-alpha.0-5-g09ccc74
TOOLS ?= v1.15.0-alpha.0-9-g19bb4b7
Comment thread
majabojarska marked this conversation as resolved.
PKGS_PREFIX ?= ghcr.io/siderolabs
PKGS ?= v1.15.0-alpha.0-27-ge7b09e2
PKGS ?= v1.15.0-alpha.0-30-gf380535
GENERATE_VEX_PREFIX ?= ghcr.io/siderolabs/generate-vex
GENERATE_VEX ?= latest

Expand Down Expand Up @@ -110,9 +110,9 @@ KUBECTL_VERSION ?= v1.37.0
# renovate: datasource=github-releases depName=kastenhq/kubestr
KUBESTR_VERSION ?= v0.4.49
# renovate: datasource=github-releases depName=helm/helm
HELM_VERSION ?= v4.2.3
HELM_VERSION ?= v4.3.0
# renovate: datasource=github-releases depName=cilium/cilium-cli
CILIUM_CLI_VERSION ?= v0.19.7
CILIUM_CLI_VERSION ?= v0.20.0
# renovate: datasource=github-releases depName=microsoft/secureboot_objects
MICROSOFT_SECUREBOOT_RELEASE ?= v1.1.3

Expand Down
12 changes: 6 additions & 6 deletions cmd/talosctl/cmd/talos/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,11 +549,11 @@ var imageK8sBundleCmd = &cobra.Command{
},
ClusterConfig: &v1alpha1.ClusterConfig{
EtcdConfig: &v1alpha1.EtcdConfig{},
APIServerConfig: &v1alpha1.APIServerConfig{},
APIServerConfig: &v1alpha1.APIServerConfig{}, //nolint:staticcheck // legacy configuration
ControllerManagerConfig: &v1alpha1.ControllerManagerConfig{}, //nolint:staticcheck // legacy config
SchedulerConfig: &v1alpha1.SchedulerConfig{}, //nolint:staticcheck // legacy config
CoreDNSConfig: &v1alpha1.CoreDNS{},
ProxyConfig: &v1alpha1.ProxyConfig{}, //nolint:staticcheck // legacy configuration
CoreDNSConfig: &v1alpha1.CoreDNS{}, //nolint:staticcheck // legacy config
ProxyConfig: &v1alpha1.ProxyConfig{}, //nolint:staticcheck // legacy configuration
},
},
),
Expand Down Expand Up @@ -731,11 +731,11 @@ var imageIntegrationCmd = &cobra.Command{
},
ClusterConfig: &v1alpha1.ClusterConfig{
EtcdConfig: &v1alpha1.EtcdConfig{},
APIServerConfig: &v1alpha1.APIServerConfig{},
APIServerConfig: &v1alpha1.APIServerConfig{}, //nolint:staticcheck // legacy configuration
ControllerManagerConfig: &v1alpha1.ControllerManagerConfig{}, //nolint:staticcheck
SchedulerConfig: &v1alpha1.SchedulerConfig{}, //nolint:staticcheck
CoreDNSConfig: &v1alpha1.CoreDNS{},
ProxyConfig: &v1alpha1.ProxyConfig{}, //nolint:staticcheck
CoreDNSConfig: &v1alpha1.CoreDNS{}, //nolint:staticcheck // legacy configuration
ProxyConfig: &v1alpha1.ProxyConfig{}, //nolint:staticcheck
},
}))

Expand Down
2 changes: 1 addition & 1 deletion hack/release.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Kubernetes: 1.37.0
containerd: 2.3.5
CoreDNS: 1.14.7

Talos is built with Go 1.26.8.
Talos is built with Go 1.27.1.
"""

[notes.kubespan_peer_endpoint_filters]
Expand Down
8 changes: 4 additions & 4 deletions internal/app/apid/pkg/backend/apid.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ func (a *APID) GetConnection(ctx context.Context, _ string) (context.Context, *g
func (a *APID) AppendInfo(streaming bool, resp []byte) ([]byte, error) {
payload, err := proto.Marshal(&common.Empty{
Metadata: &common.Metadata{ //nolint:staticcheck // legacy behavior
Hostname: a.target,
Hostname: a.target, //nolint:staticcheck // legacy behavior
},
})

Expand Down Expand Up @@ -289,9 +289,9 @@ func (a *APID) AppendInfo(streaming bool, resp []byte) ([]byte, error) {
func (a *APID) BuildError(streaming bool, err error) ([]byte, error) {
var resp proto.Message = &common.Empty{
Metadata: &common.Metadata{ //nolint:staticcheck // legacy behavior
Hostname: a.target,
Error: err.Error(),
Status: status.Convert(err).Proto(),
Hostname: a.target, //nolint:staticcheck // legacy behavior
Error: err.Error(), //nolint:staticcheck // legacy behavior
Status: status.Convert(err).Proto(), //nolint:staticcheck // legacy behavior
},
}

Expand Down
2 changes: 1 addition & 1 deletion internal/app/apid/pkg/backend/apid_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ func (suite *APIDSuite) TestAppendInfoStreamingMetadata() {
// to the message, but protobuf merges definitions
response := &common.Data{
Metadata: &common.Metadata{ //nolint:staticcheck // legacy behavior
Error: "something went wrong",
Error: "something went wrong", //nolint:staticcheck // legacy behavior
},
}

Expand Down
2 changes: 1 addition & 1 deletion internal/app/machined/internal/server/v1alpha1/v1alpha1_time_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ type mockConfigProvider struct {
func (provider *mockConfigProvider) Config() config.Config {
return container.NewV1Alpha1(&v1alpha1.Config{
MachineConfig: &v1alpha1.MachineConfig{
MachineTime: &v1alpha1.TimeConfig{
MachineTime: &v1alpha1.TimeConfig{ //nolint:staticcheck // testing deprecated field
TimeServers: []string{provider.timeServer},
},
},
Expand Down
2 changes: 1 addition & 1 deletion internal/app/machined/pkg/controllers/block/internal/volumes/volumeconfig/resources_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func machineConfig(t *testing.T, promoteSystemVolumes bool) configconfig.Config
ConfigVersion: "v1alpha1",
MachineConfig: &v1alpha1.MachineConfig{},
ClusterConfig: &v1alpha1.ClusterConfig{
ControlPlane: &v1alpha1.ControlPlaneConfig{
ControlPlane: &v1alpha1.ControlPlaneConfig{ //nolint:staticcheck // testing deprecated field
Endpoint: &v1alpha1.Endpoint{
URL: u,
},
Expand Down
2 changes: 1 addition & 1 deletion ...l/app/machined/pkg/controllers/block/internal/volumes/volumeconfig/system_volumes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func init() {
ConfigVersion: "v1alpha1",
MachineConfig: &v1alpha1.MachineConfig{},
ClusterConfig: &v1alpha1.ClusterConfig{
ControlPlane: &v1alpha1.ControlPlaneConfig{
ControlPlane: &v1alpha1.ControlPlaneConfig{ //nolint:staticcheck // testing deprecated field
Endpoint: &v1alpha1.Endpoint{URL: u},
},
},
Expand Down
6 changes: 3 additions & 3 deletions internal/app/machined/pkg/controllers/block/user_disk_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (suite *UserDiskConfigSuite) TestReconcileDefaults() {
ConfigVersion: "v1alpha1",
MachineConfig: &v1alpha1.MachineConfig{},
ClusterConfig: &v1alpha1.ClusterConfig{
ControlPlane: &v1alpha1.ControlPlaneConfig{
ControlPlane: &v1alpha1.ControlPlaneConfig{ //nolint:staticcheck // testing deprecated field
Endpoint: &v1alpha1.Endpoint{
URL: u,
},
Expand Down Expand Up @@ -90,7 +90,7 @@ func (suite *UserDiskConfigSuite) TestReconcileUserDisk() {
&v1alpha1.Config{
ConfigVersion: "v1alpha1",
MachineConfig: &v1alpha1.MachineConfig{
MachineDisks: []*v1alpha1.MachineDisk{
MachineDisks: []*v1alpha1.MachineDisk{ //nolint:staticcheck // testing deprecated field
{
DeviceName: disk1,
DiskPartitions: []*v1alpha1.DiskPartition{
Expand All @@ -116,7 +116,7 @@ func (suite *UserDiskConfigSuite) TestReconcileUserDisk() {
},
},
ClusterConfig: &v1alpha1.ClusterConfig{
ControlPlane: &v1alpha1.ControlPlaneConfig{
ControlPlane: &v1alpha1.ControlPlaneConfig{ //nolint:staticcheck // testing deprecated field
Endpoint: &v1alpha1.Endpoint{
URL: u,
},
Expand Down
12 changes: 6 additions & 6 deletions internal/app/machined/pkg/controllers/block/volume_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func (suite *VolumeConfigSuite) TestReconcileDefaults() {
ConfigVersion: "v1alpha1",
MachineConfig: &v1alpha1.MachineConfig{},
ClusterConfig: &v1alpha1.ClusterConfig{
ControlPlane: &v1alpha1.ControlPlaneConfig{
ControlPlane: &v1alpha1.ControlPlaneConfig{ //nolint:staticcheck // testing deprecated field
Endpoint: &v1alpha1.Endpoint{
URL: u,
},
Expand Down Expand Up @@ -247,12 +247,12 @@ func (suite *VolumeConfigSuite) TestReconcileEncryptedSTATE() {
&v1alpha1.Config{
ConfigVersion: "v1alpha1",
MachineConfig: &v1alpha1.MachineConfig{
MachineSystemDiskEncryption: &v1alpha1.SystemDiskEncryptionConfig{
MachineSystemDiskEncryption: &v1alpha1.SystemDiskEncryptionConfig{ //nolint:staticcheck // testing deprecated field
StatePartition: stateEncryption,
},
},
ClusterConfig: &v1alpha1.ClusterConfig{
ControlPlane: &v1alpha1.ControlPlaneConfig{
ControlPlane: &v1alpha1.ControlPlaneConfig{ //nolint:staticcheck // testing deprecated field
Endpoint: &v1alpha1.Endpoint{
URL: u,
},
Expand Down Expand Up @@ -289,7 +289,7 @@ func (suite *VolumeConfigSuite) TestReconcileExtraEPHEMERALConfig() {
ConfigVersion: "v1alpha1",
MachineConfig: &v1alpha1.MachineConfig{},
ClusterConfig: &v1alpha1.ClusterConfig{
ControlPlane: &v1alpha1.ControlPlaneConfig{
ControlPlane: &v1alpha1.ControlPlaneConfig{ //nolint:staticcheck // testing deprecated field
Endpoint: &v1alpha1.Endpoint{
URL: u,
},
Expand Down Expand Up @@ -347,7 +347,7 @@ func (suite *VolumeConfigSuite) TestReconcilePromoteETCD() {
ConfigVersion: "v1alpha1",
MachineConfig: &v1alpha1.MachineConfig{},
ClusterConfig: &v1alpha1.ClusterConfig{
ControlPlane: &v1alpha1.ControlPlaneConfig{
ControlPlane: &v1alpha1.ControlPlaneConfig{ //nolint:staticcheck // testing deprecated field
Endpoint: &v1alpha1.Endpoint{
URL: u,
},
Expand Down Expand Up @@ -414,7 +414,7 @@ func (suite *VolumeConfigSuite) clusterEndpointConfig() *v1alpha1.Config {
ConfigVersion: "v1alpha1",
MachineConfig: &v1alpha1.MachineConfig{},
ClusterConfig: &v1alpha1.ClusterConfig{
ControlPlane: &v1alpha1.ControlPlaneConfig{
ControlPlane: &v1alpha1.ControlPlaneConfig{ //nolint:staticcheck // testing deprecated field
Endpoint: &v1alpha1.Endpoint{
URL: u,
},
Expand Down
36 changes: 18 additions & 18 deletions internal/app/machined/pkg/controllers/cluster/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ func (suite *ConfigSuite) TestReconcileConfig() {
cfg := config.NewMachineConfig(container.NewV1Alpha1(&v1alpha1.Config{
ConfigVersion: "v1alpha1",
ClusterConfig: &v1alpha1.ClusterConfig{
ClusterID: "cluster1",
ClusterSecret: "kCQsKr4B28VUl7qw1sVkTDNF9fFH++ViIuKsss+C6kc=",
ClusterID: "cluster1", //nolint:staticcheck // testing deprecated field
ClusterSecret: "kCQsKr4B28VUl7qw1sVkTDNF9fFH++ViIuKsss+C6kc=", //nolint:staticcheck // testing deprecated field
ClusterDiscoveryConfig: &v1alpha1.ClusterDiscoveryConfig{ //nolint:staticcheck // legacy configuration
DiscoveryEnabled: new(true),
DiscoveryEnabled: new(true), //nolint:staticcheck // legacy configuration
},
},
}))
Expand Down Expand Up @@ -64,16 +64,16 @@ func (suite *ConfigSuite) TestReconcileConfigCustom() {
cfg := config.NewMachineConfig(container.NewV1Alpha1(&v1alpha1.Config{
ConfigVersion: "v1alpha1",
ClusterConfig: &v1alpha1.ClusterConfig{
ClusterID: "cluster1",
ClusterSecret: "kCQsKr4B28VUl7qw1sVkTDNF9fFH++ViIuKsss+C6kc=",
ClusterID: "cluster1", //nolint:staticcheck // testing deprecated field
ClusterSecret: "kCQsKr4B28VUl7qw1sVkTDNF9fFH++ViIuKsss+C6kc=", //nolint:staticcheck // testing deprecated field
ClusterDiscoveryConfig: &v1alpha1.ClusterDiscoveryConfig{ //nolint:staticcheck // legacy configuration
DiscoveryEnabled: new(true),
DiscoveryEnabled: new(true), //nolint:staticcheck // legacy configuration
DiscoveryRegistries: v1alpha1.DiscoveryRegistriesConfig{ //nolint:staticcheck // legacy configuration
RegistryKubernetes: v1alpha1.RegistryKubernetesConfig{ //nolint:staticcheck // legacy configuration
RegistryDisabled: new(true),
},
RegistryService: v1alpha1.RegistryServiceConfig{ //nolint:staticcheck // legacy configuration
RegistryEndpoint: "https://[2001:470:6d:30e:565d:e162:e2a0:cf5a]:3456/",
RegistryEndpoint: "https://[2001:470:6d:30e:565d:e162:e2a0:cf5a]:3456/", //nolint:staticcheck // legacy configuration
},
},
},
Expand All @@ -97,16 +97,16 @@ func (suite *ConfigSuite) TestReconcileConfigCustomInsecure() {
cfg := config.NewMachineConfig(container.NewV1Alpha1(&v1alpha1.Config{
ConfigVersion: "v1alpha1",
ClusterConfig: &v1alpha1.ClusterConfig{
ClusterID: "cluster1",
ClusterSecret: "kCQsKr4B28VUl7qw1sVkTDNF9fFH++ViIuKsss+C6kc=",
ClusterID: "cluster1", //nolint:staticcheck // testing deprecated field
ClusterSecret: "kCQsKr4B28VUl7qw1sVkTDNF9fFH++ViIuKsss+C6kc=", //nolint:staticcheck // testing deprecated field
ClusterDiscoveryConfig: &v1alpha1.ClusterDiscoveryConfig{ //nolint:staticcheck // legacy configuration
DiscoveryEnabled: new(true),
DiscoveryEnabled: new(true), //nolint:staticcheck // legacy configuration
DiscoveryRegistries: v1alpha1.DiscoveryRegistriesConfig{ //nolint:staticcheck // legacy configuration
RegistryKubernetes: v1alpha1.RegistryKubernetesConfig{ //nolint:staticcheck // legacy configuration
RegistryDisabled: new(true),
},
RegistryService: v1alpha1.RegistryServiceConfig{ //nolint:staticcheck // legacy configuration
RegistryEndpoint: "http://localhost:3000",
RegistryEndpoint: "http://localhost:3000", //nolint:staticcheck // legacy configuration
},
},
},
Expand Down Expand Up @@ -177,10 +177,10 @@ func (suite *ConfigSuite) TestLegacyFieldsWithDiscoveryService() {
cfg := config.NewMachineConfig(container.NewV1Alpha1(&v1alpha1.Config{
ConfigVersion: "v1alpha1",
ClusterConfig: &v1alpha1.ClusterConfig{
ClusterID: "test-cluster",
ClusterSecret: "kCQsKr4B28VUl7qw1sVkTDNF9fFH++ViIuKsss+C6kc=",
ClusterID: "test-cluster", //nolint:staticcheck // testing deprecated field
ClusterSecret: "kCQsKr4B28VUl7qw1sVkTDNF9fFH++ViIuKsss+C6kc=", //nolint:staticcheck // testing deprecated field
ClusterDiscoveryConfig: &v1alpha1.ClusterDiscoveryConfig{ //nolint:staticcheck // legacy config
DiscoveryEnabled: new(true),
DiscoveryEnabled: new(true), //nolint:staticcheck // legacy config
},
},
}))
Expand Down Expand Up @@ -226,13 +226,13 @@ func (suite *ConfigSuite) TestLegacyFieldsInsecureEndpoint() {
cfg := config.NewMachineConfig(container.NewV1Alpha1(&v1alpha1.Config{
ConfigVersion: "v1alpha1",
ClusterConfig: &v1alpha1.ClusterConfig{
ClusterID: "test-cluster",
ClusterSecret: "kCQsKr4B28VUl7qw1sVkTDNF9fFH++ViIuKsss+C6kc=",
ClusterID: "test-cluster", //nolint:staticcheck // testing deprecated field
ClusterSecret: "kCQsKr4B28VUl7qw1sVkTDNF9fFH++ViIuKsss+C6kc=", //nolint:staticcheck // testing deprecated field
ClusterDiscoveryConfig: &v1alpha1.ClusterDiscoveryConfig{ //nolint:staticcheck // legacy config
DiscoveryEnabled: new(true),
DiscoveryEnabled: new(true), //nolint:staticcheck // legacy config
DiscoveryRegistries: v1alpha1.DiscoveryRegistriesConfig{ //nolint:staticcheck // legacy config
RegistryService: v1alpha1.RegistryServiceConfig{ //nolint:staticcheck // legacy config
RegistryEndpoint: "http://insecure.example.com:3000",
RegistryEndpoint: "http://insecure.example.com:3000", //nolint:staticcheck // legacy config
},
},
},
Expand Down
6 changes: 3 additions & 3 deletions internal/app/machined/pkg/controllers/cluster/info_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ func (suite *InfoSuite) TestReconcile() {
cfg := config.NewMachineConfig(container.NewV1Alpha1(&v1alpha1.Config{
ConfigVersion: "v1alpha1",
ClusterConfig: &v1alpha1.ClusterConfig{
ClusterID: "cluster1",
ClusterName: "foo",
ControlPlane: &v1alpha1.ControlPlaneConfig{
ClusterID: "cluster1", //nolint:staticcheck // testing deprecated field
ClusterName: "foo", //nolint:staticcheck // testing deprecated field
ControlPlane: &v1alpha1.ControlPlaneConfig{ //nolint:staticcheck // testing deprecated field
Endpoint: &v1alpha1.Endpoint{
URL: must(url.Parse("https://example.com/")),
},
Expand Down
6 changes: 3 additions & 3 deletions internal/app/machined/pkg/controllers/cri/image_cache_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ func (suite *ImageCacheConfigSuite) TestReconcileJustDiskVolume() {
cfg := config.NewMachineConfig(container.NewV1Alpha1(&v1alpha1.Config{
MachineConfig: &v1alpha1.MachineConfig{
MachineFeatures: &v1alpha1.FeaturesConfig{
ImageCacheSupport: &v1alpha1.ImageCacheConfig{
ImageCacheSupport: &v1alpha1.ImageCacheConfig{ //nolint:staticcheck // testing deprecated field
CacheLocalEnabled: new(true),
},
},
Expand Down Expand Up @@ -339,7 +339,7 @@ func (suite *ImageCacheConfigSuite) TestReconcileWithImageCacheVolume() {
v1alpha1Cfg := &v1alpha1.Config{
MachineConfig: &v1alpha1.MachineConfig{
MachineFeatures: &v1alpha1.FeaturesConfig{
ImageCacheSupport: &v1alpha1.ImageCacheConfig{
ImageCacheSupport: &v1alpha1.ImageCacheConfig{ //nolint:staticcheck // testing deprecated field
CacheLocalEnabled: new(true),
},
},
Expand Down Expand Up @@ -403,7 +403,7 @@ func (suite *ImageCacheConfigSuite) TestReconcileWithEncryptionConfig() {
v1alpha1Cfg := &v1alpha1.Config{
MachineConfig: &v1alpha1.MachineConfig{
MachineFeatures: &v1alpha1.FeaturesConfig{
ImageCacheSupport: &v1alpha1.ImageCacheConfig{
ImageCacheSupport: &v1alpha1.ImageCacheConfig{ //nolint:staticcheck // testing deprecated field
CacheLocalEnabled: new(true),
},
},
Expand Down
6 changes: 3 additions & 3 deletions internal/app/machined/pkg/controllers/cri/registries_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func (suite *ConfigSuite) TestRegistry() {
ConfigVersion: "v1alpha1",
MachineConfig: &v1alpha1.MachineConfig{
MachineType: "controlplane",
MachineRegistries: v1alpha1.RegistriesConfig{
MachineRegistries: v1alpha1.RegistriesConfig{ //nolint:staticcheck // testing deprecated field
RegistryMirrors: map[string]*v1alpha1.RegistryMirrorConfig{
"docker.io": {
MirrorEndpoints: []string{"https://mirror.io"},
Expand Down Expand Up @@ -105,7 +105,7 @@ func (suite *ConfigSuite) TestRegistryAuth() {
ConfigVersion: "v1alpha1",
MachineConfig: &v1alpha1.MachineConfig{
MachineType: "controlplane",
MachineRegistries: v1alpha1.RegistriesConfig{
MachineRegistries: v1alpha1.RegistriesConfig{ //nolint:staticcheck // testing deprecated field
RegistryMirrors: map[string]*v1alpha1.RegistryMirrorConfig{
"docker.io": {MirrorEndpoints: []string{"https://mirror.io"}},
},
Expand Down Expand Up @@ -193,7 +193,7 @@ func (suite *ConfigSuite) TestRegistryTLS() {
ConfigVersion: "v1alpha1",
MachineConfig: &v1alpha1.MachineConfig{
MachineType: "controlplane",
MachineRegistries: v1alpha1.RegistriesConfig{
MachineRegistries: v1alpha1.RegistriesConfig{ //nolint:staticcheck // testing deprecated field
RegistryMirrors: map[string]*v1alpha1.RegistryMirrorConfig{
"docker.io": {MirrorEndpoints: []string{"https://mirror.io"}},
},
Expand Down
4 changes: 2 additions & 2 deletions internal/app/machined/pkg/controllers/etcd/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (suite *ConfigSuite) TestReconcile() {
EtcdExtraArgs: meta.Args{
"arg": meta.NewArgValue("value", nil),
},
EtcdSubnet: "10.0.0.0/8",
EtcdSubnet: "10.0.0.0/8", //nolint:staticcheck // testing deprecated field
},
expectedConfig: etcd.ConfigSpec{
Image: "foo/bar:v1.0.0",
Expand Down Expand Up @@ -214,7 +214,7 @@ func (suite *ConfigSuite) TestReconcile() {
MachineConfig: &v1alpha1.MachineConfig{
MachineType: "controlplane",
MachineNetwork: &v1alpha1.NetworkConfig{ //nolint:staticcheck // legacy config
NetworkInterfaces: tt.networkConfig,
NetworkInterfaces: tt.networkConfig, //nolint:staticcheck // legacy config
},
},
}
Expand Down
Loading
Loading