From 3d5c6ceb3d8cedb8c02e6ff53e3f99dd10928165 Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian@hakman.dev>
Date: Fri, 2 Feb 2024 16:30:03 +0200
Subject: [PATCH] Release 1.28.4 (#16312)

---
 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 +-
 ...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 +-
 ...bject_docker.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-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 +-
 ...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 +-
 ...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-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 +-
 ..._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 ++--
 upup/pkg/fi/cloudup/urls_test.go                     |  8 ++++----
 519 files changed, 1311 insertions(+), 1311 deletions(-)

diff --git a/Makefile b/Makefile
index 6db12725fbbc9..06330dc1a96a9 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.28.3
+KOPS_UTILS_CP_TAG=1.28.4
 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.28.3
+DNS_CONTROLLER_TAG=1.28.4
 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.28.3
+KOPS_CONTROLLER_TAG=1.28.4
 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.28.3
+KUBE_APISERVER_HEALTHCHECK_TAG=1.28.4
 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 1dfc5132d4642..efea75b8e5b5d 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.28.3"
-	KOPS_CI_VERSION      = "1.28.4"
+	KOPS_RELEASE_VERSION = "1.28.4"
+	KOPS_CI_VERSION      = "1.28.5"
 )
 
 // GitVersion should be replaced by the makefile
diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go
index 29d76e71413a6..7a9345e718637 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.28.3"
+const kopsUtilsImage = "registry.k8s.io/kops/kops-utils-cp:1.28.4"
 
 // 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 81ec6fb76c405..4439bfa9b71de 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.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       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.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -168,7 +168,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.9/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
@@ -253,7 +253,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -290,7 +290,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.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -308,7 +308,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.9/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
index cf8d6f19a464a..bf2dd3fb82f2a 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.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       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.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -167,7 +167,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.9/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
@@ -251,7 +251,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -288,7 +288,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.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -306,7 +306,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.9/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: init-etcd-symlinks-3-5-9
       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 1b41b4ca6d503..7372cc498f49d 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.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       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.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -170,7 +170,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.9/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
@@ -257,7 +257,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -294,7 +294,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.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -312,7 +312,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.9/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
index e6bcad9fc8308..0b0ca515f54f1 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.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       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.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -176,7 +176,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.9/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
@@ -269,7 +269,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -306,7 +306,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.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -324,7 +324,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.9/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.4
       name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
diff --git a/pkg/model/components/kubeapiserver/model.go b/pkg/model/components/kubeapiserver/model.go
index 89d768e9bc81d..c3713b3bb9ae7 100644
--- a/pkg/model/components/kubeapiserver/model.go
+++ b/pkg/model/components/kubeapiserver/model.go
@@ -79,7 +79,7 @@ kind: Pod
 spec:
   containers:
   - name: healthcheck
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 2fb2ef5fe2e46..8b21585f749a9 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.28.3
+      image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
       livenessProbe:
         httpGet:
           host: 127.0.0.1
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 43500b548ffc8..ab018758af038 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: 6f1834eaa7c2401880a1c47b6582e46fa5d24ca315fe0b7d3046046b13b7390e
+    manifestHash: b42d765a7a4bc935f87f2b69341ddd2fb8953b42d5b3c9161e9c74112066d2c4
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 89d5d8f066bb1..1a2459f32810f 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 3a8e525d547f9..faf90fb7d7d2e 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 dbcf2d73beb7c..431b3bdaf9bba 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 dae4c12332c56..57c852f3ef0f7 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -106,7 +106,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 ecb42cb562bf1..cdf9adebc5fa9 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -106,7 +106,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 16d0993d0dc6c..ad645811706bf 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: 90053e671dd79938362fa4e7eae4b239c6dddc0dc67958f252219d0c6714b497
+    manifestHash: e0e9148aa1d3d079911707bdfe0242619aff7b11f51eca0bc43b7c5878e6a904
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 a2720604c8fbd..f7aed3c7c670e 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 567976ef3b6e8..b996a0433f307 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 c5a684490e638..cdfc0ef5b5303 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 477ee533fef46..96e4193458182 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: 678d61365d3b860224dfd08e4fc1e1e9d90a67afa40aee3068b7f5a70242d86e
+    manifestHash: b146f94c8c1abe4058fecb6740a28abc00ef96f7e6ce7d2756bdc7c20f2e6a86
     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: 28de16c8b1b57c270b000cadf18449a140f358e0ba42cbbc428a0771cc3e9b3e
+    manifestHash: 2c20cbb80e963e2f0411f8075664b93be9b960be76fa2356702c056017b1c79c
     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 aead46f51fa29..8f86f5d80341d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 0916016cd0a92..fd75d5002a571 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 307e4f06c4561..7e7410ebdcdf1 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: cadcc32f90c60396c2ab7efab3a0b57b640f3a8c0b7d0720e93ef9c2dc5c2946
