Skip to content

Commit 9b48139

Browse files
committed
Use bazel built tool to create bundle. Use seperate layer and directory for bundle file
Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
1 parent 5362d3d commit 9b48139

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

k8s/cloud/base/proxy_nginx_config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ data:
268268
}
269269
270270
location /bundle-oss.json {
271-
root /installer;
271+
root /bundles;
272272
try_files "/bundle-oss.json" =404;
273273
}
274274
@@ -340,7 +340,7 @@ data:
340340
}
341341
342342
location /bundle-oss.json {
343-
root /installer;
343+
root /bundles;
344344
try_files "/bundle-oss.json" =404;
345345
}
346346

src/cloud/proxy/BUILD.bazel

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ container_layer(
3030
directory = "/installer",
3131
files = [
3232
"//src/pixie_cli:installer_script",
33+
],
34+
)
35+
36+
container_layer(
37+
name = "bundles",
38+
directory = "/bundles",
39+
files = [
3340
"//src/pxl_scripts:script_bundle",
3441
],
3542
)
@@ -49,6 +56,7 @@ container_image(
4956
layers = [
5057
":ui_assets",
5158
":installer",
59+
":bundles",
5260
":entrypoint",
5361
],
5462
visibility = [

src/pxl_scripts/BUILD.bazel

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ genrule(
3434
":preset_queries",
3535
],
3636
outs = ["bundle-oss.json"],
37-
cmd = "px create-bundle --search_path src/pxl_scripts -o $@ --base px --base bpftrace --base pxbeta --base sotw",
37+
cmd = "$(location //src/pixie_cli:px) create-bundle --search_path src/pxl_scripts -o $@ --base px --base bpftrace --base pxbeta --base sotw",
38+
tools = [
39+
"//src/pixie_cli:px",
40+
],
3841
visibility = ["//src:__subpackages__"],
3942
)

0 commit comments

Comments
 (0)