From f3065cc5c41a9281495cb631ac9a5019ea7c9875 Mon Sep 17 00:00:00 2001
From: Abhishek Jain <abjain39@in.ibm.com>
Date: Tue, 16 Apr 2024 13:49:27 +0530
Subject: [PATCH] bump skopeo version and checksum (#11044)

Signed-off-by: Abhishek Jain <jain.abhishek1991@gmail.com>
---
 roles/kubespray-defaults/defaults/main/checksums.yml | 8 ++++----
 roles/kubespray-defaults/defaults/main/download.yml  | 2 +-
 scripts/download_hash.sh                             | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/roles/kubespray-defaults/defaults/main/checksums.yml b/roles/kubespray-defaults/defaults/main/checksums.yml
index 066cb2562..b4c40ec5d 100644
--- a/roles/kubespray-defaults/defaults/main/checksums.yml
+++ b/roles/kubespray-defaults/defaults/main/checksums.yml
@@ -1087,37 +1087,37 @@ containerd_archive_checksums:
     1.6.14: 73025da0666079fc3bbd48cf185da320955d323c7dc42d8a4ade0e7926d62bb0
 skopeo_binary_checksums:
   arm:
+    v1.15.0: 0
     v1.14.2: 0
     v1.14.1: 0
     v1.13.3: 0
     v1.13.2: 0
     v1.13.1: 0
     v1.13.0: 0
-    v1.12.0: 0
   arm64:
+    v1.15.0: bde8cc7e764d246281430d5da07ca906ee0838803199e3a6136a58802b2e0207
     v1.14.2: 364c46085de31edf4b312f13587442f4eade1f181bc5a9ea2ab2ffab5b575916
     v1.14.1: fd4fc0adae14f27788fd52cf0d23be2cfd1963e184c4af689de30185455e29a6
     v1.13.3: 1f7726b020ff9bc931ce16caa13c29999738a231f1414028282cd8f8661eb747
     v1.13.2: 520cc31c15796405b82d01c78629d5b581eced3512ca0b6b184ed82f5e18dc86
     v1.13.1: 3b7db2b827fea432aa8a861b5caa250271c05da70bd240aa4045f692eba52e24
     v1.13.0: d23e43323c0a441d1825f9da483b07c7f265f2bd0a4728f7daac4239460600a3
-    v1.12.0: f34476bd33d2ab3784675611b405cc0855ce5decedfa22287e261d23d17e7688
   amd64:
+    v1.15.0: 3cdbcde0163abb4c942f62d0302479d5aa4d31c5970d712841cf5d5f76edc594
     v1.14.2: 51218f93a2b079e36a36f7fbe2d2d86778be0a6947653031b4f9e254e2469224
     v1.14.1: 6b7776bcdf0c92af5d3f3c91a959d091011b42d839025b90f12b7201a083f308
     v1.13.3: 65707992885b1a4a446af6342874749478a1af7e17ab3f4df8fb89509e8b1966
     v1.13.2: 2f00be6ee1c4cbfa7f2452be90a1a2ce88fd92a6d0f6a2e9d901bd2087bd9092
     v1.13.1: 8c15c56a6caffeb863c17d73a6361218c04c7763e020fffc8d5d6745cacfa901
     v1.13.0: 8cb477ee25010497fc9df53a6205dbd9fe264dd8a5ea4e934b9ec24d5bdc126c
-    v1.12.0: 38143238e945959e6b24dba1447ba49e0b79f10a3aef2634391d0205ab950003
   ppc64le:
+    v1.15.0: fb7f390f52f4b81f85d9bdce8715af5e27ee3969eff236b5f3c0f3a0b5a182e1
     v1.14.2: 0
     v1.14.1: 0
     v1.13.3: 0
     v1.13.2: 0
     v1.13.1: 0
     v1.13.0: 0
-    v1.12.0: 0
 yq_checksums:
   arm:
     v4.42.1: 4e3fe0c37793d28e96d465d9958fbf679d8c616e1857d0faf7980ad087f32aee
diff --git a/roles/kubespray-defaults/defaults/main/download.yml b/roles/kubespray-defaults/defaults/main/download.yml
index ab954f491..7d6ae184f 100644
--- a/roles/kubespray-defaults/defaults/main/download.yml
+++ b/roles/kubespray-defaults/defaults/main/download.yml
@@ -127,7 +127,7 @@ multus_version: "v3.8"
 helm_version: "v3.14.2"
 nerdctl_version: "1.7.4"
 krew_version: "v0.4.4"
-skopeo_version: "v1.14.2"
+skopeo_version: "v1.15.0"
 
 # Get kubernetes major version (i.e. 1.17.4 => 1.17)
 kube_major_version: "{{ kube_version | regex_replace('^v([0-9])+\\.([0-9]+)\\.[0-9]+', 'v\\1.\\2') }}"
diff --git a/scripts/download_hash.sh b/scripts/download_hash.sh
index 6bd47cb02..99e126e11 100755
--- a/scripts/download_hash.sh
+++ b/scripts/download_hash.sh
@@ -139,7 +139,7 @@ function get_checksums() {
 ["gvisor_runsc_binary"]="arm ppc64le"
 ["gvisor_containerd_shim_binary"]="arm ppc64le"
 ["containerd_archive"]="arm"
-["skopeo_binary"]="arm ppc64le"
+["skopeo_binary"]="arm"
 )
     echo "${binary}_checksums:" | tee --append "$checksums_file"
     for arch in arm arm64 amd64 ppc64le; do