+    manifestHash: 872f2349ed53ae19dafbb92886ce43c033d96e5a28fb8604494a885a8c5961f2
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 74b9a2632e30e..1f071834bf938 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 9bb37e90893ba..f40417c5377bc 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 c8956af6066c8..c9f7a86c6cf66 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 66f5fa8c8b89b..f6ca508e6eca7 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: ff9c43b83dac1723ec3f9adc70c71f50ec3b072d79ef22e8c9995f9193b42afb
+    manifestHash: 671180876515acab15f38322ad504b7d128aa4afec3dc2cd2c8b298b0a9f4769
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 ec9c3559da765..ad3e094114c53 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 6a5ebd075b747..7a645ab80d6d2 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 fba9cbacadb09..d08bb495f0fbd 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 f9a6133b4987f..a99f6060734b0 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: 9f184dca38d134ca570648685c80a80e2ee85924eb2d4b8d16fc6c666a8c9340
+    manifestHash: 8f0bc14a5892a5126ce7f92e072318498826f785292392bd19fb356b456136c5
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 359806ebdf6da..6de37db5cad12 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 b923a18b0b9f8..e27f9e096fed3 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 e737ee6e20ce6..c4aabe15d97fa 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 9824f959cb083..1411ae68e6d77 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: 909da3841adf65c1bce9e00c7023675ebb403e74cba4567d2e8e1b916d3fb86d
+    manifestHash: e882ff22a3f09fcd37519d477e04c5e9922169d1f38fcdf42e58ac03cf02b8a2
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 576a874e437ab..bf31f586c2975 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 7d6a62f30dac0..a7977cd5cbd40 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 8ebc082b2e344..2c3446ec846eb 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 0ed74b56b07e9..f375ad562f481 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: a10cd82a66f3f7f2bedbda212309a2e29e9ade7a1b401a05152a66dbf5894ca3
+    manifestHash: c4d738b8528e3d3e9a826a7c2968e9fb7e9e0e1b8dfa17f84ce99c85f4f83830
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 0e43a2a237335..065e3ab14141f 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 5bf8c860293bc..3776464808b8a 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 1f21ece86431d..82ce94b26f362 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 d9735729e1511..c7870e5787366 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: b94395ab0043d30542b018ab34c38823bca45df4188fba7f8588ddd982ce843e
+    manifestHash: db051da515a89c96924833298770883f039452c53189901e45475df5c70f9c61
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 1e7a649b5479d..a6cdd5662000a 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 747367add4841..8b13c5a976908 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 9b7da69f08ca7..42b07a55a72d6 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 d9735729e1511..c7870e5787366 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: b94395ab0043d30542b018ab34c38823bca45df4188fba7f8588ddd982ce843e
+    manifestHash: db051da515a89c96924833298770883f039452c53189901e45475df5c70f9c61
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 1e7a649b5479d..a6cdd5662000a 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 747367add4841..8b13c5a976908 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 9b7da69f08ca7..42b07a55a72d6 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 31f521e6c2330..048d1a78407be 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: 19458944ed74672748c810f7312b686493abf97de584dc14d0dec6d007bad53d
+    manifestHash: 9347c9039bb66fc55a95cc5c023ca6847d46fc5fc992cd11ee26f9e56e3b2ecb
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 82a4fa6c1d5b1..803133dd9fae8 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 e85326bae6f2c..9765ea43c139c 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 9a3675a8062e9..8ec96f107e49f 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_docker.example.com-addons-bootstrap_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_docker.example.com-addons-bootstrap_content
index 15e867fb4c4f6..ff62ceb7e9743 100644
--- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_docker.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_docker.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: f4f9f228df2adbe5b90a0ae87d26859702a553293f0b89c06cdc61c4e288052a
+    manifestHash: 2f321452dc821e23ea451f1d564381246f703539ea49ababfea6360aee81c7aa
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_docker.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_docker.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index eea7ae24e2946..0f5dd63171c1d 100644
--- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_docker.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_docker.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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_docker.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_docker.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index b384fb48b636b..520af087259fc 100644
--- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_docker.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_docker.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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index cbfab841ec1f1..78938ab46ce40 100644
--- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/docker-custom/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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 635331df08a0a..00d8db93619c1 100644
--- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/docker-custom/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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index 71e837b7cb068..b3bfc28904401 100644
--- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/docker-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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 be3f3f2fb37d1..5eccfb4161c16 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: 6d9b23fa0734cb61824371c1cff0ed620cc0b0767270c32abe1b6d3b52a8f309
+    manifestHash: 18dc33afda47d81fa416b3a1fd8bd33841d1e4c4aa70eeb2b46089a2c4cdde23
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 5a851a0f33afd..dd701a3b98696 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 c1282e4929160..b589ed31f8a4e 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 c1282e4929160..b589ed31f8a4e 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 c1282e4929160..b589ed31f8a4e 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 d001b10d3a1d3..a05aeb8a1428e 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 d001b10d3a1d3..a05aeb8a1428e 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 d001b10d3a1d3..a05aeb8a1428e 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 ab167cca79030..2f9206b5f45c6 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: 8380ae7a2effe7fa55adc2a736f68611d7da2a2cb08fa38d3b969aa3e5a05477
+    manifestHash: 3b96e6176b744a4c87ae64a9494a95d44cd95e5f09e4611829531e27f98df07a
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 cd4d7617c8313..7570ffed7e291 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 0c1a56d4d69e0..760febb288384 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 0c1a56d4d69e0..760febb288384 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 0c1a56d4d69e0..760febb288384 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 3844d27c67904..6a24618ae3c37 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 3844d27c67904..6a24618ae3c37 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 3844d27c67904..6a24618ae3c37 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 567976ef3b6e8..b996a0433f307 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 c5a684490e638..cdfc0ef5b5303 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 db40159f9eb50..ec19e2498bba3 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: 678d61365d3b860224dfd08e4fc1e1e9d90a67afa40aee3068b7f5a70242d86e
+    manifestHash: b146f94c8c1abe4058fecb6740a28abc00ef96f7e6ce7d2756bdc7c20f2e6a86
     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 0916016cd0a92..fd75d5002a571 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 567976ef3b6e8..b996a0433f307 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 c5a684490e638..cdfc0ef5b5303 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 a4b774e062f6d..30116841fb759 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: 678d61365d3b860224dfd08e4fc1e1e9d90a67afa40aee3068b7f5a70242d86e
+    manifestHash: b146f94c8c1abe4058fecb6740a28abc00ef96f7e6ce7d2756bdc7c20f2e6a86
     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 0916016cd0a92..fd75d5002a571 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 918c40008ad67..30886a0ea8d78 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: ea6c9b5a564cd37cdf4455b62611d827643d169033cbb53527bc26fc80cb235e
+    manifestHash: 9c8e32b98dd5399b35da00faf7a64e453bd16f66c49fa0d43a088de01a360371
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 3888cafcaed52..c57eb344c762d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 7610f3bd36ed3..6516a0c33ae84 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 b5fc1f93bcaf3..55e95d4305359 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 0b30cff06b417..2ea1ef6af9a8e 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: 78ef8b17dffb2d4bebd3f0f72b2997359d2d4a467bce9b2d7d081a6784d74aa1
+    manifestHash: afa91ccd78e9f2a781ebd84a41044ce908488f800ff20aae2a1087487f38ebca
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 72de06d96ef3e..1c6b8f74ec8b8 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 278cbf5a8010a..f3caac128ded7 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 bad99546de9d7..1034202f7d457 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 548a71696df21..95670ddfa95c0 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: c017224ed6fbb170c631581f8c5631d10a33a8a2c0a40f0d6be4113104eae972
+    manifestHash: 58c37bd67e7a97766bf1394eed43776d3d128f44f2da45bcd7772c80c17b4387
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 36e33575d942a..4fdb6bc0041db 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 0ef27fe18cbf2..0dcd4ac58ec02 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 0ef27fe18cbf2..0dcd4ac58ec02 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 0ef27fe18cbf2..0dcd4ac58ec02 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 17ef372137e09..e3ba9e5dbec4a 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 17ef372137e09..e3ba9e5dbec4a 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 17ef372137e09..e3ba9e5dbec4a 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 807560977490a..19a7d59adabd6 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: c052235c4cf507633e8a7760a03b1b4f98b91288028e7064cf4f7fdae16d3111
+    manifestHash: 243b8d7f04e4278f62eace2ae9617c4c8683ebee2a1a2b90c301820b936160ce
     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: 28fb9992186e5218357e6277607191ad247b39e12821dd00d7b122bb87413c68
+    manifestHash: ff9b9636f820a66c50074113735c81895fb7cefd87ce566745fefe38ca0b124c
     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 92230d20adabe..b3499117c329e 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 c3fb142d5390b..73bbce7db9558 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 33f7feb6f8fc6..19c34eb44100f 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 33f7feb6f8fc6..19c34eb44100f 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 33f7feb6f8fc6..19c34eb44100f 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 b893ebae8c253..97cbf6105f968 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 b893ebae8c253..97cbf6105f968 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 b893ebae8c253..97cbf6105f968 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 567976ef3b6e8..b996a0433f307 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 c5a684490e638..cdfc0ef5b5303 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 cae48a312cc1f..1ec95d8984b62 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: 678d61365d3b860224dfd08e4fc1e1e9d90a67afa40aee3068b7f5a70242d86e
