From 5833a83c512186822ac46c4c85a59833f5bd9610 Mon Sep 17 00:00:00 2001
From: Peter Rifel <pgrifel@gmail.com>
Date: Sun, 13 Oct 2024 20:03:59 -0500
Subject: [PATCH] Release 1.31.0-alpha.1

---
 Makefile                                             |  8 ++++----
 kops-version.go                                      |  4 ++--
 pkg/model/components/etcdmanager/model.go            |  2 +-
 .../components/etcdmanager/tests/interval/tasks.yaml | 12 ++++++------
 .../components/etcdmanager/tests/minimal/tasks.yaml  | 12 ++++++------
 .../etcdmanager/tests/overwrite_settings/tasks.yaml  | 12 ++++++------
 .../components/etcdmanager/tests/proxy/tasks.yaml    | 12 ++++++------
 pkg/model/components/kubeapiserver/model.go          |  2 +-
 .../kubeapiserver/tests/minimal/tasks.yaml           |  2 +-
 pkg/nodemodel/wellknownassets/kopsassets_test.go     |  8 ++++----
 ...ionalobjects.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...tionuserdata.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ander-custom.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ity-expander.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_complex.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ect_compress.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...t_containerd.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...t_containerd.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...3_object_123.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...existing-iam.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1b_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1c_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1b_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1c_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...t_existingsg.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1b_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1c_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1b_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1c_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  2 +-
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  2 +-
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...t_externallb.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...rnalpolicies.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...s3_object_ha.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1b_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1c_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1b_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1c_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...bject_ha-gce.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test1-a_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test1-b_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test1-c_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test1-a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test1-b_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test1-c_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test1-a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test1-a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ..._many-addons.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ..._minimal-aws.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  2 +-
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...minimal-etcd.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...minimal-ipv6.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...minimal-ipv6.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...minimal-ipv6.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...minimal-ipv6.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...name.minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...mal-warmpool.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test1-a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test1-a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ..._minimal-gce.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test1-a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test1-a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ..._minimal-gce.example.com-addons-bootstrap_content |  2 +-
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test1-a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test1-a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...imal-gce-ilb.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test1-a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test1-a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ry-long-name.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test1-a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test1-a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ry-long-name.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test1-a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test1-a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...imal-gce-plb.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test1-a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test1-a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...-gce-private.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...object_minimal.k8s.local-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...object_minimal.k8s.local-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ..._manifests-etcdmanager-events-master-fsn1_content |  6 +++---
 ...ct_manifests-etcdmanager-main-master-fsn1_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  2 +-
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...etcdmanager-events-control-plane-fr-par-1_content |  6 +++---
 ...s-etcdmanager-main-control-plane-fr-par-1_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ct_scw-minimal.k8s.local-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1b_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1c_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1b_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1c_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...xedinstances.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1b_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1c_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1b_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1c_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...xedinstances.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...gclustername.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...gclustername.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...te-shared-ip.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...hared-subnet.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...rivatecalico.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...privatecanal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...rivatecilium.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...rivatecilium.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...rivatecilium.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-cilium-master-us-test-1a_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...liumadvanced.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ..._privatedns1.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ..._privatedns2.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ivateflannel.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...rivatekopeio.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...sharedsubnet.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ct_sharedvpc.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...minimal-ipv6.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ct_unmanaged.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 ...ests-etcdmanager-events-master-us-test-1a_content |  6 +++---
 ...ifests-etcdmanager-main-master-us-test-1a_content |  6 +++---
 ...nifests-static-kube-apiserver-healthcheck_content |  2 +-
 ...ject_minimal.example.com-addons-bootstrap_content |  4 ++--
 ...ons-dns-controller.addons.k8s.io-k8s-1.12_content |  6 +++---
 ...ns-kops-controller.addons.k8s.io-k8s-1.16_content |  6 +++---
 .../amazonvpc-containerd/manifest.yaml               |  4 ++--
 .../bootstrapchannelbuilder/amazonvpc/manifest.yaml  |  4 ++--
 .../awscloudcontroller/manifest.yaml                 |  4 ++--
 .../awsiamauthenticator/crd/manifest.yaml            |  4 ++--
 .../awsiamauthenticator/mappings/manifest.yaml       |  4 ++--
 .../kops-controller.addons.k8s.io-k8s-1.16.yaml      |  6 +++---
 .../bootstrapchannelbuilder/cilium/manifest.yaml     |  4 ++--
 .../bootstrapchannelbuilder/coredns/manifest.yaml    |  4 ++--
 .../metrics-server/insecure-1.19/manifest.yaml       |  4 ++--
 .../metrics-server/secure-1.19/manifest.yaml         |  4 ++--
 .../dns-controller.addons.k8s.io-k8s-1.12.yaml       |  6 +++---
 .../kops-controller.addons.k8s.io-k8s-1.16.yaml      |  6 +++---
 .../service-account-iam/manifest.yaml                |  4 ++--
 .../kops-controller.addons.k8s.io-k8s-1.16.yaml      |  6 +++---
 .../bootstrapchannelbuilder/simple/manifest.yaml     |  4 ++--
 507 files changed, 1281 insertions(+), 1281 deletions(-)

diff --git a/Makefile b/Makefile
index c8df0eca16954..55c2fa51a5349 100644
--- a/Makefile
+++ b/Makefile
@@ -66,16 +66,16 @@ GITSHA := $(shell cd ${KOPS_ROOT}; git describe --always)
 # We lock the versions of our controllers also
 # We need to keep in sync with:
 #   pkg/model/components/etcdmanager/model.go
-KOPS_UTILS_CP_TAG=1.30.0-beta.1
+KOPS_UTILS_CP_TAG=1.31.0-alpha.1
 KOPS_UTILS_CP_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_UTILS_CP_TAG | awk '{print $$2}')
 #   upup/models/cloudup/resources/addons/dns-controller/
-DNS_CONTROLLER_TAG=1.30.0-beta.1
+DNS_CONTROLLER_TAG=1.31.0-alpha.1
 DNS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_DNS_CONTROLLER_TAG | awk '{print $$2}')
 #   upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
-KOPS_CONTROLLER_TAG=1.30.0-beta.1
+KOPS_CONTROLLER_TAG=1.31.0-alpha.1
 KOPS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_CONTROLLER_TAG | awk '{print $$2}')
 #   pkg/model/components/kubeapiserver/model.go
-KUBE_APISERVER_HEALTHCHECK_TAG=1.30.0-beta.1
+KUBE_APISERVER_HEALTHCHECK_TAG=1.31.0-alpha.1
 KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}')
 
 CGO_ENABLED=0
diff --git a/kops-version.go b/kops-version.go
index 0d2ff6d129d9a..d391d2a2a8ae5 100644
--- a/kops-version.go
+++ b/kops-version.go
@@ -21,8 +21,8 @@ var Version = KOPS_RELEASE_VERSION
 
 // These constants are parsed by build tooling - be careful about changing the formats
 const (
-	KOPS_RELEASE_VERSION = "1.30.0-beta.1"
-	KOPS_CI_VERSION      = "1.30.0-beta.2"
+	KOPS_RELEASE_VERSION = "1.31.0-alpha.1"
+	KOPS_CI_VERSION      = "1.31.0-alpha.2"
 )
 
 // GitVersion should be replaced by the makefile
diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go
index bcd2460129a33..73c9d2d9fbd54 100644
--- a/pkg/model/components/etcdmanager/model.go
+++ b/pkg/model/components/etcdmanager/model.go
@@ -208,7 +208,7 @@ spec:
     emptyDir: {}
 `
 
-const kopsUtilsImage = "registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1"
+const kopsUtilsImage = "registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1"
 
 // buildPod creates the pod spec, based on the EtcdClusterSpec
 func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instanceGroupName string) (*v1.Pod, error) {
diff --git a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml
index 35c342b10dc33..f3c4d5da66e0f 100644
--- a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml
+++ b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml
@@ -113,7 +113,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -150,7 +150,7 @@ Contents: |
       - --src=/opt/etcd-v3.4.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -169,7 +169,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: init-etcd-symlinks-3-5-13
       resources: {}
       volumeMounts:
@@ -254,7 +254,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -291,7 +291,7 @@ Contents: |
       - --src=/opt/etcd-v3.4.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -310,7 +310,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: init-etcd-symlinks-3-5-13
       resources: {}
       volumeMounts:
diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
index 7e9a717d39afd..e0e3521c69f91 100644
--- a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
+++ b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
@@ -112,7 +112,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -149,7 +149,7 @@ Contents: |
       - --src=/opt/etcd-v3.4.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -168,7 +168,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: init-etcd-symlinks-3-5-13
       resources: {}
       volumeMounts:
@@ -252,7 +252,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -289,7 +289,7 @@ Contents: |
       - --src=/opt/etcd-v3.4.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -308,7 +308,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: init-etcd-symlinks-3-5-13
       resources: {}
       volumeMounts:
diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml
index 138f6a71ccc3d..b1a13241017de 100644
--- a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml
+++ b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml
@@ -115,7 +115,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -152,7 +152,7 @@ Contents: |
       - --src=/opt/etcd-v3.4.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -171,7 +171,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: init-etcd-symlinks-3-5-13
       resources: {}
       volumeMounts:
@@ -258,7 +258,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -295,7 +295,7 @@ Contents: |
       - --src=/opt/etcd-v3.4.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -314,7 +314,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: init-etcd-symlinks-3-5-13
       resources: {}
       volumeMounts:
diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
index 2341560e3fe31..aed5504549211 100644
--- a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
+++ b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
@@ -121,7 +121,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -158,7 +158,7 @@ Contents: |
       - --src=/opt/etcd-v3.4.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -177,7 +177,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: init-etcd-symlinks-3-5-13
       resources: {}
       volumeMounts:
@@ -270,7 +270,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -307,7 +307,7 @@ Contents: |
       - --src=/opt/etcd-v3.4.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -326,7 +326,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
       name: init-etcd-symlinks-3-5-13
       resources: {}
       volumeMounts:
diff --git a/pkg/model/components/kubeapiserver/model.go b/pkg/model/components/kubeapiserver/model.go
index e8f9e440324e4..ac8c8bcccb9a8 100644
--- a/pkg/model/components/kubeapiserver/model.go
+++ b/pkg/model/components/kubeapiserver/model.go
@@ -80,7 +80,7 @@ kind: Pod
 spec:
   containers:
   - name: healthcheck
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         # The sidecar serves a healthcheck on the same port,
diff --git a/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml b/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml
index 21b9f53672123..429d7b9535f2c 100644
--- a/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml
+++ b/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml
@@ -10,7 +10,7 @@ Contents: |
       - --ca-cert=/secrets/ca.crt
       - --client-cert=/secrets/client.crt
       - --client-key=/secrets/client.key
-      image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+      image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
       livenessProbe:
         httpGet:
           host: 127.0.0.1
diff --git a/pkg/nodemodel/wellknownassets/kopsassets_test.go b/pkg/nodemodel/wellknownassets/kopsassets_test.go
index dcb651e207cfe..24052cdb1c31f 100644
--- a/pkg/nodemodel/wellknownassets/kopsassets_test.go
+++ b/pkg/nodemodel/wellknownassets/kopsassets_test.go
@@ -36,15 +36,15 @@ func Test_BuildMirroredAsset(t *testing.T) {
 		{
 			url: "https://artifacts.k8s.io/binaries/kops/%s/linux/amd64/nodeup",
 			expected: []string{
-				"https://artifacts.k8s.io/binaries/kops/1.30.0-beta.1/linux/amd64/nodeup",
-				"https://github.com/kubernetes/kops/releases/download/v1.30.0-beta.1/nodeup-linux-amd64",
+				"https://artifacts.k8s.io/binaries/kops/1.31.0-alpha.1/linux/amd64/nodeup",
+				"https://github.com/kubernetes/kops/releases/download/v1.31.0-alpha.1/nodeup-linux-amd64",
 			},
 		},
 		{
 			url: "https://artifacts.k8s.io/binaries/kops/%s/linux/arm64/nodeup",
 			expected: []string{
-				"https://artifacts.k8s.io/binaries/kops/1.30.0-beta.1/linux/arm64/nodeup",
-				"https://github.com/kubernetes/kops/releases/download/v1.30.0-beta.1/nodeup-linux-arm64",
+				"https://artifacts.k8s.io/binaries/kops/1.31.0-alpha.1/linux/arm64/nodeup",
+				"https://github.com/kubernetes/kops/releases/download/v1.31.0-alpha.1/nodeup-linux-arm64",
 			},
 		},
 	}
diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content
index 4086aeb23a119..0571c566cb768 100644
--- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: bdd7788b90e81b9831e80a314b649dda3afd3ebee217edcf0333bc8430f29216
+    manifestHash: d05656aca43741a21a191156b08bb24cde5f95bc66a434dddd3b26d2f2a368e1
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 16ab94dbaf65f..79f63cff97ec9 100644
--- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 52b8c18860d78..e33fb12720715 100644
--- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 59c75014cd2b8..75f371f20d6ff 100644
--- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 62ef72a90486b..8b9feab01c955 100644
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -51,7 +51,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -88,7 +88,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -107,7 +107,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 7cc266f5a8e1c..6fa48a6dd657b 100644
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -51,7 +51,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -88,7 +88,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -107,7 +107,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index e5d0e3d50ceee..a52b61f9d5967 100644
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 58397efeda2ae415a348c18dab0ac843f063aa4dec186af3ec002e78e043f142
+    manifestHash: d13ca01b4fcda8b73d5ab63cf7dbc7b1ac67cdc5f4841dcb35d699dc5cf41095
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 7731cf0dd9143..0115c2cee94ea 100644
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 96fd061bfd11a..8b2f16dd7ae7d 100644
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index adc76d6d955a7..dbaeb7e797324 100644
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index 8420d8a6518bf..342aaf8f3623d 100644
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 0fe87d491cfdff3b8e852ab534287c05d626f770ebc89539d1040ecc0ea8a9e3
+    manifestHash: e82de07a9607b85f85f2785a2e4e279d3becf70ea50ba43b52a24763dd97340f
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: a9d084b5c852b48b99112a4da96253d9684c675817c861db9bbcf73dd599955c
+    manifestHash: 8dd0ae8f950193422af3d9ebb1339bb7ffe0da0dedefddd00c5fe0bf45c1d5b0
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index 7fb7cc4f8f5d0..6f99b7b7e58b4 100644
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -51,7 +51,7 @@ spec:
           value: arn:aws-test:iam::123456789012:role/dns-controller.kube-system.sa.minimal.example.com
         - name: AWS_WEB_IDENTITY_TOKEN_FILE
           value: /var/run/secrets/amazonaws.com/token
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index b728a3c6ae2b9..2a6fbf78aa350 100644
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content
index 30c2570375ec5..6673ea3fabea3 100644
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 7d3ba153738a689a17496dea8dcdc732119b16e3164b60827317e0370e795dae
+    manifestHash: 87e60fe9fc940a6745544b77ce7fdb5327469fe14b127bc28b16e8495a6cb02c
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 2562bbce46f1a..c130ffd92cbcc 100644
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 61db43de7b796..445301ef86f96 100644
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index cecfa92e07d5c..825640615727d 100644
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content
index 2977be1f33e7c..2aada29a12ec3 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: e6b05f492b8807018d2eb2dcd50b21abfa7e237417fe461065f1864c95696362
+    manifestHash: e420dc22f1b6f8e3b0e7f4efcedefa19b28f1d691b6cd6a5ffb1c813e39531d1
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index ca4ddff3bb1c4..f7954bd14fc06 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 9274f3b2fc94d..03943fe67988d 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index eeb99f79facec..74a214d169225 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content
index 021b479b2c05a..1717d8e88149e 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: d6e187ec0285a543666cdc59c068f119230ea1e4b7f1a00b7f7be4ff94d01fa6
+    manifestHash: 29014c0298c0944a8c1a6f11885ee867134abb013c547e2e4e0212417fd3c0a8
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 5fe1aab9e6fa4..d86203e788a49 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 87ba67e31ff9e..72667f8dd68a0 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 149b205c16ff5..04bfbe5fa3a5e 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content
index 5bd8e97505e54..1e2af0eb5ab2e 100644
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: dc99f98c2b763dd52fc170702235596069a73ffa40d3974710cdc90aaf02307c
+    manifestHash: dab76239387f3bf7c746570b03a6bc6fee7a883e475e6f0f747c898f014581b5
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 8d9f47a5dc7d5..6778da04ab7e2 100644
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index c20e25d8ebdcd..b13493149a829 100644
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index e7f93fc74c677..2ab1611111535 100644
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content
index f21808f43c67a..8edc9d016a345 100644
--- a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: be18232ea2f5d63194b0bd27b2b2af09d29aa1728fe3263e044222f7b27aa93f
+    manifestHash: 5dd56effb57f61aa559f05d4da36aef679ec3a4a48c73a7b5b8610acad86dc17
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index d7acf75132ae0..990fd5063e9d5 100644
--- a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 47ec1e716c5fe..bcf57a21bdb1f 100644
--- a/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index c71eaaefe4dab..e76f969376895 100644
--- a/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content
index 600a43972096d..a3da5830945a3 100644
--- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: b5b5ca07c9ff1b69c4f36900d3dec6b245c34478231f091199e2a84897290ede
+    manifestHash: 43591f5c69ab2e4bc6286cdbbb6ad9fe95ccc605d7c929ddb48f7ea937cbe942
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 2a923f0767e96..542a83c18b684 100644
--- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 3f8d995198ebc..3cb89f934c014 100644
--- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 9f84e86617679..4885ff7615495 100644
--- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content
index 600a43972096d..a3da5830945a3 100644
--- a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: b5b5ca07c9ff1b69c4f36900d3dec6b245c34478231f091199e2a84897290ede
+    manifestHash: 43591f5c69ab2e4bc6286cdbbb6ad9fe95ccc605d7c929ddb48f7ea937cbe942
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 2a923f0767e96..542a83c18b684 100644
--- a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 3f8d995198ebc..3cb89f934c014 100644
--- a/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 9f84e86617679..4885ff7615495 100644
--- a/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content
index 2ff0f006aa6c9..863478f2b84e0 100644
--- a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 43026f7ca291b2fb6dc8b16541163ba26185a5e99f42607fa3097ffd3de9b5a8
+    manifestHash: ace7a3239f2eea938b6c011c888e349e3c434d179d150d23ada3db7e855dc72a
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 19a9a9c55596a..d1a0f19c66e19 100644
--- a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 681dcafa5a8a1..5c26560274a0b 100644
--- a/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 445d3611fa354..7f02ddb73d3dc 100644
--- a/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content
index 5fd2463a09e30..f1a512e3e6fb3 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: ee107be13b1429a8c2c55018ce5d35cb13840ff9b2f63d3ff66aae64c707687a
+    manifestHash: c5dbeed6c293f9db87197adbd23394b91c6253d516e70817db1c360ae1933528
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 2378346047959..f34709938c1ce 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 4c39c86fb2f02..4721cb3b4918c 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
index 4c39c86fb2f02..4721cb3b4918c 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
index 4c39c86fb2f02..4721cb3b4918c 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 0a92c33cb2f56..ea32d894e713b 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
index 0a92c33cb2f56..ea32d894e713b 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
index 0a92c33cb2f56..ea32d894e713b 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content
index 21c559dd55617..20d2317796a32 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 273b9cb546c32219aa182d8c16f27f1fc30b3dfb75ff8ebda9f7706822781edc
+    manifestHash: 0b13da80f962a1da531c3e3fa23c9c1956b70801c5b0629cc7200e21939e4c82
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 949062f9460f8..1f0cceb81e7ee 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index a4f8ca128a3e7..271b11255fffa 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
index a4f8ca128a3e7..271b11255fffa 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
index a4f8ca128a3e7..271b11255fffa 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index dd89dfbe9c80b..a7d0caa3137be 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
index dd89dfbe9c80b..a7d0caa3137be 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
index dd89dfbe9c80b..a7d0caa3137be 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 96fd061bfd11a..8b2f16dd7ae7d 100644
--- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index adc76d6d955a7..dbaeb7e797324 100644
--- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index 41509df1f946a..28e239176785d 100644
--- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 0fe87d491cfdff3b8e852ab534287c05d626f770ebc89539d1040ecc0ea8a9e3
+    manifestHash: e82de07a9607b85f85f2785a2e4e279d3becf70ea50ba43b52a24763dd97340f
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index b728a3c6ae2b9..2a6fbf78aa350 100644
--- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 96fd061bfd11a..8b2f16dd7ae7d 100644
--- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index adc76d6d955a7..dbaeb7e797324 100644
--- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index 52f505621cd54..e3fc8086ac041 100644
--- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 0fe87d491cfdff3b8e852ab534287c05d626f770ebc89539d1040ecc0ea8a9e3
+    manifestHash: e82de07a9607b85f85f2785a2e4e279d3becf70ea50ba43b52a24763dd97340f
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index b728a3c6ae2b9..2a6fbf78aa350 100644
--- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content
index bb1b3293c2201..031bf728b1fbf 100644
--- a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: a008f3745ac1fd937497b425e85e1f1871ee40c3422774dbe81813e5e4b26512
+    manifestHash: 4a5d71fd7e1d6519af8f11c3466dd6c79d23081f81aba53c88b7ae16d75dcca5
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 7d5e4ee1617fb..b9af3407e1120 100644
--- a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 3d82bfa81bd9f..5f15ac032175a 100644
--- a/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 50bb453faeef1..f2a8a0f141c0c 100644
--- a/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content
index 5c0b6b3921458..d10d52b686860 100644
--- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: c9df5744ec8edadcf5a462e39cc9ed044e0789648cfeb0a3b95204bd8643d72d
+    manifestHash: 78e73a85ddbae1fea5d105598f9751467d9c41d239f82609fec68f6a5212bb05
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 072f30c8d4331..8949d52fc6009 100644
--- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index c1f4bc2719be1..99290539a9aea 100644
--- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 96cc9415682fb..8d5c507eacf7a 100644
--- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content
index 57e50826e0619..711e4ab6211f3 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 8fa5e8faa6786fd2ca907b1749a2fbb2cdd944c6b7699c7b93c9b11234c3a4c4
+    manifestHash: 9daeb49d96aa1fd305109a353b26e730250e9d0aec754cec18132b271d18730c
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 8e31f46552494..2b8ce75d5559b 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 85761888f2ced..ce8a29a567989 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
index 85761888f2ced..ce8a29a567989 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
index 85761888f2ced..ce8a29a567989 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 8e971cd5a26fe..7fb7ea4462276 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
index 8e971cd5a26fe..7fb7ea4462276 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
index 8e971cd5a26fe..7fb7ea4462276 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content
index 6cad13463b236..21576f015d4dd 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: b59f180b375e4218b37ca46725d591cffaf1da8a873299737e49765e5ada96f4
+    manifestHash: 8db2d58855ca8dec04b8e9bd8123933838f9ff809933dfcf4b692c1b890f4308
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 6350b0de2ffb762f97fe83e9d9520a64e9d65a97baf547eded729a52945cc8d4
+    manifestHash: a2e589f6395418e39b78d5485cb4ba5b601ade9d48e688d8388ad6b16b0258b1
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index d724a4d14251f..5a869b537b97f 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index d25d0fa848319..9a936879eb331 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
index 8ab144b4f1119..4668d1f11398f 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content
index 8ab144b4f1119..4668d1f11398f 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content
index 8ab144b4f1119..4668d1f11398f 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
index 71f3b4f4b4e38..2a899821c6693 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content
index 71f3b4f4b4e38..2a899821c6693 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content
index 71f3b4f4b4e38..2a899821c6693 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 96fd061bfd11a..8b2f16dd7ae7d 100644
--- a/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index adc76d6d955a7..dbaeb7e797324 100644
--- a/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index debace317bc21..a4396abaf4a01 100644
--- a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 0fe87d491cfdff3b8e852ab534287c05d626f770ebc89539d1040ecc0ea8a9e3
+    manifestHash: e82de07a9607b85f85f2785a2e4e279d3becf70ea50ba43b52a24763dd97340f
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index b728a3c6ae2b9..2a6fbf78aa350 100644
--- a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 96fd061bfd11a..8b2f16dd7ae7d 100644
--- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index adc76d6d955a7..dbaeb7e797324 100644
--- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index 645a618d3c199..e495481a7c3b8 100644
--- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 0fe87d491cfdff3b8e852ab534287c05d626f770ebc89539d1040ecc0ea8a9e3
+    manifestHash: e82de07a9607b85f85f2785a2e4e279d3becf70ea50ba43b52a24763dd97340f
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -41,7 +41,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: a9d084b5c852b48b99112a4da96253d9684c675817c861db9bbcf73dd599955c
+    manifestHash: 8dd0ae8f950193422af3d9ebb1339bb7ffe0da0dedefddd00c5fe0bf45c1d5b0
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index 7fb7cc4f8f5d0..6f99b7b7e58b4 100644
--- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -51,7 +51,7 @@ spec:
           value: arn:aws-test:iam::123456789012:role/dns-controller.kube-system.sa.minimal.example.com
         - name: AWS_WEB_IDENTITY_TOKEN_FILE
           value: /var/run/secrets/amazonaws.com/token
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index b728a3c6ae2b9..2a6fbf78aa350 100644
--- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 96fd061bfd11a..8b2f16dd7ae7d 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index adc76d6d955a7..dbaeb7e797324 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index 289bdb57aed81..c8a5f17e5645e 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 0fe87d491cfdff3b8e852ab534287c05d626f770ebc89539d1040ecc0ea8a9e3
+    manifestHash: e82de07a9607b85f85f2785a2e4e279d3becf70ea50ba43b52a24763dd97340f
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: a9d084b5c852b48b99112a4da96253d9684c675817c861db9bbcf73dd599955c
+    manifestHash: 8dd0ae8f950193422af3d9ebb1339bb7ffe0da0dedefddd00c5fe0bf45c1d5b0
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index 7fb7cc4f8f5d0..6f99b7b7e58b4 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -51,7 +51,7 @@ spec:
           value: arn:aws-test:iam::123456789012:role/dns-controller.kube-system.sa.minimal.example.com
         - name: AWS_WEB_IDENTITY_TOKEN_FILE
           value: /var/run/secrets/amazonaws.com/token
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index b728a3c6ae2b9..2a6fbf78aa350 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 96fd061bfd11a..8b2f16dd7ae7d 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index adc76d6d955a7..dbaeb7e797324 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index 12ba2700170fb..099cf12b79362 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 0fe87d491cfdff3b8e852ab534287c05d626f770ebc89539d1040ecc0ea8a9e3
+    manifestHash: e82de07a9607b85f85f2785a2e4e279d3becf70ea50ba43b52a24763dd97340f
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -41,7 +41,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: a9d084b5c852b48b99112a4da96253d9684c675817c861db9bbcf73dd599955c
+    manifestHash: 8dd0ae8f950193422af3d9ebb1339bb7ffe0da0dedefddd00c5fe0bf45c1d5b0
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index 7fb7cc4f8f5d0..6f99b7b7e58b4 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -51,7 +51,7 @@ spec:
           value: arn:aws-test:iam::123456789012:role/dns-controller.kube-system.sa.minimal.example.com
         - name: AWS_WEB_IDENTITY_TOKEN_FILE
           value: /var/run/secrets/amazonaws.com/token
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index b728a3c6ae2b9..2a6fbf78aa350 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 96fd061bfd11a..8b2f16dd7ae7d 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index adc76d6d955a7..dbaeb7e797324 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index 5d24b867a752a..63120f3d7721d 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 5cc76e4f163436155d991177782cfeb66a0e77f0e8cbf573552e99beaa80d33d
+    manifestHash: c824c7f619f57a0f8bdb7343b9c8f62b952a0446a9f6b7e43c50ecaff8c27e0c
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: a9d084b5c852b48b99112a4da96253d9684c675817c861db9bbcf73dd599955c
+    manifestHash: 8dd0ae8f950193422af3d9ebb1339bb7ffe0da0dedefddd00c5fe0bf45c1d5b0
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index 7fb7cc4f8f5d0..6f99b7b7e58b4 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -51,7 +51,7 @@ spec:
           value: arn:aws-test:iam::123456789012:role/dns-controller.kube-system.sa.minimal.example.com
         - name: AWS_WEB_IDENTITY_TOKEN_FILE
           value: /var/run/secrets/amazonaws.com/token
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index f5b6ce6382488..de3cb3610522f 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -65,7 +65,7 @@ spec:
           value: 127.0.0.1
         - name: KOPS_RUN_TOO_NEW_VERSION
           value: "1"
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 96fd061bfd11a..8b2f16dd7ae7d 100644
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index adc76d6d955a7..dbaeb7e797324 100644
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index 50105f737e876..0db25c471dfe4 100644
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 0fe87d491cfdff3b8e852ab534287c05d626f770ebc89539d1040ecc0ea8a9e3
+    manifestHash: e82de07a9607b85f85f2785a2e4e279d3becf70ea50ba43b52a24763dd97340f
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index b728a3c6ae2b9..2a6fbf78aa350 100644
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
index e4b924a0f0be3..697c5c0b92ec3 100644
--- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
+++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
index 77866a8979209..711623ff0cd2c 100644
--- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
+++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index dca7fcec042b8..88078efc26fd6 100644
--- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 95c5291643ca51cbc8906dacc7abe69e42e2450d11bf5526e621f7efcfdaa7db
+    manifestHash: 389f03af87472533071803c99b93a67d99b80f27da7ae6a59fd731e8ed5f87d6
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 6350b0de2ffb762f97fe83e9d9520a64e9d65a97baf547eded729a52945cc8d4
+    manifestHash: a2e589f6395418e39b78d5485cb4ba5b601ade9d48e688d8388ad6b16b0258b1
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index d724a4d14251f..5a869b537b97f 100644
--- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index f49275c8f22ee..6cbfbfdf035d5 100644
--- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -65,7 +65,7 @@ spec:
           value: 127.0.0.1
         - name: KOPS_RUN_TOO_NEW_VERSION
           value: "1"
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 5b893754c393d..399c7e03461fb 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 7bc2a2d7bff55..f07683a5d0cd3 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content
index b240bea1da441..ef19089f31031 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 61ebcca7b31e45b98c498867e20c10d78cba3ce042ed800f65c62893a68f0c9a
+    manifestHash: e001e3a28aa2e949aec6282c7629a4b5d23f5f4787d5b5d4818eb97d13813cd7
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 73f7deabf8d5b..9a2ed87eaa779 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 5eebb33f4bc79..880e2b60714a4 100644
--- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 1911a9248d08f..0b27d9800f44b 100644
--- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index 58069160653c2..c1639b7d102ce 100644
--- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 85fe1f13e8c8a0d95f2724fc3dd0a9ff10f168408891a16ed12175426116b4b2
+    manifestHash: 441bd95df82401f79810f51bb70df33f2a9e8948b31d08664ace2355aac1d61f
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -41,7 +41,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 4dc91b91f255f..411a583672051 100644
--- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 5eebb33f4bc79..880e2b60714a4 100644
--- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 1911a9248d08f..0b27d9800f44b 100644
--- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index f4385338b5ea4..28547ba6bd246 100644
--- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: b433eae299dc78783ef4992caa6faa3065fbd8af93dad6ee047d669402af3820
+    manifestHash: 749e0a247f7fce996e430aa355baf4057fcf154711c998fa623b06991f9950e1
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 09d9334409f82..89ae3a54df6dc 100644
--- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -65,7 +65,7 @@ spec:
           value: 127.0.0.1
         - name: KOPS_RUN_TOO_NEW_VERSION
           value: "1"
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 5eebb33f4bc79..880e2b60714a4 100644
--- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 1911a9248d08f..0b27d9800f44b 100644
--- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index d37c62dca19db..b7a954e0209e6 100644
--- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: b433eae299dc78783ef4992caa6faa3065fbd8af93dad6ee047d669402af3820
+    manifestHash: 749e0a247f7fce996e430aa355baf4057fcf154711c998fa623b06991f9950e1
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 09d9334409f82..89ae3a54df6dc 100644
--- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -65,7 +65,7 @@ spec:
           value: 127.0.0.1
         - name: KOPS_RUN_TOO_NEW_VERSION
           value: "1"
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 5eebb33f4bc79..880e2b60714a4 100644
--- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 1911a9248d08f..0b27d9800f44b 100644
--- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index a53627d6edfa0..420e818e73efe 100644
--- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: b433eae299dc78783ef4992caa6faa3065fbd8af93dad6ee047d669402af3820
+    manifestHash: 749e0a247f7fce996e430aa355baf4057fcf154711c998fa623b06991f9950e1
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 09d9334409f82..89ae3a54df6dc 100644
--- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -65,7 +65,7 @@ spec:
           value: 127.0.0.1
         - name: KOPS_RUN_TOO_NEW_VERSION
           value: "1"
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 5eebb33f4bc79..880e2b60714a4 100644
--- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 1911a9248d08f..0b27d9800f44b 100644
--- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index db1514fa6c297..fd5d76c000335 100644
--- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: b433eae299dc78783ef4992caa6faa3065fbd8af93dad6ee047d669402af3820
+    manifestHash: 749e0a247f7fce996e430aa355baf4057fcf154711c998fa623b06991f9950e1
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 09d9334409f82..89ae3a54df6dc 100644
--- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -65,7 +65,7 @@ spec:
           value: 127.0.0.1
         - name: KOPS_RUN_TOO_NEW_VERSION
           value: "1"
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 5eebb33f4bc79..880e2b60714a4 100644
--- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 1911a9248d08f..0b27d9800f44b 100644
--- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index d1336304f8566..fe750473c1f6f 100644
--- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: b433eae299dc78783ef4992caa6faa3065fbd8af93dad6ee047d669402af3820
+    manifestHash: 749e0a247f7fce996e430aa355baf4057fcf154711c998fa623b06991f9950e1
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 09d9334409f82..89ae3a54df6dc 100644
--- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -65,7 +65,7 @@ spec:
           value: 127.0.0.1
         - name: KOPS_RUN_TOO_NEW_VERSION
           value: "1"
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 346c9d32f4582..d7b647d446f78 100644
--- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index d3c8879196ebd..1609f2c259ada 100644
--- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content
index c367ed39bbbf3..47e41f7ff9fad 100644
--- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: b87873d5c315658b66ae540bb22bd684ca27a91876ae743d7fd1ed22a04b2a3a
+    manifestHash: 455289adcc20d33791ad51ecdb249bd884e5068f3e4ea315807d6ed64fd669d7
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index a9ae0d007a2a9..be7f114fb60c5 100644
--- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 5eebb33f4bc79..880e2b60714a4 100644
--- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 1911a9248d08f..0b27d9800f44b 100644
--- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index 9486d5bedfa87..3585007f021da 100644
--- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: b433eae299dc78783ef4992caa6faa3065fbd8af93dad6ee047d669402af3820
+    manifestHash: 749e0a247f7fce996e430aa355baf4057fcf154711c998fa623b06991f9950e1
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 09d9334409f82..89ae3a54df6dc 100644
--- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -65,7 +65,7 @@ spec:
           value: 127.0.0.1
         - name: KOPS_RUN_TOO_NEW_VERSION
           value: "1"
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index d895b21a1be97..98aba1f4d61e2 100644
--- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -51,7 +51,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -88,7 +88,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -107,7 +107,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index f913c64a8b08f..36897b04fa02a 100644
--- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content
index 3e54c72719002..ecb362cde4345 100644
--- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 70e5e6fed41123970e084f3182ea97035ba090438096491ba65018796546504e
+    manifestHash: 4064ae411ef69451c6177995f490cced97219a921bbf4f886c7273d1f715c7cd
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 274edab1f2290..528fdb89e1a10 100644
--- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 96fd061bfd11a..8b2f16dd7ae7d 100644
--- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index adc76d6d955a7..dbaeb7e797324 100644
--- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index 2215d13e3a1ac..3f27168f365a5 100644
--- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 0fe87d491cfdff3b8e852ab534287c05d626f770ebc89539d1040ecc0ea8a9e3
+    manifestHash: e82de07a9607b85f85f2785a2e4e279d3becf70ea50ba43b52a24763dd97340f
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index b728a3c6ae2b9..2a6fbf78aa350 100644
--- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 29d85af00f29c..4981cf6c64e5b 100644
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index a284a07dfecc0..989557ebc3a25 100644
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
index 17800b7d63e92..89aff80afb8e4 100644
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 9db2bf7e3133b77c19b89463a1ef93bacf851fd2861e2cd5b3905b6e5b61dc63
+    manifestHash: fd4f0491acc25fa3ed6f59ec4646fd47b78f1828ce40e0de4fcf07037d5d54ab
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -41,7 +41,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 67455f7eddab6bc3038fa48fa5db7baf596c384bd2f1ff04d670a1d73a8686dd
+    manifestHash: 09f93d01927bc0c62fcf0dadca57d8210b8218a810b8b559bbcb973da5232332
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index eccfa2a28c25c..0b9e84049dc8a 100644
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 28c091907c691..a1429c0f7f0dc 100644
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 29d85af00f29c..4981cf6c64e5b 100644
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index a284a07dfecc0..989557ebc3a25 100644
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
index 7e8022cef0bd4..53f90bd80cd99 100644
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 9db2bf7e3133b77c19b89463a1ef93bacf851fd2861e2cd5b3905b6e5b61dc63
+    manifestHash: fd4f0491acc25fa3ed6f59ec4646fd47b78f1828ce40e0de4fcf07037d5d54ab
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -41,7 +41,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 67455f7eddab6bc3038fa48fa5db7baf596c384bd2f1ff04d670a1d73a8686dd
+    manifestHash: 09f93d01927bc0c62fcf0dadca57d8210b8218a810b8b559bbcb973da5232332
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index eccfa2a28c25c..0b9e84049dc8a 100644
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 28c091907c691..a1429c0f7f0dc 100644
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 29d85af00f29c..4981cf6c64e5b 100644
--- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index a284a07dfecc0..989557ebc3a25 100644
--- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
index 51805fca637ed..fa57acb153a08 100644
--- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 9db2bf7e3133b77c19b89463a1ef93bacf851fd2861e2cd5b3905b6e5b61dc63
+    manifestHash: fd4f0491acc25fa3ed6f59ec4646fd47b78f1828ce40e0de4fcf07037d5d54ab
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -41,7 +41,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 67455f7eddab6bc3038fa48fa5db7baf596c384bd2f1ff04d670a1d73a8686dd
+    manifestHash: 09f93d01927bc0c62fcf0dadca57d8210b8218a810b8b559bbcb973da5232332
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index eccfa2a28c25c..0b9e84049dc8a 100644
--- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 28c091907c691..a1429c0f7f0dc 100644
--- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 29d85af00f29c..4981cf6c64e5b 100644
--- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index a284a07dfecc0..989557ebc3a25 100644
--- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
index 51805fca637ed..fa57acb153a08 100644
--- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 9db2bf7e3133b77c19b89463a1ef93bacf851fd2861e2cd5b3905b6e5b61dc63
+    manifestHash: fd4f0491acc25fa3ed6f59ec4646fd47b78f1828ce40e0de4fcf07037d5d54ab
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -41,7 +41,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 67455f7eddab6bc3038fa48fa5db7baf596c384bd2f1ff04d670a1d73a8686dd
+    manifestHash: 09f93d01927bc0c62fcf0dadca57d8210b8218a810b8b559bbcb973da5232332
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index eccfa2a28c25c..0b9e84049dc8a 100644
--- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 28c091907c691..a1429c0f7f0dc 100644
--- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 6602cb6ab9812..bcd9381698b15 100644
--- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index a82bb1c6c6172..f59cca47cf333 100644
--- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content
index 6f72e70ab7fbb..13f9dd33fc6e8 100644
--- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 8009db170aefada73a34e17f4d18236681f0bac6b32362d186e6c4eca8f1199f
+    manifestHash: c61ca42f841720173891b47ede3b24165f877aed99f559418ddb6372f03eddd8
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 4e897b8305052..befadab14d5c5 100644
--- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index e419e482fdc15..e1fc1b117fa7b 100644
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 43f9475face2e..7d8fc73e0a659 100644
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content
index ccedd3450410e..71cf111643e28 100644
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 3b757e01d45a3fe54d84a56f8a60e3078a46f80af75745c646a1d4ccba069ae2
+    manifestHash: cb99937050518fa90cee4cf6a0fd5b3f0ff6a474af214d0cf6af2799d6ce6481
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index ff4b73ce716ad..732648c842335 100644
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
index b3c9cf005f5e2..5597da3106ec0 100644
--- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
index 97726fb612bb7..ae3b080538dd3 100644
--- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content
index 03ffd34777fe1..bd4b148f81266 100644
--- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 56f4515ea378b3e406e14f5cbc124ae95be34d31a3192dac7bf74cd430d8eeb1
+    manifestHash: 0d1ffb7e112af9c6e824986722b4370875a0ae054f23a6d8ea50fbeb0c60844a
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 6350b0de2ffb762f97fe83e9d9520a64e9d65a97baf547eded729a52945cc8d4
+    manifestHash: a2e589f6395418e39b78d5485cb4ba5b601ade9d48e688d8388ad6b16b0258b1
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index d724a4d14251f..5a869b537b97f 100644
--- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 854608c464d13..e24ef8e747586 100644
--- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
index b3c9cf005f5e2..5597da3106ec0 100644
--- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
index 97726fb612bb7..ae3b080538dd3 100644
--- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content
index 9b96d81ee377b..63b2f1e08aa87 100644
--- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 56f4515ea378b3e406e14f5cbc124ae95be34d31a3192dac7bf74cd430d8eeb1
+    manifestHash: 0d1ffb7e112af9c6e824986722b4370875a0ae054f23a6d8ea50fbeb0c60844a
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 854608c464d13..e24ef8e747586 100644
--- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
index fe5873c584d1f..5fc8d73c6a9e6 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
index 0523bb5cf8140..2a070377baa02 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-bootstrap_content
index f292a2a009230..b630355d783f2 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 0fc6824f50ee3a557dc28f004efadbff5a72209ac3866cf14baa924b89fb16e7
+    manifestHash: b1178988386ad2b375b8067e60990e525ce30e92d3ca5ad884f18e6e2f78048a
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 6350b0de2ffb762f97fe83e9d9520a64e9d65a97baf547eded729a52945cc8d4
+    manifestHash: a2e589f6395418e39b78d5485cb4ba5b601ade9d48e688d8388ad6b16b0258b1
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index d724a4d14251f..5a869b537b97f 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 0c3033922a6b8..b7d495bcd5d0c 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
index 551690fa35405..f712f2bbca93c 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
index bdd5c7ee2ebf2..2092cd8907168 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content
index 3b1cef65e2088..8fab888565cc5 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: dd4ca3e2c950f5ef6f59f2ac947ce7edb6610c5977fd96f3ac54acd6ae392888
+    manifestHash: 1e0a30d90d5a94adec7ac6a8cd0487cc37b15ae8e6a490e9c5e57502b6e94720
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 6350b0de2ffb762f97fe83e9d9520a64e9d65a97baf547eded729a52945cc8d4
+    manifestHash: a2e589f6395418e39b78d5485cb4ba5b601ade9d48e688d8388ad6b16b0258b1
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index d724a4d14251f..5a869b537b97f 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 8432bb4a07f2e..25651c508b519 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
index 551690fa35405..f712f2bbca93c 100644
--- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
index bdd5c7ee2ebf2..2092cd8907168 100644
--- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content
index 3b1cef65e2088..8fab888565cc5 100644
--- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: dd4ca3e2c950f5ef6f59f2ac947ce7edb6610c5977fd96f3ac54acd6ae392888
+    manifestHash: 1e0a30d90d5a94adec7ac6a8cd0487cc37b15ae8e6a490e9c5e57502b6e94720
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 6350b0de2ffb762f97fe83e9d9520a64e9d65a97baf547eded729a52945cc8d4
+    manifestHash: a2e589f6395418e39b78d5485cb4ba5b601ade9d48e688d8388ad6b16b0258b1
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index d724a4d14251f..5a869b537b97f 100644
--- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 8432bb4a07f2e..25651c508b519 100644
--- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
index 1e23a936d7725..4a668644080d0 100644
--- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
index 1feb1bfe5e986..b7cebed764a9a 100644
--- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-bootstrap_content
index 80c17c4d4482f..96ff6fb8bf9dc 100644
--- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 19df45514d64969ef72f37e19adca62ccc366abf7f2bbd1df05878ecde7cc988
+    manifestHash: bd1a1edb9e8809915d1b41b40f0e60adbfa612fa49d0017236dfa0a1cd04df21
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 6350b0de2ffb762f97fe83e9d9520a64e9d65a97baf547eded729a52945cc8d4
+    manifestHash: a2e589f6395418e39b78d5485cb4ba5b601ade9d48e688d8388ad6b16b0258b1
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index d724a4d14251f..5a869b537b97f 100644
--- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 0aac479c7855b..e646ffb05a414 100644
--- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
index 165a3d90f5713..8b984a3b01307 100644
--- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
index edbb81dbdb9ec..ec9982eabad58 100644
--- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-bootstrap_content
index bde0cdb9fb406..610eb2dbcce71 100644
--- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 97308f4b3524d6da80804018c771abccbd174bdeca435556e73dc3f734ce2843
+    manifestHash: 3f6d4a49d7116ad21134692c4e1778b788a3b2f0b52838931ed2021946c843f3
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 6350b0de2ffb762f97fe83e9d9520a64e9d65a97baf547eded729a52945cc8d4
+    manifestHash: a2e589f6395418e39b78d5485cb4ba5b601ade9d48e688d8388ad6b16b0258b1
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index d724a4d14251f..5a869b537b97f 100644
--- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index d6bfcced9699e..6e0ebfd23535c 100644
--- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 3d3747ed8a215..eabebe7ed115e 100644
--- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 7a12c0fb52844..a9e714255ed2b 100644
--- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content
index 00cc68b324b46..a5c08acaadb7e 100644
--- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: b9ce6bd699d4025cf8d73dcf2a7b936758b8b6c95d6a5620b248cc510f42b861
+    manifestHash: d0d5c1ca723ec660b61d787cd68a75d0360a64b6f422545bbdae0500a98c06df
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: c8e0b8ed6864029a8206ed658a8bc945ce0a0ead2a376fc9245596281582ed16
+    manifestHash: 1f5b31cc013bdf7505542ac86e99a9d873fd9e674acd095b1d9ea574b5b390b5
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index b7d05b7ea21e6..35e8117849dcf 100644
--- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -51,7 +51,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 11aaee5cf0d0d..1d5e16d32466d 100644
--- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 3d3747ed8a215..eabebe7ed115e 100644
--- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 7a12c0fb52844..a9e714255ed2b 100644
--- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content
index 8cd48428503c1..7f60a852d53b4 100644
--- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: b9ce6bd699d4025cf8d73dcf2a7b936758b8b6c95d6a5620b248cc510f42b861
+    manifestHash: d0d5c1ca723ec660b61d787cd68a75d0360a64b6f422545bbdae0500a98c06df
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: d8fea8c3c363fa20cd76fdb8128da56dae2f663fd4c087803e8564b60782d085
+    manifestHash: 4b3e0702a3f57114106a467191a6c6630a657db253ba09bb46c8d4c5cfe60754
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index fec7e57e52f31..c3eb22f0ce714 100644
--- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -54,7 +54,7 @@ spec:
           value: arn:aws-test:iam::123456789012:role/dns-controller.kube-system.sa.minimal.k8s.local
         - name: AWS_WEB_IDENTITY_TOKEN_FILE
           value: /var/run/secrets/amazonaws.com/token
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 11aaee5cf0d0d..1d5e16d32466d 100644
--- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-events-master-fsn1_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-events-master-fsn1_content
index ec8409a47f306..549f2ff223dbc 100644
--- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-events-master-fsn1_content
+++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-events-master-fsn1_content
@@ -50,7 +50,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -87,7 +87,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -106,7 +106,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-main-master-fsn1_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-main-master-fsn1_content
index c7bac9b1ec3e5..c1a9c11e27643 100644
--- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-main-master-fsn1_content
+++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-main-master-fsn1_content
@@ -50,7 +50,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -87,7 +87,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -106,7 +106,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index 218318cf14297..a4a668e52d6e6 100644
--- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: a16fb961b0b240fd3f0ffa5d9d7fcb95b96a815385cd281aae2bf057aafe559e
+    manifestHash: 5a9f3a4625f298fecacbf198ca53603b2c59f52cbd4374dd6e444a197f69569c
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 564ad1c381c36..28b95aa655016 100644
--- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -65,7 +65,7 @@ spec:
           value: 127.0.0.1
         - name: HCLOUD_TOKEN
           value: REDACTED
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-events-control-plane-fr-par-1_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-events-control-plane-fr-par-1_content
index 53d71335787cd..b7fa9aefe6f07 100644
--- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-events-control-plane-fr-par-1_content
+++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-events-control-plane-fr-par-1_content
@@ -52,7 +52,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -89,7 +89,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -108,7 +108,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-main-control-plane-fr-par-1_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-main-control-plane-fr-par-1_content
index 83f837ba08d77..26b24f1f56a9c 100644
--- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-main-control-plane-fr-par-1_content
+++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-main-control-plane-fr-par-1_content
@@ -52,7 +52,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -89,7 +89,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -108,7 +108,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-bootstrap_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-bootstrap_content
index 48ab1cb34d844..e459a627fff56 100644
--- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: fd6333f1dd3ea6ab14a67ed78dfd6b801a5fe4206122c44b41224f870b1178c4
+    manifestHash: 724538decf297261fe988c1ae595f007943bf2d9b7538b3031b1793939d64a8a
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 8bb8eb0b6906b471b44ba702fda8f690a9e65a6edf64da3c38557e1e5212dc47
+    manifestHash: 17f22d4100fbc96f5b95d77b7634d2817c57daebd4327dabc8950157ed0e1d8d
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index 1702d1cd4956c..ce7d10f3d638b 100644
--- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -54,7 +54,7 @@ spec:
         envFrom:
         - secretRef:
             name: scaleway-secret
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 24af7f9ee96f4..b98e8ed0e96de 100644
--- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -69,7 +69,7 @@ spec:
           value: ""
         - name: SCW_SECRET_KEY
           value: ""
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 7c83ba3758abb..88df9e582577b 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
index 7c83ba3758abb..88df9e582577b 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
index 7c83ba3758abb..88df9e582577b 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 550c671bce0f3..3488093497177 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
index 550c671bce0f3..3488093497177 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
index 550c671bce0f3..3488093497177 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content
index 860330b46cea2..78e28db19ca93 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 4244791ede70ba5e7cc3a51aed0393ddaf1f8ffa8d430aecc89126a95840f0b6
+    manifestHash: 1afe646cbe3e4c51ea48a415b16c3e30fb7a218237c9736692e457918cebc288
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index cd6b503fb7be5..7786c8af340bf 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 7c83ba3758abb..88df9e582577b 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
index 7c83ba3758abb..88df9e582577b 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
index 7c83ba3758abb..88df9e582577b 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 550c671bce0f3..3488093497177 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
index 550c671bce0f3..3488093497177 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
index 550c671bce0f3..3488093497177 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content
index 860330b46cea2..78e28db19ca93 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 4244791ede70ba5e7cc3a51aed0393ddaf1f8ffa8d430aecc89126a95840f0b6
+    manifestHash: 1afe646cbe3e4c51ea48a415b16c3e30fb7a218237c9736692e457918cebc288
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index cd6b503fb7be5..7786c8af340bf 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0fca959afadbf..99b174ffa71a0 100644
--- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 727fc4b9397e5..af0a81982dcfc 100644
--- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content
index 128879c8a0959..b1f02d677cc00 100644
--- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 7eb60e623c936a33722c05512d896a7c881cf2413db61597ab3b359831fec1ce
+    manifestHash: a069ee09c910005123daf5a0e07664e32265c5e91f53b0fe3544c87346b2c3fb
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 258349bf66e8061127259a291afdc1f815a9f229b262bd28406eea7a82a59024
+    manifestHash: 9ad2c4f4b496c7f7c783438112f480e9a3a1905b8712aaadb1ab03813b7586b0
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index 234419bc6818f..8fdf5c2c38a74 100644
--- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -51,7 +51,7 @@ spec:
           value: arn:aws-test:iam::123456789012:role/dns-controller.kube-system.sa.nthimdsprocessor.longcluste-e6uuer
         - name: AWS_WEB_IDENTITY_TOKEN_FILE
           value: /var/run/secrets/amazonaws.com/token
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 3155b6179fa0a..693fd3edd6a94 100644
--- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0fca959afadbf..99b174ffa71a0 100644
--- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 727fc4b9397e5..af0a81982dcfc 100644
--- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content
index a27185102cc75..60eff2d0d2eb7 100644
--- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 7eb60e623c936a33722c05512d896a7c881cf2413db61597ab3b359831fec1ce
+    manifestHash: a069ee09c910005123daf5a0e07664e32265c5e91f53b0fe3544c87346b2c3fb
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 3155b6179fa0a..693fd3edd6a94 100644
--- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 96fd061bfd11a..8b2f16dd7ae7d 100644
--- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index adc76d6d955a7..dbaeb7e797324 100644
--- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index 9549db519ff87..9360b680b7125 100644
--- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 0fe87d491cfdff3b8e852ab534287c05d626f770ebc89539d1040ecc0ea8a9e3
+    manifestHash: e82de07a9607b85f85f2785a2e4e279d3becf70ea50ba43b52a24763dd97340f
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index b728a3c6ae2b9..2a6fbf78aa350 100644
--- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index d2b9227c52673..9e0e1a895d93e 100644
--- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index dc3aa1e178e03..c99b68964243e 100644
--- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content
index 5ca37f252b72f..66443ae8f837e 100644
--- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 881fa370d396661f3e4bd2e2b5685a444e0f92644fb7b2e2990b2fa78e54a8b9
+    manifestHash: 98db740a98dca803d50d732109cd142c9fb24bb6148b8980280f33391c5bb092
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 3590d2ad0a2ef..849a91231c271 100644
--- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 2735f634db234..cba2d94afa2a0 100644
--- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 1132ab7751eb6..4ce50366f0f9f 100644
--- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content
index 97bf5d3a91c16..f1d1579ef18d4 100644
--- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 055de0a511c1a1321ebdd0624d3ef13dffc50513e4d9cfdb6ac41419ef6db390
+    manifestHash: 46efeaab641a57a25f1c0907b23bb1f26dd28d9df7c994a994e79b22f61ed5f8
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 82d067ea8ef82..cf478570e9415 100644
--- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 5e60c3feadeb3..45e6c4ba6e92d 100644
--- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 69a640b9aacdd..490704c1ee75b 100644
--- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content
index 3ea47a9da3a05..a9cfe316e136a 100644
--- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 24ed7ec1251de29bdee00b6733c7b35c88fac29609e2cac5d024165f0ff0e56c
+    manifestHash: 217096ea8c7e71b50e1fed4d4691d9269e86b9975b453c78479854441757c944
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -41,7 +41,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 2792338c2bc6d..11f9fa1bece78 100644
--- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 6efbae8726867..c8aed74474b31 100644
--- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 9405ae8831dbb..8a3ac49bb87b6 100644
--- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content
index bdfbebea4020e..ee55fee1ed66e 100644
--- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 19b90dd9bf98a8f9bd1e21aa8e057c1b460c6cfc5c8fdf8bc90f322ac9ef78c6
+    manifestHash: 1b589c0b64d6e852fc5c134ec129e7263848a153e60f1c1fc18055d26fc26b59
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -41,7 +41,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index f10a1c8d5d39b..76d977e854ecd 100644
--- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index b8a7d5aa9e95d..77b2dd52c1bc9 100644
--- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 66d64e78c1c42..e8d01235bc197 100644
--- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
index 5366e98013bea..e2bd9f47c3337 100644
--- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: f692023ca9cf7f79d24a870b5db4d548d3f07105e1f26cdf9dbac61e2fbee34b
+    manifestHash: 476db4e9a563e20fa27afe0ab66c8239b489acc0e1487cdccfd7320d45570df9
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index f544fafb60e37..c6d974880f992 100644
--- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index b8a7d5aa9e95d..77b2dd52c1bc9 100644
--- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 66d64e78c1c42..e8d01235bc197 100644
--- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
index da682de9ac18f..41dc6689f4729 100644
--- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: f692023ca9cf7f79d24a870b5db4d548d3f07105e1f26cdf9dbac61e2fbee34b
+    manifestHash: 476db4e9a563e20fa27afe0ab66c8239b489acc0e1487cdccfd7320d45570df9
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index f544fafb60e37..c6d974880f992 100644
--- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index b8a7d5aa9e95d..77b2dd52c1bc9 100644
--- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 66d64e78c1c42..e8d01235bc197 100644
--- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
index 012cad9593da7..5359f8a3ff4f0 100644
--- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: f692023ca9cf7f79d24a870b5db4d548d3f07105e1f26cdf9dbac61e2fbee34b
+    manifestHash: 476db4e9a563e20fa27afe0ab66c8239b489acc0e1487cdccfd7320d45570df9
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index f544fafb60e37..c6d974880f992 100644
--- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-cilium-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-cilium-master-us-test-1a_content
index 5329b87097123..cc310cb9b4ce0 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-cilium-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-cilium-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index a61e275d2c85e..e6b348bebbe9a 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 5c404218a822b..d43038e9888c6 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content
index 336d5b50f9950..9cb592dbdf7c6 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 022b885f9c6cad01c9fe1e062e5305811e46c41146677f234ca9508b52c95868
+    manifestHash: e41b2bfd0c90c8f134637c8926ba466bbd4fe7d022beb11f520dffdd9a2c42f1
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index aad28f7368825..afa7c32b1920c 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index b62ebfc863282..8c67e77a157c7 100644
--- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 4f98703743648..9b4e5a9b28ffc 100644
--- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content
index fb4607ad47066..78a0a3512e7b6 100644
--- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 8bfdabe62d8d7b976f54c8723002fe8a29e58d25212fb5ee41d68fa4ec455c7d
+    manifestHash: b594edc3b77df1eb5ae9f6e3f1a1bc5426af92c2a655d298841078fd6250514a
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: bd5d52da6eaa2c5138ec20c8a62c18651983f9bf4f65c854197471554cfbb49e
+    manifestHash: a01313749aa50aca4609d37ed29291e411ed9054c1dc89ff7c48737e340fa3a0
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index c9eb0e3fe1d3a..e9cd5a5083e93 100644
--- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 732144be207d4..e1ae294bb6ead 100644
--- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 49fead072547c..30a346f6d5ff7 100644
--- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index fb650193a6323..22e932fbd7a1d 100644
--- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content
index a7098b1a5d24f..f833ac27743fa 100644
--- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 037730f4429f80015706087a85916135cc47fc622550c5b35f6cd73c9da20752
+    manifestHash: a2bb2618236432369e66022585f615a661111615d05a2786f4a99773b5e32d5d
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: d2c2ae43b5674c2d4311c821bfc38a9ce9d37b859330e3e856dd28311091e6eb
+    manifestHash: 5cd903e5347ca0cf98958919fec8d5a09a8cbf55542a40e02412a14a5d932e86
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index 320c20c44581b..bd029eacbc912 100644
--- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 68d6af5ed51e3..61d9618703428 100644
--- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 88d9048c58443..8bdf1f4b070af 100644
--- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index d1316f013bd9c..7a5bb49433565 100644
--- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content
index f766bd18409db..ec6f15422e9b5 100644
--- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 455249c8e9a0c0f00ff4feca34bd2ec1940cfed6f67550bcb0bce2e860755344
+    manifestHash: bcc2b0410927993219b4877bb5ffb8c89c798aa6a905e57b6d60be76a0682b90
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -41,7 +41,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 7f8ef16173268..e7f8c48ae5e48 100644
--- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 55c397cdf2315..3d164f3d3c064 100644
--- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index e5647a16ed01c..666d432eb362a 100644
--- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content
index fa3e15d32257d..dc21cea62a61c 100644
--- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 6f1c90cb5b754c21460fef88ab0efa4251f7acaf2babba839f4f6aa7ddf29635
+    manifestHash: 3c36a8b288fe4c2a9b2094e7d38bb3f581f6d646262e12f6849b0ccffc6435e8
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index d03d2482fbd83..56a815d2f2a2d 100644
--- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 96fd061bfd11a..8b2f16dd7ae7d 100644
--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index adc76d6d955a7..dbaeb7e797324 100644
--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index bc66f07747833..21a28238eeba4 100644
--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 0fe87d491cfdff3b8e852ab534287c05d626f770ebc89539d1040ecc0ea8a9e3
+    manifestHash: e82de07a9607b85f85f2785a2e4e279d3becf70ea50ba43b52a24763dd97340f
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: a9d084b5c852b48b99112a4da96253d9684c675817c861db9bbcf73dd599955c
+    manifestHash: 8dd0ae8f950193422af3d9ebb1339bb7ffe0da0dedefddd00c5fe0bf45c1d5b0
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index 7fb7cc4f8f5d0..6f99b7b7e58b4 100644
--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -51,7 +51,7 @@ spec:
           value: arn:aws-test:iam::123456789012:role/dns-controller.kube-system.sa.minimal.example.com
         - name: AWS_WEB_IDENTITY_TOKEN_FILE
           value: /var/run/secrets/amazonaws.com/token
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index b728a3c6ae2b9..2a6fbf78aa350 100644
--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index ba1353516c0ef..debceb8961fe7 100644
--- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index d642f10806960..bed2d465a17b7 100644
--- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content
index e6a9cf1597c03..bb52636e42640 100644
--- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 5c8ed6bc972bf5632ef5f688f028948a517d7e8fc9fa3e156da6e5804d2a78a3
+    manifestHash: a562c4630c7b6acdc12c3ff99e472e0dd9baf7472c47be86c333248912b16738
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index fd2e924ec842c..3a77919645b32 100644
--- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 2b8be47509c99..5ee7519053504 100644
--- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index ab11b26ac06e0..807022c91e159 100644
--- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content
index ef8dc4f76af8c..ea1415df87900 100644
--- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 5418b534218e9689f1cc27a94d3b5106ff26f0791981266066ad380618960e58
+    manifestHash: 5793f234da086767904d70919ab32de3dad380104c8da78d715826d28bfd1073
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 6fdca7e4654d8..d3e3fa4fba7dd 100644
--- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 29d85af00f29c..4981cf6c64e5b 100644
--- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index a284a07dfecc0..989557ebc3a25 100644
--- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
index 51805fca637ed..fa57acb153a08 100644
--- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 9db2bf7e3133b77c19b89463a1ef93bacf851fd2861e2cd5b3905b6e5b61dc63
+    manifestHash: fd4f0491acc25fa3ed6f59ec4646fd47b78f1828ce40e0de4fcf07037d5d54ab
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -41,7 +41,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 67455f7eddab6bc3038fa48fa5db7baf596c384bd2f1ff04d670a1d73a8686dd
+    manifestHash: 09f93d01927bc0c62fcf0dadca57d8210b8218a810b8b559bbcb973da5232332
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index eccfa2a28c25c..0b9e84049dc8a 100644
--- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 28c091907c691..a1429c0f7f0dc 100644
--- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index a8d93c971cf97..e2466592f3282 100644
--- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index e112ff47d531f..7548237d04397 100644
--- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content
index f185b207b6f32..8a0476d3a1f9b 100644
--- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: ca06c94f2afea9394f010462e21f86487a4c91ed88ddca173b68816e464d6a0b
+    manifestHash: 60b50835dce558dd883ddfcea8ae5bc9e5df2a69d4c056489b3c1e120ca29553
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 92779403bbb6e..5f88268204868 100644
--- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 96fd061bfd11a..8b2f16dd7ae7d 100644
--- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index adc76d6d955a7..dbaeb7e797324 100644
--- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -48,7 +48,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -85,7 +85,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.30.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.31.0-alpha.1
     name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index afa3ecbd310b1..fce47cbf43ea0 100644
--- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.30.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.31.0-alpha.1
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index 2215d13e3a1ac..3f27168f365a5 100644
--- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 0fe87d491cfdff3b8e852ab534287c05d626f770ebc89539d1040ecc0ea8a9e3
+    manifestHash: e82de07a9607b85f85f2785a2e4e279d3becf70ea50ba43b52a24763dd97340f
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index a35f5e9ddfb80..e686cadeda0d9 100644
--- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index b728a3c6ae2b9..2a6fbf78aa350 100644
--- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml
index 483350d562687..ca190e420b7c9 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 584673dc72fb48d32a740dc14ae270464852fb2fb9bf4a5b3898c4f8d5efed7f
+    manifestHash: f90205353abc0aceacf122f44509c3bb39c193651913b501280f4afe71b03de5
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
index 483350d562687..ca190e420b7c9 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 584673dc72fb48d32a740dc14ae270464852fb2fb9bf4a5b3898c4f8d5efed7f
+    manifestHash: f90205353abc0aceacf122f44509c3bb39c193651913b501280f4afe71b03de5
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
index d50cfd3cc2425..1680e2d86d7ed 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 584673dc72fb48d32a740dc14ae270464852fb2fb9bf4a5b3898c4f8d5efed7f
+    manifestHash: f90205353abc0aceacf122f44509c3bb39c193651913b501280f4afe71b03de5
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml
index 571684eb4752f..be3222e592c54 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 584673dc72fb48d32a740dc14ae270464852fb2fb9bf4a5b3898c4f8d5efed7f
+    manifestHash: f90205353abc0aceacf122f44509c3bb39c193651913b501280f4afe71b03de5
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml
index 831a6b8291fad..d9b1ac267aed9 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 584673dc72fb48d32a740dc14ae270464852fb2fb9bf4a5b3898c4f8d5efed7f
+    manifestHash: f90205353abc0aceacf122f44509c3bb39c193651913b501280f4afe71b03de5
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml
index 39c0ef4ee55ed..010a5796e5098 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
index ede53862dd68a..4dfcd6b2847b1 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 584673dc72fb48d32a740dc14ae270464852fb2fb9bf4a5b3898c4f8d5efed7f
+    manifestHash: f90205353abc0aceacf122f44509c3bb39c193651913b501280f4afe71b03de5
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml
index 5b9b6d57c1094..fe07367fa6e0a 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 584673dc72fb48d32a740dc14ae270464852fb2fb9bf4a5b3898c4f8d5efed7f
+    manifestHash: f90205353abc0aceacf122f44509c3bb39c193651913b501280f4afe71b03de5
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml
index c09da2e40bfae..c25abd5337fa0 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 584673dc72fb48d32a740dc14ae270464852fb2fb9bf4a5b3898c4f8d5efed7f
+    manifestHash: f90205353abc0aceacf122f44509c3bb39c193651913b501280f4afe71b03de5
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -41,7 +41,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml
index d7795415ac735..8e56ff5a2f746 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 584673dc72fb48d32a740dc14ae270464852fb2fb9bf4a5b3898c4f8d5efed7f
+    manifestHash: f90205353abc0aceacf122f44509c3bb39c193651913b501280f4afe71b03de5
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -41,7 +41,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/dns-controller.addons.k8s.io-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/dns-controller.addons.k8s.io-k8s-1.12.yaml
index 7fb7cc4f8f5d0..6f99b7b7e58b4 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/dns-controller.addons.k8s.io-k8s-1.12.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/dns-controller.addons.k8s.io-k8s-1.12.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -51,7 +51,7 @@ spec:
           value: arn:aws-test:iam::123456789012:role/dns-controller.kube-system.sa.minimal.example.com
         - name: AWS_WEB_IDENTITY_TOKEN_FILE
           value: /var/run/secrets/amazonaws.com/token
-        image: registry.k8s.io/kops/dns-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.31.0-alpha.1
         name: dns-controller
         resources:
           requests:
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/kops-controller.addons.k8s.io-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/kops-controller.addons.k8s.io-k8s-1.16.yaml
index 39c0ef4ee55ed..010a5796e5098 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/kops-controller.addons.k8s.io-k8s-1.16.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/kops-controller.addons.k8s.io-k8s-1.16.yaml
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml
index 1794a8520f61b..ca201fe809477 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 584673dc72fb48d32a740dc14ae270464852fb2fb9bf4a5b3898c4f8d5efed7f
+    manifestHash: f90205353abc0aceacf122f44509c3bb39c193651913b501280f4afe71b03de5
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: a9d084b5c852b48b99112a4da96253d9684c675817c861db9bbcf73dd599955c
+    manifestHash: 8dd0ae8f950193422af3d9ebb1339bb7ffe0da0dedefddd00c5fe0bf45c1d5b0
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml
index 39c0ef4ee55ed..010a5796e5098 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.30.0-beta.1
+    version: v1.31.0-alpha.1
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.30.0-beta.1
+        version: v1.31.0-alpha.1
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.30.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.31.0-alpha.1
         name: kops-controller
         resources:
           requests:
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
index e56b414f7fc77..293b40240c7a7 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 584673dc72fb48d32a740dc14ae270464852fb2fb9bf4a5b3898c4f8d5efed7f
+    manifestHash: f90205353abc0aceacf122f44509c3bb39c193651913b501280f4afe71b03de5
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: e4b68a75bb1b001a0547c9805b07112e4c3a61eb5995e03fcfbd50e1d8b815ac
+    manifestHash: 2cd8f564cd223ed3e06c5aba371ee7a83c72119396015055928e92757c58e116
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io