etcd: Update etcd to v3.6.6

Signed-off-by: bzsuni <bingzhe.sun@daocloud.io>

diff --git a/build/dependencies.yaml b/build/dependencies.yaml
index 2b389d6fefd2f8d08b9af4027e0dc107f9cedf01..695e1c2f3d475c021d9b7742a6c76deb7177f27b 100644 (file)
--- a/build/dependencies.yaml
+++ b/build/dependencies.yaml
@@ -64,7 +64,7 @@ dependencies:
 
   # etcd
   - name: "etcd"
-    version: 3.6.5
+    version: 3.6.6
     refPaths:
     - path: cluster/gce/manifests/etcd.manifest
       match: etcd_docker_tag|etcd_version

diff --git a/cluster/gce/manifests/etcd.manifest b/cluster/gce/manifests/etcd.manifest
index 02f6daf45b1efbdbfdb336c1e003af2b919da95a..b73ee24a91fd436404a582f41fae36d0a6156a85 100644 (file)
--- a/cluster/gce/manifests/etcd.manifest
+++ b/cluster/gce/manifests/etcd.manifest
@@ -18,7 +18,7 @@
     {
     "name": "etcd-container",
     {{security_context}}
-    "image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.6.5-0') }}",
+    "image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.6.6-0') }}",
     "resources": {
       "requests": {
         "cpu": {{ cpulimit }}
@@ -43,7 +43,7 @@
         "value": "{{ pillar.get('storage_backend', 'etcd3') }}"
       },
       { "name": "TARGET_VERSION",
-        "value": "{{ pillar.get('etcd_version', '3.6.5') }}"
+        "value": "{{ pillar.get('etcd_version', '3.6.6') }}"
       },
       {
         "name": "DO_NOT_MOVE_BINARIES",

diff --git a/cluster/gce/upgrade-aliases.sh b/cluster/gce/upgrade-aliases.sh
index fb88cd80cf65226ab4a38e435b5f5f76ab5a7475..b8f2f4648c7d343b4fdf6aca4d4ae6c2d4973923 100755 (executable)
--- a/cluster/gce/upgrade-aliases.sh
+++ b/cluster/gce/upgrade-aliases.sh
@@ -170,8 +170,8 @@ export KUBE_GCE_ENABLE_IP_ALIASES=true
 export SECONDARY_RANGE_NAME="pods-default"
 export STORAGE_BACKEND="etcd3"
 export STORAGE_MEDIA_TYPE="application/vnd.kubernetes.protobuf"
-export ETCD_IMAGE=3.6.5-0
-export ETCD_VERSION=3.6.5
+export ETCD_IMAGE=3.6.6-0
+export ETCD_VERSION=3.6.6
 
 # Upgrade master with updated kube envs
 "${KUBE_ROOT}/cluster/gce/upgrade.sh" -M -l

diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go
index 8c107f034f4ad1f3a82b989d20e544dfd6792f5f..fee98ece17c726d17794161a49e6715a47f9a503 100644 (file)
--- a/cmd/kubeadm/app/constants/constants.go
+++ b/cmd/kubeadm/app/constants/constants.go
@@ -326,7 +326,7 @@ const (
        MinExternalEtcdVersion = "3.5.24-0"
 
        // DefaultEtcdVersion indicates the default etcd version that kubeadm uses
-       DefaultEtcdVersion = "3.6.5-0"
+       DefaultEtcdVersion = "3.6.6-0"
 
        // Etcd defines variable used internally when referring to etcd component
        Etcd = "etcd"
@@ -504,8 +504,8 @@ var (
        // with the control plane version.
        SupportedEtcdVersion = map[uint8]string{
                uint8(getSkewedKubernetesVersion(-2).Minor()): "3.5.24-0",
-               uint8(getSkewedKubernetesVersion(-1).Minor()): "3.6.5-0",
-               uint8(getSkewedKubernetesVersion(0).Minor()):  "3.6.5-0",
+               uint8(getSkewedKubernetesVersion(-1).Minor()): "3.6.6-0",
+               uint8(getSkewedKubernetesVersion(0).Minor()):  "3.6.6-0",
        }
 
        // KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows

diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh
index 6e99d244c808b83f8087e55cd4aaf6b7ea3a8361..d97de5206aa3fef9d4cccb7be130097c1e72ddcc 100755 (executable)
--- a/hack/lib/etcd.sh
+++ b/hack/lib/etcd.sh
@@ -16,7 +16,7 @@
 
 # A set of helpers for starting/running etcd for tests
 
-ETCD_VERSION=${ETCD_VERSION:-3.6.5}
+ETCD_VERSION=${ETCD_VERSION:-3.6.6}
 ETCD_HOST=${ETCD_HOST:-127.0.0.1}
 ETCD_PORT=${ETCD_PORT:-2379}
 # This is intentionally not called ETCD_LOG_LEVEL:

diff --git a/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml b/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml
index fc51fbd8fb00aee686b135af803d94452e894011..f0fa4380fc8353b44a6ecd73bfc50a6242543345 100644 (file)
--- a/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml
+++ b/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml
@@ -26,4 +26,4 @@ spec:
         imagePullPolicy: Never
         args: [ "--etcd-servers=http://localhost:2379" ]
       - name: etcd
-        image: registry.k8s.io/etcd:v3.6.5
+        image: registry.k8s.io/etcd:v3.6.6

diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go
index c18adb9b1790a46cef19569815eaad6fb1390a6f..1cc2806a87f4590f79d4fa5f1a34f6e16a3b5010 100644 (file)
--- a/test/utils/image/manifest.go
+++ b/test/utils/image/manifest.go
@@ -215,7 +215,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
        configs[AppArmorLoader] = Config{list.PromoterE2eRegistry, "apparmor-loader", "1.4"}
        configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.37.0-1"}
        configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.8.6"}
-       configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.6.5-0"}
+       configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.6.6-0"}
        configs[InvalidRegistryImage] = Config{list.InvalidRegistry, "alpine", "3.1"}
        configs[IpcUtils] = Config{list.PromoterE2eRegistry, "ipc-utils", "1.3"}
        configs[JessieDnsutils] = Config{list.PromoterE2eRegistry, "jessie-dnsutils", "1.7"}