cluster/gce and test/: update etcd:3.2.24-0 image to etcd:3.2.24-1

[ixdy]

What this PR does / why we need it: follow-up to #59664 to use the new etcd image revision in various GCE locations.

The only differences between etcd:3.2.24-0 and etcd:3.2.24-1 is that the latter is a manifest list, rather than an amd64 image. Of course, on GCE this should basically make no difference.

kubeadm is currently using a tag without a revision (no -0 or -1), but we'll likely fix that in a follow-up PR.

Release note:

Update to use manifest list for etcd image

/assign @tpepper @jpbetz @neolit123 @mkumatag @dims

[ixdy]

The 3.2.24-1 tag hasn't been promoted yet, so this should fail tests.

[neolit123]

/kind cleanup
/lgtm

[ixdy]

Comparing 3.2.24-0 and 3.2.24-1 using https://github.com/GoogleContainerTools/container-diff:

$ container-diff diff k8s.gcr.io/etcd:3.2.24-0 staging-k8s.gcr.io/etcd:3.2.24-1 --type=file

-----File-----

These entries have been added to k8s.gcr.io/etcd:3.2.24-0:
FILE                                 SIZE
/usr/local/bin/etcd-3.2.18           17M
/usr/local/bin/etcdctl-3.2.18        14.5M

These entries have been deleted from k8s.gcr.io/etcd:3.2.24-0: None

These entries have been changed between k8s.gcr.io/etcd:3.2.24-0 and staging-k8s.gcr.io/etcd:3.2.24-1:
FILE                                       SIZE1        SIZE2
/usr/local/bin/migrate-if-needed.sh        3.8K         3.8K

[ixdy]

(so interestingly 3.2.24-0 didn't bundle etcd 3.2.18?)

[ixdy]

And the diffs in migrate-if-needed.sh:

@@ -18,7 +18,7 @@
 # This script performs etcd upgrade based on the following environmental
 # variables:
 # TARGET_STORAGE - API of etcd to be used (supported: 'etcd2', 'etcd3')
-# TARGET_VERSION - etcd release to be used (supported: '2.2.1', '2.3.7', '3.0.17', '3.1.12', '3.2.24')
+# TARGET_VERSION - etcd release to be used (supported: '2.2.1', '2.3.7', '3.0.17', '3.1.12', '3.2.18', '3.2.24')
 # DATA_DIRECTORY - directory with etcd data
 #
 # The current etcd version and storage format is detected based on the
@@ -29,7 +29,8 @@
 # - 2.2.1/etcd2 -> 2.3.7/etcd2
 # - 2.3.7/etcd2 -> 3.0.17/etcd2
 # - 3.0.17/etcd3 -> 3.1.12/etcd3
-# - 3.1.12/etcd3 -> 3.2.24/etcd3
+# - 3.1.12/etcd3 -> 3.2.18/etcd3
+# - 3.2.18/etcd3 -> 3.2.24/etcd3
 #
 # NOTE: The releases supported in this script has to match release binaries
 # present in the etcd image (to make this script work correctly).
@@ -42,7 +43,7 @@

 # NOTE: BUNDLED_VERSION has to match release binaries present in the
 # etcd image (to make this script work correctly).
-BUNDLED_VERSIONS="2.2.1, 2.3.7, 3.0.17, 3.1.12, 3.2.24"
+BUNDLED_VERSIONS="2.2.1, 2.3.7, 3.0.17, 3.1.12, 3.2.18 3.2.24"

 ETCD_NAME="${ETCD_NAME:-etcd-$(hostname)}"
 if [ -z "${DATA_DIRECTORY:-}" ]; then

[jpbetz]

@ixdy We should replace 3.2.18 with 3.2.24. We only want one patch version of each minor version. This is almost certainly my fault, I must not have sent a PR out to update migrate-if-needed when first publishing 3.2.24.

[ixdy]

ack, there's also a comma missing in BUNDLED_VERSIONS in migrate-status.sh:

kubernetes/cluster/images/etcd/migrate-if-needed.sh

Line 46 in b33b0fb

BUNDLED_VERSIONS="2.2.1, 2.3.7, 3.0.17, 3.1.12, 3.2.18 3.2.24"

/hold
We need to fix this.

[ixdy]

@eparis @jbeda @mikedanese @roberthbailey @zmerlynn can one of you please approve? thanks!

[ixdy]

/retest

(this might be a little eager, we'll see...)

[ixdy]

/hold cancel
k8s.gcr.io/etcd:3.2.24-1 has been fixed.

[ixdy]

once more, now that images are published:
/retest

[neolit123]

/retest

[ixdy]

/retest

[ixdy]

@tpepper @timothysc what are the thoughts on this PR? Without it kubeadm and GCE cluster scripts are currently pointing at different (but roughly equivalent) etcd images.

[neolit123]

@ixdy
we had a chat about it today on a short call.

@timothysc mentioned that a new etcd version is coming soon, so if that new version only has the -x revisions (no tag without revisions) then we are going to make kubeadm use the -x revisions.

unless there are plans to remove etcd:3.2.24 (without revision) eventually, this patch is redundant.
is there an estimate if that might happen?

[ixdy]

I don't think we plan to remove etcd:3.2.24, no.

The issue this PR resolves is that 3.2.24 points to the same image as 3.2.24-1, so kubeadm is effectively already using 3.2.24-1, whereas the GCE scripts are still using 3.2.24-0.

[neolit123]

The issue this PR resolves is that 3.2.24 points to the same image as 3.2.24-1, so kubeadm is effectively already using 3.2.24-1, whereas the GCE scripts are still using 3.2.24-0.

oh, sorry wrong PR. i though i was writing in my kubeadm PR that did the 3.2.24-1 bump. o_O.

this should be merged ASAP, IMHO.

[ixdy]

yeah, the PR title is not helping here. let me fix that.

[ixdy]

@bowei @gmarek @jszczepkowski @vishh @mwielgus @MaciekPytel @jingax10 can one of you please approve?

[tpepper]

My preference is to have things all in alignment, so "Without it kubeadm and GCE cluster scripts are currently pointing at different (but roughly equivalent) etcd images" == bad.

[ixdy]

Also, the PR e2e tests are passing, and container-diff shows -0 and -1 to be equivalent, so I believe this is low-risk.

[tpepper]

/milestone v1.12

[tpepper]

/priority critical-urgent

[ixdy]

/assign @roberthbailey

You approved #68898 yesterday, can you also approve this? :)

[roberthbailey]

/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ixdy, neolit123, roberthbailey

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• cluster/gce/OWNERS [roberthbailey]
• test/OWNERS [ixdy]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[tpepper]

/retest

[gabrielfsousa]

so... do i need to upgrade the etcd ?
on the change log
"Default etcd server version is unchanged from v1.11: v3.2.18"

[dims]

@gabrielfsousa i logged a bug #69216

[ixdy]

#68318 is what actually updated etcd and had a release note, but yes, the dependencies section needs to be updated.

[wenjiaswe]

cc @yuwenma This is the PR to update etcd:3.2.24-0 to etcd:3.2.24-1, which you may use as ref for etcd image tag.