Skip to content

Commit 3050dc7

Browse files
committed
Add crictl windows binaries to workspace
The windows binaries for as well as the 32bit linux binary was missing from the workspace, which has been added now. Signed-off-by: Sascha Grunert <[email protected]>
1 parent 3ec5fe5 commit 3050dc7

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

build/debs/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ genrule(
148148
name = "cri-tools-data-%s" % goarch,
149149
package_dir = "/usr/bin",
150150
tags = ["manual"],
151-
deps = ["@cri_tools_%s//file" % goarch],
151+
deps = ["@cri_tools_linux-%s//file" % goarch],
152152
) for goarch in NODE_PLATFORMS["linux"]]
153153

154154
[k8s_deb(

build/rpms/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ genrule(
106106
[pkg_rpm_for_goarch(
107107
name = "cri-tools",
108108
data = [
109-
"@cri_tools_{GOARCH}//file",
109+
"@cri_tools_linux-{GOARCH}//file",
110110
],
111111
goarch = arch,
112112
spec_file = "cri-tools.spec",

build/workspace.bzl

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,14 @@ _CNI_TARBALL_ARCH_SHA256 = {
2828

2929
CRI_TOOLS_VERSION = "1.16.1"
3030
_CRI_TARBALL_ARCH_SHA256 = {
31-
"amd64": "19fed421710fccfe58f5573383bb137c19438a9056355556f1a15da8d23b3ad1",
32-
"arm": "367826f3eb06c4d923f3174d23141ddacef9ffcb0c902502bd922dbad86d08dd",
33-
"arm64": "62b60ab7046b788df892a1b746bd602c520a59c38232febc0580692c9805f641",
34-
"ppc64le": "d6464188a5011242b8dad22cb1e55d8cb29d6873f3d1f3f3c32bb236d3fca64e",
35-
"s390x": "f3d5e707810d7985f6a470ea439ca5989c0ee218a824795ed1726f4958281a2d",
31+
"linux-386": "35b721a7a90a12cf9689fb1f4fe5b50f73520200130a52b552234bd798d2ae9f",
32+
"linux-amd64": "19fed421710fccfe58f5573383bb137c19438a9056355556f1a15da8d23b3ad1",
33+
"linux-arm": "367826f3eb06c4d923f3174d23141ddacef9ffcb0c902502bd922dbad86d08dd",
34+
"linux-arm64": "62b60ab7046b788df892a1b746bd602c520a59c38232febc0580692c9805f641",
35+
"linux-ppc64le": "d6464188a5011242b8dad22cb1e55d8cb29d6873f3d1f3f3c32bb236d3fca64e",
36+
"linux-s390x": "f3d5e707810d7985f6a470ea439ca5989c0ee218a824795ed1726f4958281a2d",
37+
"windows-386": "b7564675f69aa2a01b092874c9c9aeda084204384d711a6fb85c6d2328ca5c7d",
38+
"windows-amd64": "7d092dcb3b1af2edf75477d5d049a70e8c0d1ac8242b1dff2de7e6aa084e3615",
3639
}
3740

3841
ETCD_VERSION = "3.3.15"
@@ -65,7 +68,7 @@ def cri_tarballs():
6568
name = "cri_tools_%s" % arch,
6669
downloaded_file_path = "cri_tools.tgz",
6770
sha256 = sha,
68-
urls = mirror("https://github.com/kubernetes-incubator/cri-tools/releases/download/v%s/crictl-v%s-linux-%s.tar.gz" % (CRI_TOOLS_VERSION, CRI_TOOLS_VERSION, arch)),
71+
urls = mirror("https://github.com/kubernetes-incubator/cri-tools/releases/download/v%s/crictl-v%s-%s.tar.gz" % (CRI_TOOLS_VERSION, CRI_TOOLS_VERSION, arch)),
6972
)
7073

7174
# Use go get -u github.com/estesp/manifest-tool to find these values

0 commit comments

Comments
 (0)