+    manifestHash: b146f94c8c1abe4058fecb6740a28abc00ef96f7e6ce7d2756bdc7c20f2e6a86
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 0916016cd0a92..fd75d5002a571 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 567976ef3b6e8..b996a0433f307 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 c5a684490e638..cdfc0ef5b5303 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 04006079aa97d..45b6bd5af6338 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: 678d61365d3b860224dfd08e4fc1e1e9d90a67afa40aee3068b7f5a70242d86e
+    manifestHash: b146f94c8c1abe4058fecb6740a28abc00ef96f7e6ce7d2756bdc7c20f2e6a86
     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: 28de16c8b1b57c270b000cadf18449a140f358e0ba42cbbc428a0771cc3e9b3e
+    manifestHash: 2c20cbb80e963e2f0411f8075664b93be9b960be76fa2356702c056017b1c79c
     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 aead46f51fa29..8f86f5d80341d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 0916016cd0a92..fd75d5002a571 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 567976ef3b6e8..b996a0433f307 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 c5a684490e638..cdfc0ef5b5303 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 6f55f353bdc90..8297b701653b2 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: 678d61365d3b860224dfd08e4fc1e1e9d90a67afa40aee3068b7f5a70242d86e
+    manifestHash: b146f94c8c1abe4058fecb6740a28abc00ef96f7e6ce7d2756bdc7c20f2e6a86
     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: 28de16c8b1b57c270b000cadf18449a140f358e0ba42cbbc428a0771cc3e9b3e
+    manifestHash: 2c20cbb80e963e2f0411f8075664b93be9b960be76fa2356702c056017b1c79c
     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 aead46f51fa29..8f86f5d80341d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 0916016cd0a92..fd75d5002a571 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 567976ef3b6e8..b996a0433f307 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index c5a684490e638..cdfc0ef5b5303 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index 71e837b7cb068..b3bfc28904401 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index fc6a5507c7e45..402b3d3de93b2 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/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: 678d61365d3b860224dfd08e4fc1e1e9d90a67afa40aee3068b7f5a70242d86e
+    manifestHash: b146f94c8c1abe4058fecb6740a28abc00ef96f7e6ce7d2756bdc7c20f2e6a86
     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: 28de16c8b1b57c270b000cadf18449a140f358e0ba42cbbc428a0771cc3e9b3e
+    manifestHash: 2c20cbb80e963e2f0411f8075664b93be9b960be76fa2356702c056017b1c79c
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/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-irsa23/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index aead46f51fa29..8f86f5d80341d 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/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-irsa23/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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/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-irsa23/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 0916016cd0a92..fd75d5002a571 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/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-irsa23/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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 567976ef3b6e8..b996a0433f307 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index c5a684490e638..cdfc0ef5b5303 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index 71e837b7cb068..b3bfc28904401 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index 5194039644641..b5de800b664cf 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/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: 678d61365d3b860224dfd08e4fc1e1e9d90a67afa40aee3068b7f5a70242d86e
+    manifestHash: b146f94c8c1abe4058fecb6740a28abc00ef96f7e6ce7d2756bdc7c20f2e6a86
     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: 28de16c8b1b57c270b000cadf18449a140f358e0ba42cbbc428a0771cc3e9b3e
+    manifestHash: 2c20cbb80e963e2f0411f8075664b93be9b960be76fa2356702c056017b1c79c
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/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-irsa24/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index aead46f51fa29..8f86f5d80341d 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/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-irsa24/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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/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-irsa24/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 0916016cd0a92..fd75d5002a571 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/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-irsa24/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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 567976ef3b6e8..b996a0433f307 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 c5a684490e638..cdfc0ef5b5303 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 58af3cfb739d4..9082a9856089f 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: 678d61365d3b860224dfd08e4fc1e1e9d90a67afa40aee3068b7f5a70242d86e
+    manifestHash: b146f94c8c1abe4058fecb6740a28abc00ef96f7e6ce7d2756bdc7c20f2e6a86
     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: 28de16c8b1b57c270b000cadf18449a140f358e0ba42cbbc428a0771cc3e9b3e
+    manifestHash: 2c20cbb80e963e2f0411f8075664b93be9b960be76fa2356702c056017b1c79c
     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 aead46f51fa29..8f86f5d80341d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 0916016cd0a92..fd75d5002a571 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 567976ef3b6e8..b996a0433f307 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 c5a684490e638..cdfc0ef5b5303 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 8074505d206c2..3cb7a382c934a 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: 678d61365d3b860224dfd08e4fc1e1e9d90a67afa40aee3068b7f5a70242d86e
+    manifestHash: b146f94c8c1abe4058fecb6740a28abc00ef96f7e6ce7d2756bdc7c20f2e6a86
     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: 28de16c8b1b57c270b000cadf18449a140f358e0ba42cbbc428a0771cc3e9b3e
+    manifestHash: 2c20cbb80e963e2f0411f8075664b93be9b960be76fa2356702c056017b1c79c
     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 aead46f51fa29..8f86f5d80341d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 0916016cd0a92..fd75d5002a571 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 567976ef3b6e8..b996a0433f307 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 c5a684490e638..cdfc0ef5b5303 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 a7cf498e4535b..1d13243fdee20 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: 678d61365d3b860224dfd08e4fc1e1e9d90a67afa40aee3068b7f5a70242d86e
+    manifestHash: b146f94c8c1abe4058fecb6740a28abc00ef96f7e6ce7d2756bdc7c20f2e6a86
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 0916016cd0a92..fd75d5002a571 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 9dd408e531ee8..08b07d0397065 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 e1577581ea153..89bd46cc0b336 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 77feff28668b4..d306be1131758 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: df380a73c33b75e3237f84eb1d4e2591eb1a7d80f20902a565a9f5323901670c
+    manifestHash: d2fc0a3fe97af58f910e6f3cdb9367f7391f8463ee153fe4f0fc0e70459ebb8a
     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: 28fb9992186e5218357e6277607191ad247b39e12821dd00d7b122bb87413c68
+    manifestHash: ff9b9636f820a66c50074113735c81895fb7cefd87ce566745fefe38ca0b124c
     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 92230d20adabe..b3499117c329e 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 1ded9ecce6bb9..7e988d052ea8d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 567976ef3b6e8..b996a0433f307 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 c5a684490e638..cdfc0ef5b5303 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index 2723b32070094..542d419fa76c6 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons/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: 678d61365d3b860224dfd08e4fc1e1e9d90a67afa40aee3068b7f5a70242d86e
