From 7e253dbf028b623e51972666a041730907ba5c87 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Tue, 9 Sep 2025 18:52:05 +0000 Subject: [PATCH 1/7] Fix netpol fatal error when changing node IP Wait for updated ready condition before starting netpol controller, to ensure that node IPs have been updated following a restart. The current checks only ensure that the taint is removed, which works for the initial join - but does not handle changing node IPs on restarts. Signed-off-by: Brad Davidson --- pkg/agent/netpol/netpol.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkg/agent/netpol/netpol.go b/pkg/agent/netpol/netpol.go index 64763b6063a..52a41dd911d 100644 --- a/pkg/agent/netpol/netpol.go +++ b/pkg/agent/netpol/netpol.go @@ -29,6 +29,7 @@ import ( "github.com/k3s-io/k3s/pkg/util" pkgerrors "github.com/pkg/errors" "github.com/sirupsen/logrus" + v1 "k8s.io/api/core/v1" v1core "k8s.io/api/core/v1" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" @@ -68,15 +69,26 @@ func Run(ctx context.Context, nodeConfig *config.Node) error { } // kube-router netpol requires addresses to be available in the node object. - // Wait until the uninitialized taint has been removed, at which point the addresses should be set. - // TODO: Replace with non-deprecated PollUntilContextTimeout when our and Kubernetes code migrate to it - if err := wait.PollUntilContextCancel(ctx, 2*time.Second, true, func(ctx context.Context) (bool, error) { + // Wait until the ready condition is updated and the uninitialized taint has + // been removed, at which point the addresses should be synced. + startTime := time.Now().Truncate(time.Second) + if err := wait.PollUntilContextTimeout(ctx, 2*time.Second, util.DefaultAPIServerReadyTimeout, true, func(ctx context.Context) (bool, error) { + var readyTime metav1.Time // Get the node object node, err := client.CoreV1().Nodes().Get(ctx, nodeConfig.AgentConfig.NodeName, metav1.GetOptions{}) if err != nil { logrus.Infof("Network policy controller waiting to get Node %s: %v", nodeConfig.AgentConfig.NodeName, err) return false, nil } + for _, cond := range node.Status.Conditions { + if cond.Type == v1.NodeReady && cond.Status == v1.ConditionTrue { + readyTime = cond.LastHeartbeatTime + } + } + if readyTime.Time.Before(startTime) { + logrus.Debugf("Waiting for Ready condition to be updated for network policy controller") + return false, nil + } // Check for the taint that should be removed by cloud-provider when the node has been initialized. for _, taint := range node.Spec.Taints { if taint.Key == cloudproviderapi.TaintExternalCloudProvider { From 67c23a20e38dbe6fcce8e3f6f5001498800cc675 Mon Sep 17 00:00:00 2001 From: Rafael <32229014+rafaelbreno@users.noreply.github.com> Date: Wed, 10 Sep 2025 22:35:56 -0300 Subject: [PATCH 2/7] Update to v1.34.1 (#12897) Signed-off-by: Rafael Breno --- go.mod | 96 ++++++++++++++++++++++++------------------------- go.sum | 112 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 104 insertions(+), 104 deletions(-) diff --git a/go.mod b/go.mod index 56fd14d9c50..93c218051e9 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/k3s-io/k3s -go 1.24.5 +go 1.24.6 replace ( github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.12.9 @@ -36,41 +36,41 @@ replace ( golang.org/x/sys => golang.org/x/sys v0.31.0 google.golang.org/genproto => google.golang.org/genproto v0.0.0-20230525234035-dd9d682886f9 google.golang.org/grpc => google.golang.org/grpc v1.72.1 - k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.34.0-k3s1 - k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.34.0-k3s1 - k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.34.0-k3s1 - k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.34.0-k3s1 - k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.34.0-k3s1 - k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.34.0-k3s1 - k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.34.0-k3s1 - k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.34.0-k3s1 - k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.34.0-k3s1 - k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.34.0-k3s1 - k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.34.0-k3s1 - k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.34.0-k3s1 - k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.34.0-k3s1 - k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.34.0-k3s1 - k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.34.0-k3s1 - k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.34.0-k3s1 - k8s.io/externaljwt => github.com/k3s-io/kubernetes/staging/src/k8s.io/externaljwt v1.34.0-k3s1 + k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.34.1-k3s1 + k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.34.1-k3s1 + k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.34.1-k3s1 + k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.34.1-k3s1 + k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.34.1-k3s1 + k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.34.1-k3s1 + k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.34.1-k3s1 + k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.34.1-k3s1 + k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.34.1-k3s1 + k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.34.1-k3s1 + k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.34.1-k3s1 + k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.34.1-k3s1 + k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.34.1-k3s1 + k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.34.1-k3s1 + k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.34.1-k3s1 + k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.34.1-k3s1 + k8s.io/externaljwt => github.com/k3s-io/kubernetes/staging/src/k8s.io/externaljwt v1.34.1-k3s1 k8s.io/klog => github.com/k3s-io/klog v1.0.0-k3s2 // k3s-release-1.x k8s.io/klog/v2 => github.com/k3s-io/klog/v2 v2.120.1-k3s1 // k3s-main - k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.34.0-k3s1 - k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.34.0-k3s1 - k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.34.0-k3s1 + k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.34.1-k3s1 + k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.34.1-k3s1 + k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.34.1-k3s1 k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b - k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.34.0-k3s1 - k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.34.0-k3s1 - k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.34.0-k3s1 - k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.34.0-k3s1 - k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.34.0-k3s1 - k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.34.0-k3s1 - k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.34.0-k3s1 - k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.34.0-k3s1 - k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.34.0-k3s1 - k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.34.0-k3s1 - k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.34.0-k3s1 - k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.34.0-k3s1 + k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.34.1-k3s1 + k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.34.1-k3s1 + k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.34.1-k3s1 + k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.34.1-k3s1 + k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.34.1-k3s1 + k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.34.1-k3s1 + k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.34.1-k3s1 + k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.34.1-k3s1 + k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.34.1-k3s1 + k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.34.1-k3s1 + k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.34.1-k3s1 + k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.34.1-k3s1 sigs.k8s.io/cri-tools => github.com/k3s-io/cri-tools v1.34.0-k3s2 sourcegraph.com/sourcegraph/go-diff => github.com/sourcegraph/go-diff v0.6.0 ) @@ -153,23 +153,23 @@ require ( golang.org/x/sys v0.35.0 google.golang.org/grpc v1.75.0 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.34.0 - k8s.io/apiextensions-apiserver v0.34.0 - k8s.io/apimachinery v0.34.0 - k8s.io/apiserver v0.34.0 - k8s.io/cli-runtime v0.34.0 + k8s.io/api v0.34.1 + k8s.io/apiextensions-apiserver v0.34.1 + k8s.io/apimachinery v0.34.1 + k8s.io/apiserver v0.34.1 + k8s.io/cli-runtime v0.34.1 k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible - k8s.io/cloud-provider v0.34.0 + k8s.io/cloud-provider v0.34.1 k8s.io/cluster-bootstrap v0.0.0 - k8s.io/component-base v0.34.0 - k8s.io/component-helpers v0.34.0 - k8s.io/cri-api v0.34.0 - k8s.io/cri-client v0.34.0 + k8s.io/component-base v0.34.1 + k8s.io/component-helpers v0.34.1 + k8s.io/cri-api v0.34.1 + k8s.io/cri-client v0.34.1 k8s.io/klog/v2 v2.130.1 k8s.io/kube-proxy v0.0.0 - k8s.io/kubectl v0.34.0 - k8s.io/kubelet v0.34.0 - k8s.io/kubernetes v1.34.0 + k8s.io/kubectl v0.34.1 + k8s.io/kubelet v0.34.1 + k8s.io/kubernetes v1.34.1 k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d sigs.k8s.io/cri-tools v0.0.0-00010101000000-000000000000 sigs.k8s.io/yaml v1.6.0 @@ -494,13 +494,13 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/controller-manager v0.34.0 // indirect + k8s.io/controller-manager v0.34.1 // indirect k8s.io/csi-translation-lib v0.0.0 // indirect k8s.io/dynamic-resource-allocation v0.0.0 // indirect k8s.io/endpointslice v0.0.0 // indirect k8s.io/externaljwt v1.32.0 // indirect k8s.io/kms v0.0.0 // indirect - k8s.io/kube-aggregator v0.34.0 // indirect + k8s.io/kube-aggregator v0.34.1 // indirect k8s.io/kube-controller-manager v0.0.0 // indirect k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3 // indirect k8s.io/kube-scheduler v0.0.0 // indirect diff --git a/go.sum b/go.sum index b05b21af6e1..b335fc11ab8 100644 --- a/go.sum +++ b/go.sum @@ -831,60 +831,60 @@ github.com/k3s-io/klog/v2 v2.120.1-k3s1 h1:7twAHPFpZA21KdMnMNnj68STQMPldAxF2Zsao github.com/k3s-io/klog/v2 v2.120.1-k3s1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= github.com/k3s-io/kube-router/v2 v2.5.0 h1:pG46bYnvi17z/Zp7W1MTeTax8HaFEp7zCzUu59UwKpI= github.com/k3s-io/kube-router/v2 v2.5.0/go.mod h1:0CkKQ7OUc0HSY0Fv2ED70ES07sQH+6Iugj4so13TMjQ= -github.com/k3s-io/kubernetes v1.34.0-k3s1 h1:qusj6z2rD4eDGJkllV1bwS2mEi7r7mTvzImYeZeLAa4= -github.com/k3s-io/kubernetes v1.34.0-k3s1/go.mod h1:iu+FhII+Oc/1gGWLJcer6wpyih441aNFHl7Pvm8yPto= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.34.0-k3s1 h1:gpBrCbeoM0URRaj09OKRcGWt6CRDKEVGNP7pDf6TdDM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.34.0-k3s1/go.mod h1:3Y5V97lz2MrKYzHlUaXejkj+coCmqde9E9WwVFuWRXE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.34.0-k3s1 h1:Sv9xbp37dfCEXHbM2j05AGv5HPkZ5/nhQITx+ZxjhVI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.34.0-k3s1/go.mod h1:NL2CyapDmJ+5XVVY8qr6niVA3UHVF17kPl0zh6ohkVM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.34.0-k3s1 h1:JTU5gmBgR7+TCMwnQHW7uii5ye8zi5FCktOfOrajESo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.34.0-k3s1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.34.0-k3s1 h1:3mFwJvx6kGSaGSfskUbcLsT9fek3U8GZS3mvc8PmlTA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.34.0-k3s1/go.mod h1:msyjTyI8TyfhYybEkao5LA8bUrVqz1xhic5zxsfejoM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.34.0-k3s1 h1:91xeRgNHaUSrYaNxpVTZOUxxMVDOfOKLpX93zw+hId0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.34.0-k3s1/go.mod h1:YG2E7QGSDJu46hJmox8R9hFxYzpzn23xVNEfzXY4I70= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.34.0-k3s1 h1:+t+IZ3eNrdU77qb2v5+usHX0+g+R8hdG1JFyEvBYS2Q= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.34.0-k3s1/go.mod h1:EA6EHLX97x5H59hA02pKPLlZBMQEYnYMsIMglrufpFo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.34.0-k3s1 h1:pzXTWE6MxSejAyRq8M4V5f/SAprvRcqHdYNthRIXRmk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.34.0-k3s1/go.mod h1:ZZzwSqYu465kx/03+L6Axo9WQxQxiJJuR7kx8i+km6o= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.34.0-k3s1 h1:AyqDcah1DLpfhfNtHNlvOl99aTWVCvEg1SfodmPqpNo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.34.0-k3s1/go.mod h1:L+CgxxDLy//AhiEyqsCdiTs4TphPxXI1IQArc9jwMO8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.34.0-k3s1 h1:3lyRYXNlQqRcqm3e2ngkmeMDvsSW35qjQC5MJ7esXgE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.34.0-k3s1/go.mod h1:ji6LERznCQ/l4DKb74Vd/5W8Q89b7SvBen7B4AMY0Oo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.34.0-k3s1 h1:FjH04sM1ep+9TboZEGY3rPq/ZWgQnj7c756roXJYUaQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.34.0-k3s1/go.mod h1:l7hECO13A52pGPFD+SlZJ+EGCuRoVOm0wtdDCMQQkf4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.34.0-k3s1 h1:qbOumK8LNCX1nVZrU8YCP72JA+VFMFQMXOSLrcNdUt8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.34.0-k3s1/go.mod h1:r87/fGxIfARYiYYbMjR8AIOqf25GMlSSqL/F05+OIzI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.34.0-k3s1 h1:VINjFmsOTMhHOp6EVFXact+gwiIdk0Jy/tOITc+FnJw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.34.0-k3s1/go.mod h1:4qVUjidMg7/Z9YGZpqIDygbkPWkg3mkS1PvOx/kpHTE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.34.0-k3s1 h1:uT9IyOcclzPScprozbB3oQsavzEha2qI/l1KsBrTwsg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.34.0-k3s1/go.mod h1:yIEfKOC6kDBKmPljSFyWf3OJl6qndPa1Z8CZnvM1zAk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.34.0-k3s1 h1:TtKylr3wMzkr48XwEI9KfnneeSY6n3l0/fEP5EddwXU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.34.0-k3s1/go.mod h1:ScEkH9zs6QurmNvJvTPTbs1BbrUH6PBMrvT1qKee6U4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.34.0-k3s1 h1:sfAyFuno++952Ex5UJTl4glRMRB/kZg8ON9X7js7tQ8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.34.0-k3s1/go.mod h1:RilV1eQyuARqygtpZNyB+JG59w6kCKMzLeYYQfMqZqM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/externaljwt v1.34.0-k3s1 h1:RBUi7/v9+h5iEgHk/kJiWNTDUvj0Omz/AWTIdKNFZbk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/externaljwt v1.34.0-k3s1/go.mod h1:LIqFAVwSkcWVlP3c78wxe2VGmgDySxfqX/wwXzVrV/Q= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.34.0-k3s1 h1:W9n9p2BWQg1OGCgS9exM6vreHIfhfZyZJURNpp+okFE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.34.0-k3s1/go.mod h1:s1CFkLG7w9eaTYvctOxosx88fl4spqmixnNpys0JAtM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.34.0-k3s1 h1:Hm4O4Lp86LxbI67P4tKr2Fe2cHdeBQT47pPHmqtQEWo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.34.0-k3s1/go.mod h1:GOPdnpyxb2xGzTzBC7NOr0rpnWcGH8/pY/tPHX0Ou44= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.34.0-k3s1 h1:0sBTO9vq+xw2knX9ghYHRE9qAFpZO1ZlMQKHdfwF+R0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.34.0-k3s1/go.mod h1:IDd35yynkN5S0lWnaz/xF+/fZSf668aSIVe+GQpR5tI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.34.0-k3s1 h1:sKhKhUaZJjNOaVxsA4WI2czLqudWshHeVuq7epOeK34= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.34.0-k3s1/go.mod h1:8ZKtfgS5ZFK1RpvhKB8KfFjzw0c+OSZPhtGVVTu5caM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.34.0-k3s1 h1:KcGyEItp4tRx8PGw7DnVs7bZpDArA+h120C3Lz7GdZU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.34.0-k3s1/go.mod h1:0+80VogvOgFlcOn337Vr/dBpkFnXxAL16WK1jgTK1dI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.34.0-k3s1 h1:GuSvmKoKyP91vrYzzG0a6G49ofK598U9SQPx74FjpnQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.34.0-k3s1/go.mod h1:x4R1q+B99iuKZ6SYpojh/CuLGMskvhSR9Cf5SA+Z+M0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.34.0-k3s1 h1:2fE7RPLhKcxy0CDDsRz5pakccRQp8FBBYKLv8QnuYEY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.34.0-k3s1/go.mod h1:5xnzJEi0iAetJLsqhsO5yMAnW3yPZ+zs32oh4VAKgc0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.34.0-k3s1 h1:xyAzLKuUbX726jlXvySH92eLt664HM8XlwwdZlW/HvU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.34.0-k3s1/go.mod h1:/qx2lVumZNiT48fnms3W6KqtqVVb70ybiW5miBZBBT8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.34.0-k3s1 h1:W5qf3oEvmGnQ7YcZ4k7XRFkMZq0PLAMbtBKvTL44ZXU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.34.0-k3s1/go.mod h1:MIjjYlqJ0ziYQg0MO09kc9S96GIcMkhF/ay9MncF0GA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.34.0-k3s1 h1:uReDC/ieRQOPMNB6rEp4Ek6D1mfdbTJt6Lts7ymAMDw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.34.0-k3s1/go.mod h1:3bwMqCfzs5exVFZydu9eBJkw5UbmNzDvxCYT7JWYVAo= +github.com/k3s-io/kubernetes v1.34.1-k3s1 h1:9/NMITLXw8yZC/lPaftDetx3PXxwPEgMVdI5kQrmTew= +github.com/k3s-io/kubernetes v1.34.1-k3s1/go.mod h1:iu+FhII+Oc/1gGWLJcer6wpyih441aNFHl7Pvm8yPto= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.34.1-k3s1 h1:YTJRyNTpBHRMZRf3+xMBlb+SPNA1cqIkWTxhiG1FGv4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.34.1-k3s1/go.mod h1:3Y5V97lz2MrKYzHlUaXejkj+coCmqde9E9WwVFuWRXE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.34.1-k3s1 h1:3nSmnFuYQdi93sHP/G2JycWut51JjNnpF8iZ5rzpk5o= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.34.1-k3s1/go.mod h1:NL2CyapDmJ+5XVVY8qr6niVA3UHVF17kPl0zh6ohkVM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.34.1-k3s1 h1:gbOHARcGXTIfDyNxGhIXkyWBsGXNTjaMyrF3XKJl3hg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.34.1-k3s1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.34.1-k3s1 h1:AwT2arH3eHp4jsU41URP6yUKGKW9yWD0hVbVtyKSlGQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.34.1-k3s1/go.mod h1:msyjTyI8TyfhYybEkao5LA8bUrVqz1xhic5zxsfejoM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.34.1-k3s1 h1:IaY7tJw0MZGfV/OG1myuAfD7ne7Qr5Ix6lNSpwUrTJk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.34.1-k3s1/go.mod h1:YG2E7QGSDJu46hJmox8R9hFxYzpzn23xVNEfzXY4I70= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.34.1-k3s1 h1:plj9Nk51Avz8v0kjAZQaSAH2+jzTW7SWGoO83P8MWkg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.34.1-k3s1/go.mod h1:EA6EHLX97x5H59hA02pKPLlZBMQEYnYMsIMglrufpFo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.34.1-k3s1 h1:AknnbuC+KCNITI5OWuaQ2lYGMaDyQ4mKe2MQN1clnJ8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.34.1-k3s1/go.mod h1:ZZzwSqYu465kx/03+L6Axo9WQxQxiJJuR7kx8i+km6o= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.34.1-k3s1 h1:o0CURI/knQTKbKMOB2UbBCHYq5VCrWmBtGZtNWvXSHs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.34.1-k3s1/go.mod h1:L+CgxxDLy//AhiEyqsCdiTs4TphPxXI1IQArc9jwMO8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.34.1-k3s1 h1:5q3N96zdUQldZIBCbxzBT7dpLUS9XaXx8Kcq/03QPnk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.34.1-k3s1/go.mod h1:ji6LERznCQ/l4DKb74Vd/5W8Q89b7SvBen7B4AMY0Oo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.34.1-k3s1 h1:jijAGPnOR+NRZqQJte/2jnrfOYpxY68cgZoz3uj9X68= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.34.1-k3s1/go.mod h1:l7hECO13A52pGPFD+SlZJ+EGCuRoVOm0wtdDCMQQkf4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.34.1-k3s1 h1:1JaKjGXzKItB/v0LMWCJ8fYRpsh/+NMp3qpx2mVkF7s= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.34.1-k3s1/go.mod h1:r87/fGxIfARYiYYbMjR8AIOqf25GMlSSqL/F05+OIzI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.34.1-k3s1 h1:aP7KoqOHixfUugXhXKfh5DesL9y3f6K/eWep6veS/Hg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.34.1-k3s1/go.mod h1:4qVUjidMg7/Z9YGZpqIDygbkPWkg3mkS1PvOx/kpHTE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.34.1-k3s1 h1:p9MgwVcRCrOpFmI+zsDS7NRje6DdX4t+IjOyzyrk+JQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.34.1-k3s1/go.mod h1:yIEfKOC6kDBKmPljSFyWf3OJl6qndPa1Z8CZnvM1zAk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.34.1-k3s1 h1:UW11M+u0wWVd44L8H2i37hNz2EVQBWtIQ6OdcM2eVJs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.34.1-k3s1/go.mod h1:ScEkH9zs6QurmNvJvTPTbs1BbrUH6PBMrvT1qKee6U4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.34.1-k3s1 h1:7wnFf+MZt+uKN9HynzrbEnv2bJDicIjBM33lf+7JLvg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.34.1-k3s1/go.mod h1:RilV1eQyuARqygtpZNyB+JG59w6kCKMzLeYYQfMqZqM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/externaljwt v1.34.1-k3s1 h1:KHamLHiJ1r5vDnKSQ7Nb9MM0B4kVsdB0Tle66t5pdsI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/externaljwt v1.34.1-k3s1/go.mod h1:LIqFAVwSkcWVlP3c78wxe2VGmgDySxfqX/wwXzVrV/Q= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.34.1-k3s1 h1:YRS1i2brvu5XNenn6wpIHo/u4gtsINNtyMOx9hzUolo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.34.1-k3s1/go.mod h1:s1CFkLG7w9eaTYvctOxosx88fl4spqmixnNpys0JAtM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.34.1-k3s1 h1:RaAQ7YgpgaeqX8I493ygUX94sb1mRSbBD/JkyHParOg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.34.1-k3s1/go.mod h1:GOPdnpyxb2xGzTzBC7NOr0rpnWcGH8/pY/tPHX0Ou44= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.34.1-k3s1 h1:j+O1eu4aKlm9kMD/9l9ycSONfqoBSzfA/O+pqmDIBb0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.34.1-k3s1/go.mod h1:IDd35yynkN5S0lWnaz/xF+/fZSf668aSIVe+GQpR5tI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.34.1-k3s1 h1:lEOZYwMzsRrbz05VBXY0knZqsKw/QOyd58ZFeAj8gfQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.34.1-k3s1/go.mod h1:8ZKtfgS5ZFK1RpvhKB8KfFjzw0c+OSZPhtGVVTu5caM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.34.1-k3s1 h1:gyDgwEkvMvat04hUYhjChHkxfpNyEacE3DsHFRD9gzM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.34.1-k3s1/go.mod h1:0+80VogvOgFlcOn337Vr/dBpkFnXxAL16WK1jgTK1dI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.34.1-k3s1 h1:/Eqzngr/bqI1YAs9OUjcd+5HsuBormteyAgJSANpY6Q= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.34.1-k3s1/go.mod h1:x4R1q+B99iuKZ6SYpojh/CuLGMskvhSR9Cf5SA+Z+M0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.34.1-k3s1 h1:f2SdXOxtxFpx5fGicteBmtYbTfKA8VUcXpEgySI9Jco= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.34.1-k3s1/go.mod h1:5xnzJEi0iAetJLsqhsO5yMAnW3yPZ+zs32oh4VAKgc0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.34.1-k3s1 h1:Wkr4OO3D7+hA7VghgSq5+qpMWAcIl5BJ9Ko4fZLCffc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.34.1-k3s1/go.mod h1:/qx2lVumZNiT48fnms3W6KqtqVVb70ybiW5miBZBBT8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.34.1-k3s1 h1:N3MBEGhqCJ7Yj7NlhufUSx6iQOQYWkVd7p6KLk6bYEM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.34.1-k3s1/go.mod h1:MIjjYlqJ0ziYQg0MO09kc9S96GIcMkhF/ay9MncF0GA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.34.1-k3s1 h1:YUIBisrb55m0l0BrJZ3wK9mp/WE4WNiI3BpK5+4G58c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.34.1-k3s1/go.mod h1:3bwMqCfzs5exVFZydu9eBJkw5UbmNzDvxCYT7JWYVAo= github.com/k3s-io/spegel v0.2.0-k3s1 h1:99kcb7dx2i3XxAfPQj7WMhV9WutZ2LCMvAkIwU+DKqk= github.com/k3s-io/spegel v0.2.0-k3s1/go.mod h1:/pCa6euBfCKjtKLIjhSKvF+fRkK0+xF2ybO99zkwUhA= github.com/k3s-io/stargz-snapshotter v0.17.0-k3s1 h1:QkAk5A+As/MiFoknI6FJSpFVLQ7BuhcMvEwmWjwuq0Y= @@ -1900,8 +1900,8 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= -k8s.io/cri-client v0.34.0 h1:tLZro2oYinVKS5CaMtCASLmOacqVlwoHPSs9e7sBFWI= -k8s.io/cri-client v0.34.0/go.mod h1:KkGaUJWMvCdpSTf15Wiqtf3WKl3qjcvkBcMApPCqpxQ= +k8s.io/cri-client v0.34.1 h1:eq6FcEPDDL379w0WhPnItj2egsMZqOtU7nv1JaJmwP0= +k8s.io/cri-client v0.34.1/go.mod h1:Dq6mKWV2ugO5tMv4xqVgcQ8vD7csP//e4KkzcFi2Pio= k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOPolHyvO06MXG5TUIj2mNAA= k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts= k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d h1:wAhiDyZ4Tdtt7e46e9M5ZSAJ/MnPGPs+Ki1gHw4w1R0= From bdb92296a525ba51dfb3505c3e07aac533b8d47e Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Tue, 9 Sep 2025 19:04:52 +0000 Subject: [PATCH 3/7] Bump dynamiclistener for secret sync fix Signed-off-by: Brad Davidson --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 93c218051e9..9a97676e997 100644 --- a/go.mod +++ b/go.mod @@ -124,7 +124,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.23.0 github.com/prometheus/common v0.65.0 - github.com/rancher/dynamiclistener v0.7.0 + github.com/rancher/dynamiclistener v0.7.1 github.com/rancher/lasso v0.2.3 github.com/rancher/permissions v0.0.0-20240523180510-4001d3d637f7 github.com/rancher/remotedialer v0.5.1-0.20250827012652-e6b68fd83a6b diff --git a/go.sum b/go.sum index b335fc11ab8..14a6175175e 100644 --- a/go.sum +++ b/go.sum @@ -1227,8 +1227,8 @@ github.com/quic-go/quic-go v0.50.1 h1:unsgjFIUqW8a2oopkY7YNONpV1gYND6Nt9hnt1PN94 github.com/quic-go/quic-go v0.50.1/go.mod h1:Vim6OmUvlYdwBhXP9ZVrtGmCMWa3wEqhq3NgYrI8b4E= github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 h1:4WFk6u3sOT6pLa1kQ50ZVdm8BQFgJNA117cepZxtLIg= github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66/go.mod h1:Vp72IJajgeOL6ddqrAhmp7IM9zbTcgkQxD/YdxrVwMw= -github.com/rancher/dynamiclistener v0.7.0 h1:+jyfZ4lVamc1UbKWo8V8dhSPtCgRZYaY8nm7wiHeko4= -github.com/rancher/dynamiclistener v0.7.0/go.mod h1:Q2YA42xp7Xc69JiSlJ8GpvLvze261T0iQ/TP4RdMCYk= +github.com/rancher/dynamiclistener v0.7.1 h1:vt4AGDw/s19qFCfpyYSQS8HcRc6THcTD7PIAPAK2R1o= +github.com/rancher/dynamiclistener v0.7.1/go.mod h1:kq+3QHceIpW3f2xVpYgok7ILn1JcS8+O2utC42y8ZNY= github.com/rancher/lasso v0.2.3 h1:74/z/C/O3ykhyMrRuEgc9kVyYiSoS7kp5BAijlcyXDg= github.com/rancher/lasso v0.2.3/go.mod h1:G+KeeOaKRjp+qGp0bV6VbLhYrq1vHbJPbDh40ejg5yE= github.com/rancher/permissions v0.0.0-20240523180510-4001d3d637f7 h1:0Kg2SGoMeU1ll4xPi4DE0+qNHLFO/U5MwtK0WrIdK+o= From 1b98629b2c5f99f7d71e88cc8580bdff5320cc87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 09:39:06 -0700 Subject: [PATCH 4/7] Bump actions/setup-go from 5 to 6 (#12880) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5 to 6. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/setup-go dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/unitcoverage.yaml | 2 +- .github/workflows/updatecli.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unitcoverage.yaml b/.github/workflows/unitcoverage.yaml index e5a16de0e37..72338dc0e1e 100644 --- a/.github/workflows/unitcoverage.yaml +++ b/.github/workflows/unitcoverage.yaml @@ -63,7 +63,7 @@ jobs: with: fetch-depth: 1 - name: Install Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: cache: false - name: Run Unit Tests diff --git a/.github/workflows/updatecli.yaml b/.github/workflows/updatecli.yaml index 44304e2f0bf..bcc879fba16 100644 --- a/.github/workflows/updatecli.yaml +++ b/.github/workflows/updatecli.yaml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v5 - name: Install Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: go-version: 'stable' cache: false From 9c6d0eb5cda9230c8c2f846853a6eb7d94aba565 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 09:39:11 -0700 Subject: [PATCH 5/7] Bump actions/github-script from 7 to 8 (#12881) Bumps [actions/github-script](https://github.com/actions/github-script) from 7 to 8. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v7...v8) --- updated-dependencies: - dependency-name: actions/github-script dependency-version: '8' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/trivy-scan.yml | 2 +- .github/workflows/trivy-trigger.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 82041d131c6..118c7d982fe 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -22,7 +22,7 @@ jobs: # For some reason with workflow_run.id, download-artifact does not work. # Github Docs explicity provide an example of using github-script to download artifacts. - name: 'Download artifact' - uses: actions/github-script@v7 + uses: actions/github-script@v8 with: script: | let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({ diff --git a/.github/workflows/trivy-trigger.yml b/.github/workflows/trivy-trigger.yml index fe9636d9950..2ca053d8bc8 100644 --- a/.github/workflows/trivy-trigger.yml +++ b/.github/workflows/trivy-trigger.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Verify actor is a member of k3s-io organization and has write permissions - uses: actions/github-script@v7 + uses: actions/github-script@v8 with: script: | const org = 'k3s-io'; From 2f6283a92c28cac7a42a705d7b158d0b72bda980 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 14 Sep 2025 18:10:26 +0000 Subject: [PATCH 6/7] chore: Bump Klipper Helm and Helm Controller version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9a97676e997..7251bceced1 100644 --- a/go.mod +++ b/go.mod @@ -108,7 +108,7 @@ require ( github.com/joho/godotenv v1.5.1 github.com/json-iterator/go v1.1.12 github.com/k3s-io/api v0.1.3 - github.com/k3s-io/helm-controller v0.16.13 + github.com/k3s-io/helm-controller v0.16.14 github.com/k3s-io/kine v0.14.0 github.com/klauspost/compress v1.18.0 github.com/libp2p/go-libp2p v0.41.1 diff --git a/go.sum b/go.sum index 14a6175175e..765bcab47c7 100644 --- a/go.sum +++ b/go.sum @@ -823,8 +823,8 @@ github.com/k3s-io/etcd/pkg/v3 v3.6.4-k3s3 h1:y46UnWCRtSftjyI4iTlnGLqr+cHEHwqPQEL github.com/k3s-io/etcd/pkg/v3 v3.6.4-k3s3/go.mod h1:kKcYWP8gHuBRcteyv6MXWSN0+bVMnfgqiHueIZnKMtE= github.com/k3s-io/etcd/server/v3 v3.6.4-k3s3 h1:DY9zD2dDmIw6L0G+nL5s4ivIV73f4lQIQcV22QSCjHQ= github.com/k3s-io/etcd/server/v3 v3.6.4-k3s3/go.mod h1:aYCL/h43yiONOv0QIR82kH/2xZ7m+IWYjzRmyQfnCAg= -github.com/k3s-io/helm-controller v0.16.13 h1:jMD5lI4Mzo9uclZjLgJ8Yak6wSnXaL/tuTU+dEEx69Q= -github.com/k3s-io/helm-controller v0.16.13/go.mod h1:mw6sVaH/eli+81sUnRqRYh5wV7YVzYp+U7OucLT5kUc= +github.com/k3s-io/helm-controller v0.16.14 h1:UzTNhpxAzlTlNHuIOTJ69cekelVWj+dsgnDvWGoLf5s= +github.com/k3s-io/helm-controller v0.16.14/go.mod h1:mw6sVaH/eli+81sUnRqRYh5wV7YVzYp+U7OucLT5kUc= github.com/k3s-io/kine v0.14.0 h1:4vmVEErYwSPESHI5t0S6gL3aCOfmLlHfKnwrsuvupl4= github.com/k3s-io/kine v0.14.0/go.mod h1:mtcQsUUA0XpbKlQJevLERc4YU1ao44ErPCbbItpZLjo= github.com/k3s-io/klog/v2 v2.120.1-k3s1 h1:7twAHPFpZA21KdMnMNnj68STQMPldAxF2Zsaol57dxw= From 0136cf258954a458da1404858396342724b93d24 Mon Sep 17 00:00:00 2001 From: manuelbuil Date: Tue, 9 Sep 2025 12:34:30 +0200 Subject: [PATCH 7/7] Remove NetworkManager check for nm-cloud.service Signed-off-by: manuelbuil --- install.sh | 1 - install.sh.sha256sum | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/install.sh b/install.sh index cb54606bb16..854dc99a5ee 100755 --- a/install.sh +++ b/install.sh @@ -1003,7 +1003,6 @@ TasksMax=infinity TimeoutStartSec=0 Restart=always RestartSec=5s -ExecStartPre=/bin/sh -xc '! /usr/bin/systemctl is-enabled --quiet nm-cloud-setup.service 2>/dev/null' ExecStartPre=-/sbin/modprobe br_netfilter ExecStartPre=-/sbin/modprobe overlay ExecStart=${BIN_DIR}/k3s \\ diff --git a/install.sh.sha256sum b/install.sh.sha256sum index 6cfc6f3e013..8e322d1a5c4 100644 --- a/install.sh.sha256sum +++ b/install.sh.sha256sum @@ -1 +1 @@ -48fe6ec10517263cc69e1c924cf6b283c59a2b942b9b46186fc7c8d29e6f243a install.sh +40b487f0d8ef4f5d1bf422e7bb6228cc7789c40ecc66c5ab067d396bbee9816e install.sh