From 8e6e1b1789feea05b782c381fa6a93b3e8e196e6 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Mon, 16 Oct 2023 21:16:09 +0000 Subject: [PATCH 1/3] Bump rke2-cloud-controller to v1.28.2-build20231016 Signed-off-by: Brad Davidson --- scripts/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/version.sh b/scripts/version.sh index 5191ed8b4c..72ab1342ca 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -35,7 +35,7 @@ KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.27.6} KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.27.6-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 From e1323436375dbca228caf99745e7b0ad2c69b996 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Tue, 17 Oct 2023 00:41:04 +0000 Subject: [PATCH 2/3] Don't drop kube-cloud-controller-manager-arg This was dropped when we initially shipped RKE2 without a stub cloud controller, but now we do, and should be able to configure it. Signed-off-by: Brad Davidson --- pkg/cli/cmds/server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/cli/cmds/server.go b/pkg/cli/cmds/server.go index 8bc9315ea3..b1dfe31063 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, From fc280f74cf757d6fa5b9051b2208c21cdc1f29c7 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Tue, 17 Oct 2023 17:51:30 +0000 Subject: [PATCH 3/3] Bump K3s version for v1.27 Updates k3s: https://github.com/k3s-io/k3s/compare/40f29507c778...55e61670c365f02106abfac3478d399a871c8a8d Signed-off-by: Brad Davidson --- go.mod | 2 +- go.sum | 4 ++-- pkg/cli/cmds/agent.go | 1 + pkg/cli/cmds/server.go | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b65bae6ad2..57d6e36c86 100644 --- a/go.mod +++ b/go.mod @@ -95,7 +95,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.27.7-0.20231016192627-40f29507c778 //release-1.27 + github.com/k3s-io/k3s v1.27.7-0.20231017174419-55e61670c365 //release-1.27 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 063620b3ef..834d2b5229 100644 --- a/go.sum +++ b/go.sum @@ -915,8 +915,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.27.7-0.20231016192627-40f29507c778 h1:O+wlTfsoIVE0hm2ZtOGtFER39d65wutFspVrRrkXus0= -github.com/k3s-io/k3s v1.27.7-0.20231016192627-40f29507c778/go.mod h1:401OJ+vSm+bYvxTxR/U38s29VJK+eqyXPKTORRGPj3I= +github.com/k3s-io/k3s v1.27.7-0.20231017174419-55e61670c365 h1:4QW29yfg3gAYILUHnNly/q+UZG+uokewfpHVj5UHgHc= +github.com/k3s-io/k3s v1.27.7-0.20231017174419-55e61670c365/go.mod h1:AoefuLEHUlWhhvyYIVwM1zJEEzcDSHt5M7KXjS9VwIc= 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/agent.go b/pkg/cli/cmds/agent.go index c9f7337090..dbfe44f2c8 100644 --- a/pkg/cli/cmds/agent.go +++ b/pkg/cli/cmds/agent.go @@ -30,6 +30,7 @@ var ( "image-credential-provider-config": copyFlag, "docker": dropFlag, "container-runtime-endpoint": copyFlag, + "image-service-endpoint": dropFlag, "pause-image": dropFlag, "private-registry": copyFlag, "node-ip": copyFlag, diff --git a/pkg/cli/cmds/server.go b/pkg/cli/cmds/server.go index b1dfe31063..165df43225 100644 --- a/pkg/cli/cmds/server.go +++ b/pkg/cli/cmds/server.go @@ -102,6 +102,7 @@ var ( "image-credential-provider-config": copyFlag, "docker": dropFlag, "container-runtime-endpoint": copyFlag, + "image-service-endpoint": dropFlag, "pause-image": dropFlag, "private-registry": copyFlag, "system-default-registry": copyFlag,