+    manifestHash: b146f94c8c1abe4058fecb6740a28abc00ef96f7e6ce7d2756bdc7c20f2e6a86
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index eea7ae24e2946..0f5dd63171c1d 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/many-addons/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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 0916016cd0a92..fd75d5002a571 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/many-addons/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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 43694a1bf1336..69b1294465941 100644
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.23/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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 75e605c77b4bc..c9ee0fffe7e72 100644
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.23/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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index 71e837b7cb068..b3bfc28904401 100644
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal-1.23/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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index e956485682351..5c0efafe99fdf 100644
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-1.23/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: 53a485c861b84708e9d8fb7f375cbd620322460332f3f1b481bb66252285484b
+    manifestHash: f1fa5c25ff118dccff6b1a9044ad34e528684a431d89c0b298f7146cb1621e5a
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index eea7ae24e2946..0f5dd63171c1d 100644
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal-1.23/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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 6f15cec960d9e..546e913de8e2e 100644
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal-1.23/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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 43694a1bf1336..69b1294465941 100644
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.24/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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 75e605c77b4bc..c9ee0fffe7e72 100644
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.24/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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index 71e837b7cb068..b3bfc28904401 100644
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal-1.24/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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index 29f5c2cbc75c3..f2095fccfeee6 100644
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal-1.24/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: 3508812743a626136a737cf3f350144338fd228e2e4c7f245b1093e7b681b224
+    manifestHash: a427dc3658444152a31c5dc9c27339ecaa1620a86060e1f6058bebe9cf8a65f0
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index eea7ae24e2946..0f5dd63171c1d 100644
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal-1.24/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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index a704608a8dc30..aa833a9f7d0b3 100644
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal-1.24/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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 43694a1bf1336..69b1294465941 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 75e605c77b4bc..c9ee0fffe7e72 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 c4f4719a7c019..182de1ca887d4 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: 3508812743a626136a737cf3f350144338fd228e2e4c7f245b1093e7b681b224
+    manifestHash: a427dc3658444152a31c5dc9c27339ecaa1620a86060e1f6058bebe9cf8a65f0
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 a704608a8dc30..aa833a9f7d0b3 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 43694a1bf1336..69b1294465941 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 75e605c77b4bc..c9ee0fffe7e72 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 7a0d526cda4e0..cbed99499e248 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: 3508812743a626136a737cf3f350144338fd228e2e4c7f245b1093e7b681b224
+    manifestHash: a427dc3658444152a31c5dc9c27339ecaa1620a86060e1f6058bebe9cf8a65f0
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 a704608a8dc30..aa833a9f7d0b3 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 43694a1bf1336..69b1294465941 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 75e605c77b4bc..c9ee0fffe7e72 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 71314a4866319..4574c03f2b4a2 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: 3508812743a626136a737cf3f350144338fd228e2e4c7f245b1093e7b681b224
+    manifestHash: a427dc3658444152a31c5dc9c27339ecaa1620a86060e1f6058bebe9cf8a65f0
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 a704608a8dc30..aa833a9f7d0b3 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 43694a1bf1336..69b1294465941 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 75e605c77b4bc..c9ee0fffe7e72 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 b4386e14a40dc..4eef7cdc97da0 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: 3508812743a626136a737cf3f350144338fd228e2e4c7f245b1093e7b681b224
+    manifestHash: a427dc3658444152a31c5dc9c27339ecaa1620a86060e1f6058bebe9cf8a65f0
     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 a704608a8dc30..aa833a9f7d0b3 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 6c7b8d9417b20..05bb306ab7df7 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -106,7 +106,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 f3f03a59fe57e..b354154214968 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 c85ccf13ad69d..dc5d64276fce1 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: 7b1c761e624ae2f5361113ac544f1c30d78de83c3484a3dcfe7cf457cbf445cf
+    manifestHash: 283a4c751f3a5f12fe729db4bb0fb019ead4883d6fa6a3c342adb8d5d921b9ea
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 84c668545e688..e6fc77f486dbb 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 567976ef3b6e8..b996a0433f307 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 c5a684490e638..cdfc0ef5b5303 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 a62216806e9bb..6d346910bc42b 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: 678d61365d3b860224dfd08e4fc1e1e9d90a67afa40aee3068b7f5a70242d86e
+    manifestHash: b146f94c8c1abe4058fecb6740a28abc00ef96f7e6ce7d2756bdc7c20f2e6a86
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 0916016cd0a92..fd75d5002a571 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 ca37227da1df2..6a60131ee7e31 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 192b747850c91..ab2638416681f 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 0465868ab4aff..936fe7e1c722b 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: 2febdbf50d04aa6e5ae50ec4b7a51c714d26ebcd19faef68d7a276efcd2f1945
+    manifestHash: 36c0e8b21c25a5cc186ca3e759906b2ddf2744aaa47cd832b85978d9e02c82ed
     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: 029c3b36b1ded96744fc77c6e346afa641d06fe10d49abdc56b45349597759fc
+    manifestHash: 6fafc292c167c734388692ce80f848b792a6819e8a5fbd8bf256e546fbef3b5a
     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 8d29dc6c9e91e..295eb22269d72 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 167250c5dda7b..8c3a6dd9f610f 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 ca37227da1df2..6a60131ee7e31 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 192b747850c91..ab2638416681f 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 57def202e8df0..33184e54d7268 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: 2febdbf50d04aa6e5ae50ec4b7a51c714d26ebcd19faef68d7a276efcd2f1945
+    manifestHash: 36c0e8b21c25a5cc186ca3e759906b2ddf2744aaa47cd832b85978d9e02c82ed
     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: 029c3b36b1ded96744fc77c6e346afa641d06fe10d49abdc56b45349597759fc
+    manifestHash: 6fafc292c167c734388692ce80f848b792a6819e8a5fbd8bf256e546fbef3b5a
     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 8d29dc6c9e91e..295eb22269d72 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 167250c5dda7b..8c3a6dd9f610f 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 ca37227da1df2..6a60131ee7e31 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 192b747850c91..ab2638416681f 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 2f2bddd545dbb..dc6e5b70f9493 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: 2febdbf50d04aa6e5ae50ec4b7a51c714d26ebcd19faef68d7a276efcd2f1945
+    manifestHash: 36c0e8b21c25a5cc186ca3e759906b2ddf2744aaa47cd832b85978d9e02c82ed
     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: 029c3b36b1ded96744fc77c6e346afa641d06fe10d49abdc56b45349597759fc
+    manifestHash: 6fafc292c167c734388692ce80f848b792a6819e8a5fbd8bf256e546fbef3b5a
     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 8d29dc6c9e91e..295eb22269d72 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 167250c5dda7b..8c3a6dd9f610f 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 ca37227da1df2..6a60131ee7e31 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 192b747850c91..ab2638416681f 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 2f2bddd545dbb..dc6e5b70f9493 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: 2febdbf50d04aa6e5ae50ec4b7a51c714d26ebcd19faef68d7a276efcd2f1945
+    manifestHash: 36c0e8b21c25a5cc186ca3e759906b2ddf2744aaa47cd832b85978d9e02c82ed
     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: 029c3b36b1ded96744fc77c6e346afa641d06fe10d49abdc56b45349597759fc
