Skip to content

Commit aa24da9

Browse files
committed
fix: bump kubelet credendial provider config to v1
KubeletConfig itself is only `v1beta1`, while `CredentialProviderConfig` was `v1` for quite some time, including minimum Kubernetes 1.30 supported with Talos 1.12. Fixes #12112 Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent 335f917 commit aa24da9

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

internal/app/machined/pkg/controllers/k8s/kubelet_service.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"k8s.io/apimachinery/pkg/runtime/serializer/json"
2929
"k8s.io/client-go/tools/clientcmd"
3030
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
31+
kubeletv1config "k8s.io/kubelet/config/v1"
3132
kubeletconfig "k8s.io/kubelet/config/v1beta1"
3233

3334
runtimetalos "github.com/siderolabs/talos/internal/app/machined/pkg/runtime"
@@ -368,7 +369,7 @@ func (ctrl *KubeletServiceController) writeKubeletCredentialProviderConfig(cfgSp
368369
return os.RemoveAll(constants.KubeletCredentialProviderConfig)
369370
}
370371

371-
var kubeletCredentialProviderConfig kubeletconfig.CredentialProviderConfig
372+
var kubeletCredentialProviderConfig kubeletv1config.CredentialProviderConfig
372373

373374
if err := runtime.DefaultUnstructuredConverter.FromUnstructured(cfgSpec.CredentialProviderConfig, &kubeletCredentialProviderConfig); err != nil {
374375
return fmt.Errorf("error converting kubelet credentialprovider configuration from unstructured: %w", err)

0 commit comments

Comments
 (0)