Fix entrypoint commands for cluster images

infinyon · Apr 12, 2021 · 36c66b9 · 36c66b9
1 parent ce21dcb
commit 36c66b9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/k8-util/docker/build.sh b/k8-util/docker/build.sh
@@ -6,7 +6,7 @@ if [ -n "$MINIKUBE_DOCKER_ENV" ]; then
 fi
 
 tmp_dir=$(mktemp -d -t fluvio-docker-image-XXXXXX)
-cp target/x86_64-unknown-linux-musl/$CARGO_PROFILE/fluvio-run $tmp_dir/fluvio
+cp target/x86_64-unknown-linux-musl/$CARGO_PROFILE/fluvio-run $tmp_dir/fluvio-run
 cp $(dirname $0)/fluvio.Dockerfile $tmp_dir/Dockerfile
 cd $tmp_dir
 docker build -t infinyon/fluvio:$DOCKER_TAG .

diff --git a/k8-util/docker/fluvio.Dockerfile b/k8-util/docker/fluvio.Dockerfile
@@ -1,2 +1,2 @@
 FROM alpine:3.12
-COPY fluvio fluvio
+COPY fluvio-run fluvio-run
diff --git a/k8-util/helm/fluvio-app/templates/sc-deployment.yaml b/k8-util/helm/fluvio-app/templates/sc-deployment.yaml
@@ -26,7 +26,7 @@ spec:
           env:
             - name: RUST_LOG
               value: {{ .Values.scLog }}
-          command: ["/fluvio", "run", "sc"]
+          command: ["/fluvio-run", "sc"]
       {{ if .Values.tls }}
           args:
             - --tls

diff --git a/src/sc/src/k8/objects/spg_group.rs b/src/sc/src/k8/objects/spg_group.rs
@@ -160,8 +160,7 @@ mod k8_convert {
         let mut volumes = vec![];
 
         let mut args = vec![
-            "/fluvio".to_owned(),
-            "run".to_owned(),
+            "/fluvio-run".to_owned(),
             "spu".to_owned(),
             "--sc-addr".to_owned(),
             format!(