+    manifestHash: 6fafc292c167c734388692ce80f848b792a6819e8a5fbd8bf256e546fbef3b5a
     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 8d29dc6c9e91e..295eb22269d72 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 167250c5dda7b..8c3a6dd9f610f 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 da8d13b17efd0..8d3b6ccb6695f 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 2ec055f0675a8..9c4fad68369ea 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 e98529fad4d7f..5768b5a4ddc3b 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: f79952cfa891f8d3ba340d8da1021302f9808edf0e4447c3145249edd82c041c
+    manifestHash: 6ed48794da9b8a86953a1e99061479f059ed60f02df4cd45db5ca73457e296af
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 d52620edd846b..7e0a315521a17 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 8fe3f8cb09c55..52d244d753430 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 7cca510d11ad0..d04257434d84b 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 f4227473893f9..fd02467757bde 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: 432a6ab928d9eb100366c760af238c838aafb11a54f83c78a3ee80fbf4c159d9
+    manifestHash: d6545ca86262afa8bcb8e43c100bb747b10e2b50b9fbae74b8fadd94177abc10
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 3e2a34ba10af8..af595c978efb7 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         name: kops-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 567976ef3b6e8..b996a0433f307 100644
--- a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal/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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index c5a684490e638..cdfc0ef5b5303 100644
--- a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal/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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
index 71e837b7cb068..b3bfc28904401 100644
--- a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
+++ b/tests/integration/update_cluster/minimal/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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     livenessProbe:
       httpGet:
         host: 127.0.0.1
diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
index da488cd188394..8bd63e7f8b84a 100644
--- a/tests/integration/update_cluster/minimal/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/minimal/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: 678d61365d3b860224dfd08e4fc1e1e9d90a67afa40aee3068b7f5a70242d86e
+    manifestHash: b146f94c8c1abe4058fecb6740a28abc00ef96f7e6ce7d2756bdc7c20f2e6a86
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
index eea7ae24e2946..0f5dd63171c1d 100644
--- a/tests/integration/update_cluster/minimal/data/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+++ b/tests/integration/update_cluster/minimal/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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         name: dns-controller
         resources:
           requests:
diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
index 0916016cd0a92..fd75d5002a571 100644
--- a/tests/integration/update_cluster/minimal/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+++ b/tests/integration/update_cluster/minimal/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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 3626f1d15934c..f674c29c7e961 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 733710511e1d8..b3ee29dbd51ef 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 7d0c2983d70df..a3f95fd3ef5e6 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: 94488410d0ad23ff66c036da361b4f0446cf3c2ad0acbbb8c0c130c1f24e4166
+    manifestHash: e05cacc5bf652a0341005216da9776b670d98253d5f906eb6831b905a55cdce0
     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: 28fb9992186e5218357e6277607191ad247b39e12821dd00d7b122bb87413c68
+    manifestHash: ff9b9636f820a66c50074113735c81895fb7cefd87ce566745fefe38ca0b124c
     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 92230d20adabe..b3499117c329e 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 a270b04c65afb..cb76063c9eddf 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 3626f1d15934c..f674c29c7e961 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 733710511e1d8..b3ee29dbd51ef 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 bc5c81ad6386d..d8e051fc86f35 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: 94488410d0ad23ff66c036da361b4f0446cf3c2ad0acbbb8c0c130c1f24e4166
+    manifestHash: e05cacc5bf652a0341005216da9776b670d98253d5f906eb6831b905a55cdce0
     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 a270b04c65afb..cb76063c9eddf 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 934bdf1bc488a..387471d46db39 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 8eeda0dc602a6..779c15887366a 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 51ea28b4462bc..e71472e49fafe 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: b62f406679f71ae9b86c581accfe5f4ce135c12839c0dc4d6495a82bb0d37010
+    manifestHash: bfc358d17de8286a793190bd1494cfeba4b2fea77081dd4ecef8724b4c8f4a51
     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: 28fb9992186e5218357e6277607191ad247b39e12821dd00d7b122bb87413c68
+    manifestHash: ff9b9636f820a66c50074113735c81895fb7cefd87ce566745fefe38ca0b124c
     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 92230d20adabe..b3499117c329e 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 c0efa26d79575..f36ead10248df 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 14858f50fc69f..b6ee77c03ad88 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 fc17652143391..e54448857366b 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 a89b7751f9635..6138b831ad694 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: 6995fc785bcffafdc3253b32598bd4604f142f17719e29d74362fc11337275e3
+    manifestHash: a134b96e88933174f3d1df533b04fd78a48ef5413265deba9b6853dd3eb3115b
     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: 28fb9992186e5218357e6277607191ad247b39e12821dd00d7b122bb87413c68
+    manifestHash: ff9b9636f820a66c50074113735c81895fb7cefd87ce566745fefe38ca0b124c
     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 92230d20adabe..b3499117c329e 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 8ddf118e41340..1d963f73972d2 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 14858f50fc69f..b6ee77c03ad88 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 fc17652143391..e54448857366b 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 a89b7751f9635..6138b831ad694 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: 6995fc785bcffafdc3253b32598bd4604f142f17719e29d74362fc11337275e3
+    manifestHash: a134b96e88933174f3d1df533b04fd78a48ef5413265deba9b6853dd3eb3115b
     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: 28fb9992186e5218357e6277607191ad247b39e12821dd00d7b122bb87413c68
+    manifestHash: ff9b9636f820a66c50074113735c81895fb7cefd87ce566745fefe38ca0b124c
     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 92230d20adabe..b3499117c329e 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 8ddf118e41340..1d963f73972d2 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 06fbf27003a52..f466089e0ab81 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 75e9cf0622bf7..2d9cbb39575c7 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 ca15f74989538..8e73e5977eab5 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: 89b1b5001118aca6dc4d7424eb5847d692b1efb052b9fa0d9944a0549681b8d2
+    manifestHash: d4f21779dce1399a0e4d01e30b1e3a88eeec15b292b0bdafc3ca46b8282faf3c
     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: 28fb9992186e5218357e6277607191ad247b39e12821dd00d7b122bb87413c68
+    manifestHash: ff9b9636f820a66c50074113735c81895fb7cefd87ce566745fefe38ca0b124c
     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 92230d20adabe..b3499117c329e 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 b316aeb7ce8a8..81da3c8a5bbe8 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 4ce0640d9f25f..c3efb21d76ae8 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 e570dc603cab1..bc0be3d836286 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 76af4e9c738c3..0a9a04fa15af5 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: 692788cdb41f9fdff543b62ac48692dac357fa917dac874af00f7a5b1a453326
+    manifestHash: 54761a9f0ac1c02c957c0a569d929f489688255b5b813f9a9c94fcd579d1ee41
     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: 28fb9992186e5218357e6277607191ad247b39e12821dd00d7b122bb87413c68
+    manifestHash: ff9b9636f820a66c50074113735c81895fb7cefd87ce566745fefe38ca0b124c
     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 92230d20adabe..b3499117c329e 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 d06e827d9bbdc..6689effcbf288 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 1986d32596600..94b833acb29d1 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 6c7716c1c715c..a160e3dd2b09a 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 8520758e6093c..abc8cc3d5e4e8 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: 961e19fbc5aade91d704eebde4cbf88c6327a345469f318f8f93bfa2c4541283
