From b0f3f015d7748951a4ec60682ed27efc72984f2e Mon Sep 17 00:00:00 2001
From: Marek Siarkowicz <siarkowicz@google.com>
Date: Wed, 13 Apr 2022 21:27:09 +0200
Subject: [PATCH] Build etcd v3.5.3 image

Co-authored-by: Stephen Augustus <foo@auggie.dev>
---
 build/dependencies.yaml                | 15 ++++++++-------
 cluster/images/etcd/Makefile           |  8 ++++----
 cluster/images/etcd/migrate/options.go |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/build/dependencies.yaml b/build/dependencies.yaml
index 28dba271e37..f73d1e25f73 100644
--- a/build/dependencies.yaml
+++ b/build/dependencies.yaml
@@ -72,12 +72,19 @@ dependencies:
       match: configs\[Etcd\] = Config{list\.GcEtcdRegistry, "etcd", "\d+\.\d+.\d+(-(alpha|beta|rc).\d+)?(-\d+)?"}
 
   - name: "etcd-image"
-    version: 3.6.0-alpha.0
+    version: 3.5.3
     refPaths:
     - path: cluster/images/etcd/Makefile
       match: BUNDLED_ETCD_VERSIONS\?|LATEST_ETCD_VERSION\?
     - path: cluster/images/etcd/migrate/options.go
 
+  # From https://github.com/etcd-io/etcd/blob/main/Makefile
+  - name: "golang: etcd release version"
+    version: 1.16.15 # for etcd v3.5.3: https://github.com/etcd-io/etcd/blob/0452feec719fa8ad88ae343e66e9bb222965d75d/Makefile#L58
+    refPaths:
+    - path: cluster/images/etcd/Makefile
+      match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?'
+
   # Golang
   - name: "golang: upstream version"
     version: 1.18.1
@@ -101,12 +108,6 @@ dependencies:
     #- path: hack/lib/golang.sh
     #  match: minimum_go_version=go([0-9]+\.[0-9]+)
 
-  - name: "golang: etcd release version"
-    version: 1.16.12
-    refPaths:
-    - path: cluster/images/etcd/Makefile
-      match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?'
-
   - name: "k8s.gcr.io/kube-cross: dependents"
     version: v1.24.0-go1.18.1-bullseye.0
     refPaths:
diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile
index 384ef72b72c..c028e80e515 100644
--- a/cluster/images/etcd/Makefile
+++ b/cluster/images/etcd/Makefile
@@ -15,7 +15,7 @@
 # Build the etcd image
 #
 # Usage:
-# 	[BUNDLED_ETCD_VERSIONS=3.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.2 3.6.0-alpha.0] [REGISTRY=k8s.gcr.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
+# 	[BUNDLED_ETCD_VERSIONS=3.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.3] [REGISTRY=k8s.gcr.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
 #
 # The image contains different etcd versions to simplify
 # upgrades. Thus be careful when removing any versions from here.
@@ -26,10 +26,10 @@
 # Except from etcd-$(version) and etcdctl-$(version) binaries, we also
 # need etcd and etcdctl binaries for backward compatibility reasons.
 # That binary will be set to the last version from $(BUNDLED_ETCD_VERSIONS).
-BUNDLED_ETCD_VERSIONS?=3.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.2 3.6.0-alpha.0
+BUNDLED_ETCD_VERSIONS?=3.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.3
 
 # LATEST_ETCD_VERSION identifies the most recent etcd version available.
-LATEST_ETCD_VERSION?=3.6.0-alpha.0
+LATEST_ETCD_VERSION?=3.5.3
 
 # REVISION provides a version number for this image and all it's bundled
 # artifacts. It should start at zero for each LATEST_ETCD_VERSION and increment
@@ -83,7 +83,7 @@ endif
 # This option is for running docker manifest command
 export DOCKER_CLI_EXPERIMENTAL := enabled
 # golang version should match the golang version of the official build from https://github.com/etcd-io/etcd/releases.
-GOLANG_VERSION?=1.16.12
+GOLANG_VERSION?=1.16.15
 GOARM?=7
 TEMP_DIR:=$(shell mktemp -d)
 
diff --git a/cluster/images/etcd/migrate/options.go b/cluster/images/etcd/migrate/options.go
index 03b7d3e7c3a..551f1b3dcac 100644
--- a/cluster/images/etcd/migrate/options.go
+++ b/cluster/images/etcd/migrate/options.go
@@ -28,7 +28,7 @@ import (
 )
 
 var (
-	supportedEtcdVersions = []string{"3.0.17", "3.1.20", "3.2.32", "3.3.17", "3.4.18", "3.5.2", "3.6.0-alpha.0"}
+	supportedEtcdVersions = []string{"3.0.17", "3.1.20", "3.2.32", "3.3.17", "3.4.18", "3.5.3"}
 )
 
 const (