diff --git a/go.mod b/go.mod index 7052314707..37a94c5e12 100644 --- a/go.mod +++ b/go.mod @@ -94,7 +94,7 @@ require ( github.com/google/go-containerregistry v0.14.0 github.com/iamacarpet/go-win64api v0.0.0-20210311141720-fe38760bed28 github.com/k3s-io/helm-controller v0.15.4 - github.com/k3s-io/k3s v1.28.3-0.20231016180212-aaf840909608 // master + github.com/k3s-io/k3s v1.28.3-0.20231017174012-b8dc95539bfc // master github.com/libp2p/go-netroute v0.2.0 github.com/natefinch/lumberjack v2.0.0+incompatible github.com/onsi/ginkgo/v2 v2.11.0 diff --git a/go.sum b/go.sum index 1679a4bf05..b19436ef7e 100644 --- a/go.sum +++ b/go.sum @@ -1112,8 +1112,8 @@ github.com/k3s-io/etcd/server/v3 v3.5.9-k3s1 h1:B3039IkTPnwQEt4tIMjC6yd6b1Q3Z9ZZ github.com/k3s-io/etcd/server/v3 v3.5.9-k3s1/go.mod h1:GgI1fQClQCFIzuVjlvdbMxNbnISt90gdfYyqiAIt65g= github.com/k3s-io/helm-controller v0.15.4 h1:l4DWmUWpphbtwmuXGtpr5Rql/2NaCLSv4ZD8HlND9uY= github.com/k3s-io/helm-controller v0.15.4/go.mod h1:BgCPBQblj/Ect4Q7/Umf86WvyDjdG/34D+n8wfXtoeM= -github.com/k3s-io/k3s v1.28.3-0.20231016180212-aaf840909608 h1:W2AGQzWQszJfXr0ejVgZ5seg3Z1tmIHL/NRWnDZqVTA= -github.com/k3s-io/k3s v1.28.3-0.20231016180212-aaf840909608/go.mod h1:cRlEzIpvEnbDUDvh3utGu2ZtEQNA+lLU489LTPDQKTQ= +github.com/k3s-io/k3s v1.28.3-0.20231017174012-b8dc95539bfc h1:o5uza9pkUwZ9NZJMoLqGDpxtk6QnEGDbKUnB6BgbIqA= +github.com/k3s-io/k3s v1.28.3-0.20231017174012-b8dc95539bfc/go.mod h1:Pi3b5IlFj46l1ZRAh+YtR2bAcL714HBUsbonrEgKvUU= github.com/k3s-io/kine v0.10.3 h1:OamjhtcQnK7zpzbiUDvXXKaAwdkXIuzr+nuyFWSC1ZA= github.com/k3s-io/kine v0.10.3/go.mod h1:hiOK3Gj89Py+AB11YK0fxEwkdWxBvNfaMt8PRWXqh6M= github.com/k3s-io/klog v1.0.0-k3s2/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= diff --git a/pkg/cli/cmds/server.go b/pkg/cli/cmds/server.go index 120c271db4..165df43225 100644 --- a/pkg/cli/cmds/server.go +++ b/pkg/cli/cmds/server.go @@ -69,10 +69,10 @@ var ( "kube-apiserver-arg": copyFlag, "etcd-arg": copyFlag, "kube-scheduler-arg": copyFlag, - "kube-controller-arg": dropFlag, + "kube-controller-arg": dropFlag, // deprecated version of kube-controller-manager-arg "kube-controller-manager-arg": copyFlag, - "kube-cloud-controller-manager-arg": dropFlag, - "kube-cloud-controller-arg": dropFlag, + "kube-cloud-controller-manager-arg": copyFlag, + "kube-cloud-controller-arg": dropFlag, // deprecated version of kube-cloud-controller-manager-arg "datastore-endpoint": dropFlag, "datastore-cafile": dropFlag, "datastore-certfile": dropFlag, diff --git a/scripts/version.sh b/scripts/version.sh index d95ab7307b..b680c30275 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -35,7 +35,7 @@ KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.28.2} KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.28.2-rke2r1-build20230913} ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} -CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230608} +CCM_VERSION=${CCM_VERSION:-v1.28.2-build20231016} if [ -d .git ]; then if [ -z "$GIT_TAG" ]; then