Skip to content
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

[release-1.27] Bump rke2-cloud-controller to v1.28.2-build20231016 #4903

Merged
merged 3 commits into from
Oct 18, 2023
Merged

[release-1.27] Bump rke2-cloud-controller to v1.28.2-build20231016 #4903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e6e1b1
Bump rke2-cloud-controller to v1.28.2-build20231016
brandond Oct 16, 2023
e132343
Don't drop kube-cloud-controller-manager-arg
brandond Oct 17, 2023
fc280f7
Bump K3s version for v1.27
brandond Oct 17, 2023
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 go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
1 change: 1 addition & 0 deletions pkg/cli/cmds/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 4 additions & 3 deletions pkg/cli/cmds/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion scripts/version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down