+    manifestHash: 0b5617f2644773a634e18d4d92080a348cde016a80cc655054830cc51181be82
     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: eb556db28a3843cfdc839f3dffd999ecb396c3de62c8767f32dbb3d7e00d7b94
+    manifestHash: 84e013fda8ff49648676eecc461f04446e2140ccc05ec94f14609d10660c008c
     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 12578884007c8..ea7faa8eeaefb 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 3f85357d3d1ae..2e269608acba5 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 1986d32596600..94b833acb29d1 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 6c7716c1c715c..a160e3dd2b09a 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 e8a79d959d056..2d0010f029e07 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: 961e19fbc5aade91d704eebde4cbf88c6327a345469f318f8f93bfa2c4541283
+    manifestHash: 0b5617f2644773a634e18d4d92080a348cde016a80cc655054830cc51181be82
     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: fb2b2f4edb277d9bad6d8b7b112e0c8a89ef45ac1c4b3491e377ceb772778a1a
+    manifestHash: 0c8b9d41c9d83026cb6c143aaec4cbf12dbd8fd054b6015e92cdeeac9942c216
     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 fc60c847b78d6..c538bd205269b 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 3f85357d3d1ae..2e269608acba5 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 6872f33023ade..47ade6436c272 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 56a865818f999..c228979017828 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 e73e22b6cde5f..2d75b6fcc393e 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: ed45cf6d48baee2b9dee9fcf45d659a704611790abc77d3db3afc49349d7b9cc
+    manifestHash: 08891c98bd2ceb1c11575859bdeffd57d90bf0369d74e49c681586cad4078a4c
     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 8f7203b38bf5e..78c3db8fb13fa 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 80d4a7a2681ee..4a2d778635bf0 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -107,7 +107,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 1efd144871697..2e696cb7d8cd6 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -107,7 +107,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 cb48f70ad3e84..1a98d30f56ef9 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: c6a8c778f2273935afecbb3c1fdb29450eeac95842ed5b870c5293c243f2ef46
+    manifestHash: 9536aa852f0be307fac6dc325b67cdf13a375e161bbf7a550d853fb7dbdb83c4
     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: 2cfce3c5ecb900bf3826d69c74e10abae78458922deab35025aecf1ac3437d09
+    manifestHash: c018830e6314c2381c4acb6c94008e14b508372915c52ef2be6dbf3ffd0a8c40
     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 e1be480430197..a413a18d9dc57 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     spec:
       affinity:
         nodeAffinity:
@@ -54,7 +54,7 @@ spec:
         envFrom:
         - secretRef:
             name: scaleway-secret
-        image: registry.k8s.io/kops/dns-controller:1.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 917d4fc6761f3..43b4a03532403 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     spec:
       affinity:
         nodeAffinity:
@@ -69,7 +69,7 @@ spec:
           value: null
         - name: SCW_SECRET_KEY
           value: null
-        image: registry.k8s.io/kops/kops-controller:1.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 90cb28cb9acf5..f53dd07479131 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 90cb28cb9acf5..f53dd07479131 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 90cb28cb9acf5..f53dd07479131 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 e3d02d63972fd..dc1d1ed9d3b66 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 e3d02d63972fd..dc1d1ed9d3b66 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 e3d02d63972fd..dc1d1ed9d3b66 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 f141896b744e5..16bcf7c15e082 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: 9a9e51b1f66126da5ed76e2193f87ebc044732dbccfda15b24957b0de4711573
+    manifestHash: b9c980768f9b9bcba3a73ca9d06ad4dcfea5b4a9bcc7450dd8a8b014f86aa5d8
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 4970d3e09528d..70f59d2fea7fb 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 90cb28cb9acf5..f53dd07479131 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 90cb28cb9acf5..f53dd07479131 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 90cb28cb9acf5..f53dd07479131 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 e3d02d63972fd..dc1d1ed9d3b66 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 e3d02d63972fd..dc1d1ed9d3b66 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 e3d02d63972fd..dc1d1ed9d3b66 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 f141896b744e5..16bcf7c15e082 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: 9a9e51b1f66126da5ed76e2193f87ebc044732dbccfda15b24957b0de4711573
+    manifestHash: b9c980768f9b9bcba3a73ca9d06ad4dcfea5b4a9bcc7450dd8a8b014f86aa5d8
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 4970d3e09528d..70f59d2fea7fb 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 4a2d2c10cad29..8de6f982c92f1 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 266723df72cb4..f6f47b7891862 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 3ba0457a89baa..a37b50d2450a1 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: aa75f2508393bf9b8d29da831d2947e55bda024d79b27280bf79d3abe2f4ed91
+    manifestHash: d14a933e2112653a396153960b12b7379dc8023215546f80b1146c585e377d9a
     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: 2bcf89a2b648a9c88d2d8bb224a25f455358f9fd3420b8ad4f24c4fda16add44
+    manifestHash: 28b68b7c1430ae14d29a1bababa872e0742dc7e5a7750c6375a9ba80a844890f
     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 1dabc7d8256fe..ea681e9d9ec08 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 81cd7347d7381..03f817423dce2 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 4a2d2c10cad29..8de6f982c92f1 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 266723df72cb4..f6f47b7891862 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 63dc90e1ddbf5..a77ed7f147db0 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: aa75f2508393bf9b8d29da831d2947e55bda024d79b27280bf79d3abe2f4ed91
