Skip to content

Commit

Permalink
revert entrypoint thing
Browse files Browse the repository at this point in the history
  • Loading branch information
cryslith committed Apr 12, 2020
1 parent 1998be3 commit 9019bf5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 1 addition & 2 deletions platform/bazel/package.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def homeworld_deb(name, package, bin = None, data = None, deps = None, depends =
postinst = postinst,
)

def homeworld_oci(name, bin = None, data = None, deps = None, oci_dep = None, ports = None, exec = None, entrypoint = None, visibility = None):
def homeworld_oci(name, bin = None, data = None, deps = None, oci_dep = None, ports = None, exec = None, visibility = None):
pkg_tar(
name = name + "-contents-bin",
files = bin or {},
Expand All @@ -96,7 +96,6 @@ def homeworld_oci(name, bin = None, data = None, deps = None, oci_dep = None, po
repository = "homeworld.private",
base = oci_dep,
cmd = exec,
entrypoint = entrypoint,
tars = tar_deps,
ports = ports,
visibility = visibility,
Expand Down
6 changes: 3 additions & 3 deletions platform/metallb/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ homeworld_oci(
deps = [
"//debian:debian-micro.tgz",
],
entrypoint = ["/usr/bin/controller"],
exec = ["/usr/bin/controller"],
visibility = ["//visibility:public"],
)

Expand All @@ -27,7 +27,7 @@ homeworld_oci(
deps = [
"//debian:debian-micro.tgz",
],
entrypoint = ["/usr/bin/speaker"],
exec = ["/usr/bin/speaker"],
visibility = ["//visibility:public"],
)

Expand All @@ -39,7 +39,7 @@ homeworld_oci(
deps = [
"//debian:debian-micro.tgz",
],
entrypoint = ["/usr/bin/mirror"],
exec = ["/usr/bin/mirror"],
visibility = ["//visibility:public"],
)

Expand Down
2 changes: 2 additions & 0 deletions platform/metallb/kubernetes.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ spec:
spec:
containers:
- args:
- /usr/bin/speaker
- --port=7472
- --config=config
env:
Expand Down Expand Up @@ -326,6 +327,7 @@ spec:
spec:
containers:
- args:
- /usr/bin/controller
- --port=7472
- --config=config
image: homeworld.private/metallb-controller@{controller_digest}
Expand Down

0 comments on commit 9019bf5

Please sign in to comment.