Skip to content

Commit 0e93ede

Browse files
pseudomutoprafull01
authored andcommitted
Update OpenShift binaries to 4.10.18
Updated all of the outdated OpenShift binaries. This also includes a fix to an issue with had with opm. We were copying the tar file into the bin folder and marking it as executable. This naturally, caused issues when we tried to run it.
1 parent 05814a1 commit 0e93ede

File tree

2 files changed

+22
-16
lines changed

2 files changed

+22
-16
lines changed

hack/bin/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,9 @@ genrule(
213213
genrule(
214214
name = "fetch_opm",
215215
srcs = select({
216-
":m1": ["@opm_darwin//file"],
217-
":darwin": ["@opm_darwin//file"],
218-
":k8": ["@opm_linux//file"],
216+
":m1": ["@opm_darwin//:file"],
217+
":darwin": ["@opm_darwin//:file"],
218+
":k8": ["@opm_linux//:file"],
219219
}),
220220
outs = ["opm"],
221221
cmd = "cp $(SRCS) $@",

hack/bin/deps.bzl

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ load("@io_bazel_rules_docker//container:container.bzl", "container_pull")
1717
load("@bazel_gazelle//:deps.bzl", "go_repository")
1818

1919
# This controls the version for all openshift binaries (opm, oc, opernshift-install, etc.)
20-
OPENSHIFT_VERSION = "4.9.17"
20+
OPENSHIFT_VERSION = "4.10.18"
2121
OPENSHIFT_REPO = "https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/{}".format(OPENSHIFT_VERSION)
2222

2323
# filenames and versions from ${OPENSHIFT_REPO}/sha256sum.txt
@@ -32,31 +32,31 @@ OPENSHIFT_BINS = {
3232
"oc": {
3333
"oc_darwin": {
3434
"url": "{}/openshift-client-mac-{}.tar.gz".format(OPENSHIFT_REPO, OPENSHIFT_VERSION),
35-
"sha": "2b06b400ab929275b55d3dbb8d7c54b9f1dd17df0b50247b8fc24b9efc8b1566",
35+
"sha": "285c307491d8ffd19c065a942515fda78e53f95289d4b4985aa4c92439f7f339",
3636
},
3737
"oc_linux": {
3838
"url": "{}/openshift-client-linux-{}.tar.gz".format(OPENSHIFT_REPO, OPENSHIFT_VERSION),
39-
"sha": "390268a64029f2aea7492f493034b75d4979f676f98762dbbf33eb0da5b294db",
39+
"sha": "101bc7e11604b829157b3b314de3760eec857e55f51eeca978825307ff61c190",
4040
},
4141
},
4242
"openshift-install": {
4343
"openshift_darwin": {
4444
"url": "{}/openshift-install-mac-{}.tar.gz".format(OPENSHIFT_REPO, OPENSHIFT_VERSION),
45-
"sha": "0c51934bfff15f8a8bf666bb9b15c894994afd87d838ffc5579e998f56110738",
45+
"sha": "3a36acb92a6759d964a1af62512c747e075a2937a6368203d0598d804db10da2",
4646
},
4747
"openshift_linux": {
4848
"url": "{}/openshift-install-linux-{}.tar.gz".format(OPENSHIFT_REPO, OPENSHIFT_VERSION),
49-
"sha": "4213bf060c25a6f38f86f2245f1f28060185e8baa7431f272e726d50f0044604",
49+
"sha": "27e6ccb60ce2c7dfe611e1639642277572af78a21c622a7443d5a19006b2e45b",
5050
},
5151
},
5252
"opm": {
5353
"opm_darwin": {
5454
"url": "{}/opm-mac-{}.tar.gz".format(OPENSHIFT_REPO, OPENSHIFT_VERSION),
55-
"sha": "f6fb6205f242ffef62ac0f4db738b1c099d3302ebb98b23d94926ef2903ed5d8",
55+
"sha": "36d7104b1fd29e77a880b63e3e1aa67639a48cca1fdf537411b40a0c36140dba",
5656
},
5757
"opm_linux": {
5858
"url": "{}/opm-linux-{}.tar.gz".format(OPENSHIFT_REPO, OPENSHIFT_VERSION),
59-
"sha": "f88d3dcc18950d8cd8512e460de5addcf11e8eb8f31ae675f0dd879908843747",
59+
"sha": "6d422682fd688cbebc7818247005e2baf87675efef4931d2f0a2e744dc613b88",
6060
},
6161
},
6262
}
@@ -397,12 +397,18 @@ def install_opm():
397397
versions = OPENSHIFT_BINS["opm"]
398398

399399
for k, v in versions.items():
400-
http_file(
401-
name = k,
402-
executable = 1,
403-
sha256 = v["sha"],
404-
urls = [v["url"]],
405-
)
400+
http_archive(
401+
name = k,
402+
sha256 = v["sha"],
403+
urls = [v["url"]],
404+
build_file_content = """
405+
filegroup(
406+
name = "file",
407+
srcs = ["opm"],
408+
visibility = ["//visibility:public"],
409+
)
410+
"""
411+
)
406412

407413
## Fetch openshift-installer
408414
def install_openshift():

0 commit comments

Comments
 (0)