+    manifestHash: d14a933e2112653a396153960b12b7379dc8023215546f80b1146c585e377d9a
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 81cd7347d7381..03f817423dce2 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 567976ef3b6e8..b996a0433f307 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 c5a684490e638..cdfc0ef5b5303 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 d3b159bd948b0..c3173a80095f2 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: 678d61365d3b860224dfd08e4fc1e1e9d90a67afa40aee3068b7f5a70242d86e
+    manifestHash: b146f94c8c1abe4058fecb6740a28abc00ef96f7e6ce7d2756bdc7c20f2e6a86
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 0916016cd0a92..fd75d5002a571 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 2fdc30cad1c64..e0c0b7033414e 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 9c3c76e71c3f2..165efce0059a5 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 93a0d65c43086..aa1c51dec0734 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: 9389168a1942463de15c69105a7abc99a65cbe1e1d18029e6129c3efeea76a71
+    manifestHash: c46ed7bcbb4b6c6eb2b2932c0f6d9cee009bcab2dd1fda84cd0c5557e30bd5b5
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 70f53767b0df6..f98538113d216 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 000008a8d3941..476d08fc29316 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 eb70276a6db76..16cd66dc5e4c9 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 59a767d09b424..9f4927dacab02 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: 46ccdbd5a4eac4b4fc226d610c5e51cb9c66739221df7e4773d0ac76134ea10e
+    manifestHash: fdd53330950f9df95927b9614e8fdab369541b25d6a67d7dceb7f3939ec61467
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 fd7d05578ca80..97f220ae3e65e 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 36e6648b0ca03..4b521352e0282 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 46dcc4c75a36a..a4c8064bcafa0 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 7c8bab2cc71fe..7fccd40eaf871 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: 54d9fc676a5220f664b63b4f1fa4bb2e0a14c8ac4a58c0518d89834a59e0887f
+    manifestHash: c4d6eb578aea2425e95e311f2392085ed60ab6882a3fb57e1c083a4c1ee1d181
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 f3e220cafbb5f..77fb5b6c88dcf 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 4af639a2bf829..32210e0f3e80f 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 666a7da6f35a0..4b9596984f773 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 ee1f8b6ed71aa..ce0ae91b3a9d4 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: 67b5c7909553dc861058e94118e10fd55f6ef8c54d487fb5537d2814f22f9fcf
+    manifestHash: 24c5a2c5fc91a5272d617dced1b294ca8458bc53a3d311c93c49da3f757ee368
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 346c118c87814..45a74750a191f 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 fa73c0322b86c..14c8cf6144ecf 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 6755f478aa092..7c449e41f41d2 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 5ecff4bbea719..30f8ebf2ed3d9 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: a2b2aad80abb33d36620c59b3874018bffd8b6b120fdcc78d2aeae4a73448846
+    manifestHash: 9a0a8775588470be1be38b5370ab2630d54bce802886777343a093d6d39173ba
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 ca3f41f05756a..37942ab5eaa5a 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 fa73c0322b86c..14c8cf6144ecf 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 6755f478aa092..7c449e41f41d2 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 bb98e8fcabfc2..4fa547a477bc0 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: a2b2aad80abb33d36620c59b3874018bffd8b6b120fdcc78d2aeae4a73448846
+    manifestHash: 9a0a8775588470be1be38b5370ab2630d54bce802886777343a093d6d39173ba
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 ca3f41f05756a..37942ab5eaa5a 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 fa73c0322b86c..14c8cf6144ecf 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 6755f478aa092..7c449e41f41d2 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 ac1da347bf12b..fcb4adc5a9278 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: a2b2aad80abb33d36620c59b3874018bffd8b6b120fdcc78d2aeae4a73448846
+    manifestHash: 9a0a8775588470be1be38b5370ab2630d54bce802886777343a093d6d39173ba
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 ca3f41f05756a..37942ab5eaa5a 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 4bea6c328765c..898742ea630e5 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 2aa0d8a7884e1..18ab24b29393c 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 fe958a26c7f41..92c93e498150f 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 b18a7c648f6a9..93811f412fddf 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: de74202f8f60ad956244d31a4a8a64b0669196a01e66285a1bc2cba92b093b9e
+    manifestHash: a398742fe300050e651c34a586c741817f40cea9c0e1b58e34a124a7ea2d9905
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 01da5a8622482..b0f094ff76092 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 4782c3ed6f2bb..b98d0ae56c4c2 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 170b302e3d09d..aef4b99069f0c 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 77305adf6b3ef..5c5e889929a5f 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: aaf5508c988ad28f920f6dff9b1a8ececce83dc8b59f6f5aa13c6172eab6dc65
+    manifestHash: 9cd37c45756f632acdcb60f2cfeafef276aff73ef8a5a0a5d2cde4c08244c051
     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: d78d19c82bd59418edcd3116519aeaa79d16d228bf1f1049e039f4283a6eab81
+    manifestHash: 9a55c680c0af182ed0d4e64abc0122cb3cda3b8af6e165c4fc02b3c815779690
     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 155bc7916caea..b1fcaf814973a 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 c9c6cf73f73be..925d0e87e4348 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 5d67bf7b316a2..365e00d3a1e0a 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 5c62cd6db5261..597d4bf51c88e 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 8f05023d9cd40..6cdc697b8710a 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: 78c2aab41fb7e35fe95c774be72ed33c240b4533220437a1b188992687799590
+    manifestHash: 87c935889dc25fc427cb9f9acf139c5a715334aade448039d1a82b8b769da9ea
     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: 36b795725446c903aa722966a47a8697d558ea24152c3738ea0b7fe5ff4326c9
+    manifestHash: ee5f5deaf76901d51a5d773224d60e3c169b6ecc2395910ecaac64a6145da459
     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 d02fef56f9394..41b356d2c1137 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 283007d58203d..d875f56e5057e 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 9c5fa92c78f62..dc82b4a24ae82 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 a597085c0b8ed..a54c05ae5aaac 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 7dc19fdf952af..6cdce93fe4976 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: 1ac09badbac13ef13c07d1ab7417124a9ffc14541bef1ba6450e9aa5d2478d8f
+    manifestHash: cca2e671b5f42f7a53d609b7c56d1d82ed333ce1a43714e6afcb4587f58f73e0
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 7ec59daf9149a..a53db04c59f7b 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 e35fbbc00fbd2..3073de2661894 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 e72372304b9db..ed5d734351834 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 7e1ab493d7237..1ef7af764ff23 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: e1b3988961a8135c2e369e078ec365376d50dee419d95ce7b895fa4c14f4b88f
+    manifestHash: 88aff0f71e65717b2cc8e659e4ad106358e7402b4aaeb438ad7153b7f0d4dd89
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 713eff0488f0c..92873e82e4a58 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 567976ef3b6e8..b996a0433f307 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 c5a684490e638..cdfc0ef5b5303 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 05728d5cc845e..93ef512d2d577 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: 678d61365d3b860224dfd08e4fc1e1e9d90a67afa40aee3068b7f5a70242d86e
+    manifestHash: b146f94c8c1abe4058fecb6740a28abc00ef96f7e6ce7d2756bdc7c20f2e6a86
     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: 28de16c8b1b57c270b000cadf18449a140f358e0ba42cbbc428a0771cc3e9b3e
+    manifestHash: 2c20cbb80e963e2f0411f8075664b93be9b960be76fa2356702c056017b1c79c
     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 aead46f51fa29..8f86f5d80341d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 0916016cd0a92..fd75d5002a571 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 110924216f837..493c189a8eb51 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 974e7a760d29a..67de1fb718cc2 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 90d215fc47a21..5083ad5e53fcb 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: d1126978ece6246a87e474377d77cb67a09ae17507042a042a101d45e8797e92
+    manifestHash: 1e8a84078b64d3ecfa67c26bda381ffd40143f23e2e754c3014018dd48d60fc2
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 9b9bcf20bf268..34e0ed071b289 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 9a2919df5de77..6081ba5cba7bf 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 12254cab06ac0..f3577db238b86 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 8bab71cce53e3..6a582e1235e5a 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: a9c04e70efb2d3d68347fb997beb3651adf10ffc7c7d16e4728e1dee27fefbf7
+    manifestHash: c67aff00aa5eb29574f0ba640e2464c654a7200a3f6e7ac025c3480a13ae956d
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 3b52dbe250fb6..e4d8cc6f1f056 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 ca37227da1df2..6a60131ee7e31 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 192b747850c91..ab2638416681f 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 2f2bddd545dbb..dc6e5b70f9493 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: 2febdbf50d04aa6e5ae50ec4b7a51c714d26ebcd19faef68d7a276efcd2f1945
+    manifestHash: 36c0e8b21c25a5cc186ca3e759906b2ddf2744aaa47cd832b85978d9e02c82ed
     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: 029c3b36b1ded96744fc77c6e346afa641d06fe10d49abdc56b45349597759fc
