Skip to content

Commit c9ee853

Browse files
HomayoonAlimohammadiHomayoonAlimohammadi
authored
chore: Bump component versions to latest (#5189)
* chore: Bump component versions to latest Signed-off-by: Homayoon (Hue) Alimohammadi <homayoon.alimohammadi@canonical.com> * chore: Build etcd based on the new version Signed-off-by: Homayoon (Hue) Alimohammadi <homayoon.alimohammadi@canonical.com> * fix: Microk8s completion patch on Helm Signed-off-by: Homayoon (Hue) Alimohammadi <homayoon.alimohammadi@canonical.com> --------- Signed-off-by: Homayoon (Hue) Alimohammadi <homayoon.alimohammadi@canonical.com>
1 parent 09acef9 commit c9ee853

File tree

11 files changed

+120
-20
lines changed

11 files changed

+120
-20
lines changed

‎build-scripts/components/cni/version.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash
22

33
# Match https://github.com/kubernetes/kubernetes/blob/master/build/dependencies.yaml#L20
4-
echo "v1.6.2"
4+
echo "v1.7.1"

‎build-scripts/components/containerd/version.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
echo "v1.7.27"
3+
echo "v1.7.28"

‎build-scripts/components/etcd/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
export INSTALL="${1}"
44
mkdir -p "${INSTALL}"
55

6-
GO_LDFLAGS="-s -w" GO_BUILD_FLAGS="-v" ./build.sh
6+
GO_LDFLAGS="-s -w" GO_BUILD_FLAGS="-v" make build
77

88
for bin in etcd etcdctl; do
99
cp "bin/${bin}" "${INSTALL}/${bin}"

‎build-scripts/components/etcd/version.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
echo "v3.5.17"
3+
echo "v3.6.4"

‎build-scripts/components/flannel-cni-plugin/version.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
echo "v1.1.2"
3+
echo "v1.7.1-flannel2"

‎build-scripts/components/flanneld/version.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
echo "v0.21.2"
3+
echo "v0.27.2"

‎build-scripts/components/helm/version.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
echo "v3.17.2"
3+
echo "v3.18.6"

‎build-scripts/components/k8s-dqlite/version.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
echo "v1.7.0"
3+
echo "v1.7.1"

‎build-scripts/components/microk8s-completion/patches/default/0001-microk8s-autocompleter-script.patch‎

Lines changed: 110 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
From f154f915fe39d6b929dbe1e513011fd271fcd12c Mon Sep 17 00:00:00 2001
2-
From: Angelos Kolaitis <neoaggelos@gmail.com>
3-
Date: Fri, 15 Jul 2022 15:07:18 +0300
1+
From fcf13fcd6085be9bd15c4db8d4d7261e9b866a4d Mon Sep 17 00:00:00 2001
2+
From: Homayoon Alimohammadi <homayoonalimohammadi@gmail.com>
3+
Date: Fri, 22 Aug 2025 15:25:12 +0400
44
Subject: [PATCH] microk8s autocompleter script
55

6+
Signed-off-by: Homayoon Alimohammadi <homayoonalimohammadi@gmail.com>
67
---
78
cmd/helm/hack_microk8s_autocompleter.go | 51 +++++++++++++++++++++++++
89
cmd/helm/helm.go | 2 +-
9-
2 files changed, 52 insertions(+), 1 deletion(-)
10+
go.mod | 6 +++
11+
go.sum | 12 ++++++
12+
4 files changed, 70 insertions(+), 1 deletion(-)
1013
create mode 100644 cmd/helm/hack_microk8s_autocompleter.go
1114

1215
diff --git a/cmd/helm/hack_microk8s_autocompleter.go b/cmd/helm/hack_microk8s_autocompleter.go
1316
new file mode 100644
14-
index 00000000..e819f44b
17+
index 000000000..e819f44be
1518
--- /dev/null
1619
+++ b/cmd/helm/hack_microk8s_autocompleter.go
1720
@@ -0,0 +1,51 @@
@@ -67,18 +70,115 @@ index 00000000..e819f44b
6770
+ os.WriteFile("microk8s.bash", []byte(completionScript), 0644)
6871
+}
6972
diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go
70-
index 15b0d5c7..6499d4ca 100644
73+
index 7bca93358..2008c1b08 100644
7174
--- a/cmd/helm/helm.go
7275
+++ b/cmd/helm/helm.go
73-
@@ -55,7 +55,7 @@ func warning(format string, v ...interface{}) {
74-
fmt.Fprintf(os.Stderr, format, v...)
76+
@@ -62,7 +62,7 @@ func hookOutputWriter(_, _, _ string) io.Writer {
77+
return log.Writer()
7578
}
7679

7780
-func main() {
7881
+func Main() {
7982
// Setting the name of the app for managedFields in the Kubernetes client.
8083
// It is set here to the full name of "helm" so that renaming of helm to
8184
// another name (e.g., helm2 or helm3) does not change the name of the
85+
diff --git a/go.mod b/go.mod
86+
index bc36c0a6b..3afa92eab 100644
87+
--- a/go.mod
88+
+++ b/go.mod
89+
@@ -73,6 +73,7 @@ require (
90+
github.com/docker/go-metrics v0.0.1 // indirect
91+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
92+
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
93+
+ github.com/fatih/camelcase v1.0.0 // indirect
94+
github.com/fatih/color v1.13.0 // indirect
95+
github.com/felixge/httpsnoop v1.0.4 // indirect
96+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
97+
@@ -99,12 +100,14 @@ require (
98+
github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect
99+
github.com/huandu/xstrings v1.5.0 // indirect
100+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
101+
+ github.com/jonboulle/clockwork v0.4.0 // indirect
102+
github.com/josharian/intern v1.0.0 // indirect
103+
github.com/json-iterator/go v1.1.12 // indirect
104+
github.com/klauspost/compress v1.18.0 // indirect
105+
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
106+
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
107+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
108+
+ github.com/lithammer/dedent v1.1.0 // indirect
109+
github.com/mailru/easyjson v0.7.7 // indirect
110+
github.com/mattn/go-colorable v0.1.13 // indirect
111+
github.com/mattn/go-isatty v0.0.17 // indirect
112+
@@ -174,10 +177,13 @@ require (
113+
gopkg.in/inf.v0 v0.9.1 // indirect
114+
gopkg.in/yaml.v2 v2.4.0 // indirect
115+
k8s.io/component-base v0.33.3 // indirect
116+
+ k8s.io/component-helpers v0.33.3 // indirect
117+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
118+
+ k8s.io/metrics v0.33.3 // indirect
119+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
120+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
121+
sigs.k8s.io/kustomize/api v0.19.0 // indirect
122+
+ sigs.k8s.io/kustomize/kustomize/v5 v5.6.0 // indirect
123+
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
124+
sigs.k8s.io/randfill v1.0.0 // indirect
125+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
126+
diff --git a/go.sum b/go.sum
127+
index 31d5f8ae2..218931bb0 100644
128+
--- a/go.sum
129+
+++ b/go.sum
130+
@@ -90,6 +90,8 @@ github.com/evanphx/json-patch v5.9.11+incompatible h1:ixHHqfcGvxhWkniF1tWxBHA0yb
131+
github.com/evanphx/json-patch v5.9.11+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
132+
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2Wvf/TIe2xdyJxTlb6obmF18d8QdkxNDu4=
133+
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSYXu++VVOHnXeitef/D8n/6y4QV8uLHSFXX4NeXMGc=
134+
+github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=
135+
+github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
136+
github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
137+
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
138+
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
139+
@@ -180,6 +182,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
140+
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
141+
github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
142+
github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
143+
+github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4=
144+
+github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc=
145+
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
146+
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
147+
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
148+
@@ -211,6 +215,8 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
149+
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
150+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
151+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
152+
+github.com/lithammer/dedent v1.1.0 h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffktY=
153+
+github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
154+
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
155+
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
156+
github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
157+
@@ -535,12 +541,16 @@ k8s.io/client-go v0.33.3 h1:M5AfDnKfYmVJif92ngN532gFqakcGi6RvaOF16efrpA=
158+
k8s.io/client-go v0.33.3/go.mod h1:luqKBQggEf3shbxHY4uVENAxrDISLOarxpTKMiUuujg=
159+
k8s.io/component-base v0.33.3 h1:mlAuyJqyPlKZM7FyaoM/LcunZaaY353RXiOd2+B5tGA=
160+
k8s.io/component-base v0.33.3/go.mod h1:ktBVsBzkI3imDuxYXmVxZ2zxJnYTZ4HAsVj9iF09qp4=
161+
+k8s.io/component-helpers v0.33.3 h1:fjWVORSQfI0WKzPeIFSju/gMD9sybwXBJ7oPbqQu6eM=
162+
+k8s.io/component-helpers v0.33.3/go.mod h1:7iwv+Y9Guw6X4RrnNQOyQlXcvJrVjPveHVqUA5dm31c=
163+
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
164+
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
165+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
166+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
167+
k8s.io/kubectl v0.33.3 h1:r/phHvH1iU7gO/l7tTjQk2K01ER7/OAJi8uFHHyWSac=
168+
k8s.io/kubectl v0.33.3/go.mod h1:euj2bG56L6kUGOE/ckZbCoudPwuj4Kud7BR0GzyNiT0=
169+
+k8s.io/metrics v0.33.3 h1:9CcqBz15JZfISqwca33gdHS8I6XfsK1vA8WUdEnG70g=
170+
+k8s.io/metrics v0.33.3/go.mod h1:Aw+cdg4AYHw0HvUY+lCyq40FOO84awrqvJRTw0cmXDs=
171+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
172+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
173+
oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=
174+
@@ -549,6 +559,8 @@ sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1
175+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
176+
sigs.k8s.io/kustomize/api v0.19.0 h1:F+2HB2mU1MSiR9Hp1NEgoU2q9ItNOaBJl0I4Dlus5SQ=
177+
sigs.k8s.io/kustomize/api v0.19.0/go.mod h1:/BbwnivGVcBh1r+8m3tH1VNxJmHSk1PzP5fkP6lbL1o=
178+
+sigs.k8s.io/kustomize/kustomize/v5 v5.6.0 h1:MWtRRDWCwQEeW2rnJTqJMuV6Agy56P53SkbVoJpN7wA=
179+
+sigs.k8s.io/kustomize/kustomize/v5 v5.6.0/go.mod h1:XuuZiQF7WdcvZzEYyNww9A0p3LazCKeJmCjeycN8e1I=
180+
sigs.k8s.io/kustomize/kyaml v0.19.0 h1:RFge5qsO1uHhwJsu3ipV7RNolC7Uozc0jUBC/61XSlA=
181+
sigs.k8s.io/kustomize/kyaml v0.19.0/go.mod h1:FeKD5jEOH+FbZPpqUghBP8mrLjJ3+zD3/rf9NNu1cwY=
182+
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
82183
--
83-
2.25.1
84-
184+
2.48.1

‎build-scripts/components/microk8s-completion/version.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
echo "v3.9.1"
3+
echo "v3.18.6"

0 commit comments

Comments
 (0)