Skip to content

Commit f63d9f8

Browse files
saschagrunertrichabanker
authored andcommitted
Use GitHub release for downloading crictl
Pull the artifacts directly from GitHub instead of the `k8s-artifacts-cri-tools` bucket. Signed-off-by: Sascha Grunert <[email protected]>
1 parent c079284 commit f63d9f8

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

cluster/gce/gci/configure.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ EOF
373373
fi
374374

375375
echo "Downloading crictl"
376-
local -r crictl_path="https://storage.googleapis.com/k8s-artifacts-cri-tools/release/${crictl_version}"
376+
local -r crictl_path="https://github.com/kubernetes-sigs/cri-tools/releases/download/${crictl_version}"
377377
download-or-bust "${crictl_hash}" "${crictl_path}/${crictl}"
378378
tar xf "${crictl}"
379379
mv crictl "${KUBE_BIN}/crictl"

cluster/gce/windows/k8s-node-setup.psm1

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ $GCE_METADATA_SERVER = "169.254.169.254"
5858
# Add_InitialHnsNetwork().
5959
$MGMT_ADAPTER_NAME = "vEthernet (Ethernet*"
6060
$CRICTL_VERSION = 'v1.32.0'
61-
$CRICTL_SHA256 = '8763b5b7ef75ed6d1fc02896dead3ddf95627ab1072d7fd702c22223a335ece4'
61+
$CRICTL_SHA512 = 'dc8d5a5821dade9cc56d20f67d77464a0d8b6e43b72cc3c8fa34fdd5927a5eaa7cced6a93906f030e99e9f3e71dd82c60829545a99beccabf4c13b21c8aaf918'
6262

6363
Import-Module -Force C:\common.psm1
6464

@@ -1160,15 +1160,13 @@ function DownloadAndInstall-Crictl {
11601160
if (-not (ShouldWrite-File ${env:NODE_DIR}\crictl.exe)) {
11611161
return
11621162
}
1163-
$CRI_TOOLS_GCS_BUCKET = 'k8s-artifacts-cri-tools'
1164-
$url = ('https://storage.googleapis.com/' + $CRI_TOOLS_GCS_BUCKET +
1165-
'/release/' + $CRICTL_VERSION + '/crictl-' + $CRICTL_VERSION +
1166-
'-windows-amd64.tar.gz')
1163+
$url = ('https://github.com/kubernetes-sigs/cri-tools/releases/download/' +
1164+
$CRICTL_VERSION + '/crictl-' + $CRICTL_VERSION + '-windows-amd64.tar.gz')
11671165
MustDownload-File `
11681166
-URLs $url `
11691167
-OutFile ${env:NODE_DIR}\crictl.tar.gz `
1170-
-Hash $CRICTL_SHA256 `
1171-
-Algorithm SHA256
1168+
-Hash $CRICTL_SHA512 `
1169+
-Algorithm SHA512
11721170
tar xzvf ${env:NODE_DIR}\crictl.tar.gz -C ${env:NODE_DIR}
11731171
}
11741172

0 commit comments

Comments
 (0)