+    manifestHash: 6fafc292c167c734388692ce80f848b792a6819e8a5fbd8bf256e546fbef3b5a
     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 8d29dc6c9e91e..295eb22269d72 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 167250c5dda7b..8c3a6dd9f610f 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 b0a8468b038d2..b943836a865b8 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 07af39d1366e1..6d357a1837c15 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 d684cec4c5f43..27d15b3e0ca8d 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: 0686bded1e5ba30438634d211c5107d20f9a1c1bd36170b67b48a7c217b49040
+    manifestHash: 380594a5a19e3004a0b2080fc2279c3cf55f7624f02851346a460879854152fe
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 6a28db38fb217..3be7470d10a83 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 567976ef3b6e8..b996a0433f307 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 c5a684490e638..cdfc0ef5b5303 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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     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.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -103,7 +103,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.3
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.4
     name: init-etcd-symlinks-3-5-9
     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 71e837b7cb068..b3bfc28904401 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.28.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.4
     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 a62216806e9bb..6d346910bc42b 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: 678d61365d3b860224dfd08e4fc1e1e9d90a67afa40aee3068b7f5a70242d86e
+    manifestHash: b146f94c8c1abe4058fecb6740a28abc00ef96f7e6ce7d2756bdc7c20f2e6a86
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 eea7ae24e2946..0f5dd63171c1d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 0916016cd0a92..fd75d5002a571 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 3d4d481db28d5..74e9462f9b48b 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: fba8fb406134151fc90768caa818b8975fc3c9e4b4f29d59dddb200ab38b027a
+    manifestHash: 805b45f701eb2b35019137ded8ed2bff899876ad3449b8eecfabdc0d265f0c6c
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 3d4d481db28d5..74e9462f9b48b 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: fba8fb406134151fc90768caa818b8975fc3c9e4b4f29d59dddb200ab38b027a
+    manifestHash: 805b45f701eb2b35019137ded8ed2bff899876ad3449b8eecfabdc0d265f0c6c
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 def42576cf868..23031068dc972 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: fba8fb406134151fc90768caa818b8975fc3c9e4b4f29d59dddb200ab38b027a
+    manifestHash: 805b45f701eb2b35019137ded8ed2bff899876ad3449b8eecfabdc0d265f0c6c
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 2d491bfe64090..a54fcd6e77ca5 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: fba8fb406134151fc90768caa818b8975fc3c9e4b4f29d59dddb200ab38b027a
+    manifestHash: 805b45f701eb2b35019137ded8ed2bff899876ad3449b8eecfabdc0d265f0c6c
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 71b344d67211f..d6cd7cccebd5e 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: fba8fb406134151fc90768caa818b8975fc3c9e4b4f29d59dddb200ab38b027a
+    manifestHash: 805b45f701eb2b35019137ded8ed2bff899876ad3449b8eecfabdc0d265f0c6c
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 11f22de8da763..f6d8aa745a3e7 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 9c275f8d8bd83..93ed228c23c2a 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: fba8fb406134151fc90768caa818b8975fc3c9e4b4f29d59dddb200ab38b027a
+    manifestHash: 805b45f701eb2b35019137ded8ed2bff899876ad3449b8eecfabdc0d265f0c6c
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 d47ce6052c067..082b06b2f2099 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: fba8fb406134151fc90768caa818b8975fc3c9e4b4f29d59dddb200ab38b027a
+    manifestHash: 805b45f701eb2b35019137ded8ed2bff899876ad3449b8eecfabdc0d265f0c6c
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 77f531af5144e..78d7700a088d2 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: 5c4db5386ccadd80a74c8a0716bff229e63af4fc45816e8780af0747fded3a94
+    manifestHash: 2dc8645c1aea11826c4953efb791934ef650dabc7431efe37982f7496dd73439
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 0350453e83344..c672fe02c8453 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: 5c4db5386ccadd80a74c8a0716bff229e63af4fc45816e8780af0747fded3a94
+    manifestHash: 2dc8645c1aea11826c4953efb791934ef650dabc7431efe37982f7496dd73439
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     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 aead46f51fa29..8f86f5d80341d 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/dns-controller:1.28.4
         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 11f22de8da763..f6d8aa745a3e7 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 8c29f46190c45..f94becb733c86 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: fba8fb406134151fc90768caa818b8975fc3c9e4b4f29d59dddb200ab38b027a
+    manifestHash: 805b45f701eb2b35019137ded8ed2bff899876ad3449b8eecfabdc0d265f0c6c
     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: 28de16c8b1b57c270b000cadf18449a140f358e0ba42cbbc428a0771cc3e9b3e
+    manifestHash: 2c20cbb80e963e2f0411f8075664b93be9b960be76fa2356702c056017b1c79c
     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 11f22de8da763..f6d8aa745a3e7 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.28.3
+    version: v1.28.4
   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.28.3
+        version: v1.28.4
     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.28.3
+        image: registry.k8s.io/kops/kops-controller:1.28.4
         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 db06ae5a80cad..349176c4f8cfe 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: fba8fb406134151fc90768caa818b8975fc3c9e4b4f29d59dddb200ab38b027a
+    manifestHash: 805b45f701eb2b35019137ded8ed2bff899876ad3449b8eecfabdc0d265f0c6c
     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: d693573deb392d37bf075df9ea1f49bf58be87223367525ab2dbf7c3e67dbdc1
+    manifestHash: feb19f8ae201c9c08aa0d7b0beec0d58b9e7b13c2a43fd23226397e6fcf8a4eb
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
diff --git a/upup/pkg/fi/cloudup/urls_test.go b/upup/pkg/fi/cloudup/urls_test.go
index a81cb6be4e7b2..7fddc7d8bf543 100644
--- a/upup/pkg/fi/cloudup/urls_test.go
+++ b/upup/pkg/fi/cloudup/urls_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.28.3/linux/amd64/nodeup",
-				"https://github.com/kubernetes/kops/releases/download/v1.28.3/nodeup-linux-amd64",
+				"https://artifacts.k8s.io/binaries/kops/1.28.4/linux/amd64/nodeup",
+				"https://github.com/kubernetes/kops/releases/download/v1.28.4/nodeup-linux-amd64",
 			},
 		},
 		{
 			url: "https://artifacts.k8s.io/binaries/kops/%s/linux/arm64/nodeup",
 			expected: []string{
-				"https://artifacts.k8s.io/binaries/kops/1.28.3/linux/arm64/nodeup",
-				"https://github.com/kubernetes/kops/releases/download/v1.28.3/nodeup-linux-arm64",
+				"https://artifacts.k8s.io/binaries/kops/1.28.4/linux/arm64/nodeup",
+				"https://github.com/kubernetes/kops/releases/download/v1.28.4/nodeup-linux-arm64",
 			},
 		},
 	}