-
Notifications
You must be signed in to change notification settings - Fork 45
(Issue #331) Supporting etcd version 3.4.7 for k8s >= 1.19 #332
Conversation
Signed-off-by: mmerrill3 <[email protected]>
/assign @justinsb |
@justinsb this is giving k8s users with version 1.19 or above the option to use etcd 3.4.7. This is the version supported out of the box by kubeadm. |
Thanks for the @mmerrill3, and sorry it took so long to get to it. The challenge is that technically etcd can still be bumped because we haven't released k8s 1.19 yet, and in fact it's already been bumped to 3.4.9 https://github.com/kubernetes/kubernetes/blob/master/build/workspace.bzl If we could figure out a nice way to not have to embed every etcd version into the image this wouldn't be a problem, but until we do these slots are "precious". We are intending to merge with etcdadm, which would likely have a better model here ... maybe it's time to tackle that! I can ask around to know if another etcd upgrade is likely before the 1.19 release; I'm assuming not, but I've also heard that the k8s release candidates are not testing particularly well right now. |
@@ -144,7 +150,11 @@ func EtcdVersionForRestore(fromVersion string) string { | |||
return Version_3_3_17 | |||
} | |||
case "3.4": | |||
return Version_3_4_3 | |||
if fromSemver.Patch <= 18 { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indentation is also an issue I think:
if fromSemver.Patch <= 18 { | |
if fromSemver.Patch <= 3 { |
@@ -28,6 +28,8 @@ go_test( | |||
"//:etcd-v3.3.17-linux-amd64_etcdctl", | |||
"//:etcd-v3.4.3-linux-amd64_etcd", | |||
"//:etcd-v3.4.3-linux-amd64_etcdctl", | |||
"//:etcd-v3.4.7-linux-amd64_etcd", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"//:etcd-v3.4.7-linux-amd64_etcd", | |
"//:etcd-v3.4.7-linux-amd64_etcd", |
@@ -108,7 +110,11 @@ func EtcdVersionForAdoption(fromVersion string) string { | |||
return Version_3_3_17 | |||
} | |||
case "3.4": | |||
return Version_3_4_3 | |||
if fromSemver.Patch <= 18 { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if fromSemver.Patch <= 18 { | |
if fromSemver.Patch <= 3 { |
K8s 1.19 was just released with etcd 3.4.9 (see the end of this list). Can you update this PR to match? |
etcd was just updated to 3.4.13 in kubernetes/kubernetes#94536. |
I created #344 for v3.4.13. |
closing since this is superceded by #344 |
Signed-off-by: mmerrill3 [email protected]
Issue #331 Supporting etcd version 3.4.7 for k8s versions greater than or equal to 1.19