Skip to content

Commit 239607f

Browse files
committed
Update the kube-apiserver binaries
1 parent 9716862 commit 239607f

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ test/pkg:
5959
# takes a bit of time.
6060
.PHONY: test/verify
6161
test/verify:
62-
bazel test //hack/...
62+
bazel test --test_output=all //hack/...
6363

6464
.PHONY: test/lint
6565
test/lint:
@@ -94,7 +94,7 @@ test/e2e-short:
9494
test/e2e/testrunner-k3d-%: PACKAGE=$*
9595
test/e2e/testrunner-k3d-%:
9696
bazel run //hack/k8s:k8s -- -type k3d
97-
bazel test --stamp //e2e/$(PACKAGE)/... --test_arg=-test.v --test_arg=-test.parallel=4 --test_arg=parallel=true
97+
bazel test --test_output=all --stamp //e2e/$(PACKAGE)/... --test_arg=-test.v --test_arg=-test.parallel=4 --test_arg=parallel=true
9898

9999
# Use this target to run e2e tests using a k3d k8s cluster.
100100
# This target uses k3d to start a k8s cluster and runs the e2e tests

hack/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ sh_test(
106106
args = [
107107
"run",
108108
"--config .golangci.yaml",
109-
"--timeout 5m",
109+
"--timeout 10m",
110110
],
111111
data = ["@//:all-srcs"],
112112
env = {

hack/bin/BUILD.bazel

+4-2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ genrule(
3838
visibility = ["//visibility:public"],
3939
)
4040

41+
# fetch preflight has only linux supported binary and only used for releasing the operator to openshift
42+
# Hence, fetching same binary for all platforms to allow bazel sync on other platform.
4143
genrule(
4244
name = "fetch_preflight",
4345
srcs = select({
@@ -77,8 +79,8 @@ genrule(
7779
genrule(
7880
name = "io_kubernetes_kube-apiserver",
7981
srcs = select({
80-
":m1": ["@kube-apiserver_linux_amd64//file"],
81-
":darwin": ["@kube-apiserver_linux_amd64//file"],
82+
":m1": ["@kube-apiserver_darwin_arm64//file"],
83+
":darwin": ["@kube-apiserver_darwin_amd64//file"],
8284
":k8": ["@kube-apiserver_linux_amd64//file"],
8385
}),
8486
outs = ["kube-apiserver"],

hack/bin/deps.bzl

+9-2
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,18 @@ def install_misc():
125125

126126
# Install dependencies used by the controller-runtime integration test framework
127127
def install_integration_test_dependencies():
128+
http_file(
129+
name = "kube-apiserver_darwin_arm64",
130+
executable = 1,
131+
sha256 = "b575b687097b4662b7eb2ea5453e4b381994ddf34b85ca4bb8e4f16c5f86bedb",
132+
urls = ["https://storage.googleapis.com/cockroach-operator-testing-assets/kube-apiserver-1.24.2_darwin_arm64"],
133+
)
134+
128135
http_file(
129136
name = "kube-apiserver_darwin_amd64",
130137
executable = 1,
131-
sha256 = "a874d479f183f9e4c19a5c69b44955fabd2e250b467d2d9f0641ae91a82ddbea",
132-
urls = ["https://storage.googleapis.com/cert-manager-testing-assets/kube-apiserver-1.17.3_darwin_amd64"],
138+
sha256 = "800eedc293bcc72eb962df3e8006d7106790ca583a4ea5c107453bab3bf859b4",
139+
urls = ["https://storage.googleapis.com/cockroach-operator-testing-assets/kube-apiserver-1.24.2_darwin_amd64"],
133140
)
134141

135142
http_file(

0 commit comments

Comments
 (0)