From c2bb1ab6b728e8639ecac15fdd77e225cd36ad5d Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian@hakman.dev>
Date: Wed, 11 Jan 2023 06:32:22 +0200
Subject: [PATCH] Update containerd to v1.6.15

---
 pkg/model/components/containerd.go | 2 +-
 upup/pkg/fi/cloudup/containerd.go  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/model/components/containerd.go b/pkg/model/components/containerd.go
index 055b5cfd33..d682efd23b 100644
--- a/pkg/model/components/containerd.go
+++ b/pkg/model/components/containerd.go
@@ -47,7 +47,7 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error {
 		// Set version based on Kubernetes version
 		if fi.ValueOf(containerd.Version) == "" {
 			if b.IsKubernetesGTE("1.23") {
-				containerd.Version = fi.PtrTo("1.6.14")
+				containerd.Version = fi.PtrTo("1.6.15")
 				containerd.Runc = &kops.Runc{
 					Version: fi.PtrTo("1.1.4"),
 				}
diff --git a/upup/pkg/fi/cloudup/containerd.go b/upup/pkg/fi/cloudup/containerd.go
index 64d716e42f..cf89984b07 100644
--- a/upup/pkg/fi/cloudup/containerd.go
+++ b/upup/pkg/fi/cloudup/containerd.go
@@ -230,6 +230,7 @@ func findAllContainerdHashesAmd64() map[string]string {
 		"1.6.12": "a56c39795fd0d0ee356b4099a4dfa34689779f61afc858ef84c765c63e983a7d",
 		"1.6.13": "97f00411587512e62ec762828e581047b23199f8744754706d09976ec24a2736",
 		"1.6.14": "7da626d46c4edcae1eefe6d48dc6521db3e594a402715afcddc6ac9e67e1bfcd",
+		"1.6.15": "191bb4f6e4afc237efc5c85b5866b6fdfed731bde12cceaa6017a9c7f8aeda02",
 	}
 
 	return hashes
@@ -252,6 +253,7 @@ func findAllContainerdHashesArm64() map[string]string {
 		"1.6.12": "0a0133336596b2d1dcafe3587eb91ab302afc28f273614e0e02300694b5457a0",
 		"1.6.13": "8c7892ae7c2e96a4a9358b1064fb5519a5c0528b715beee67b72e74d7a644064",
 		"1.6.14": "3ccb61218e60cbba0e1bbe1e5e2bf809ac1ead8eafbbff36c3195d3edd0e4809",
+		"1.6.15": "d63e4d27c51e33cd10f8b5621c559f09ece8a65fec66d80551b36cac9e61a07d",
 	}
 
 	return hashes