Small cleanups to streamline artifact evaluation (#334)

* Allow kar-k8s-deploy.sh to be used without requiring a local kar cli * bias local yaml files to k3d by using registry:5000 instead of localhost:5000
IBM · Jun 28, 2022 · 230be08 · 230be08
1 parent 8f1bbd7
commit 230be08
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 20 deletions.
diff --git a/benchmark/http-bench/deploy/client.yaml b/benchmark/http-bench/deploy/client.yaml
@@ -28,7 +28,7 @@ spec:
       - name: kar.ibm.com.image-pull
       containers:
       - name: client
-        image: localhost:5000/kar/kar-http-bench-js-image
+        image: registry:5000/kar/kar-http-bench-js-image
         env:
         - name: MAIN
           value: client.js

diff --git a/benchmark/http-bench/deploy/server.yaml b/benchmark/http-bench/deploy/server.yaml
@@ -25,7 +25,7 @@ spec:
   - name: kar.ibm.com.image-pull
   containers:
   - name: server
-    image: localhost:5000/kar/kar-http-bench-js-image
+    image: registry:5000/kar/kar-http-bench-js-image
     ports:
     - containerPort: 9000
       protocol: TCP

diff --git a/benchmark/kafka-bench/deploy/client.yaml b/benchmark/kafka-bench/deploy/client.yaml
@@ -23,7 +23,7 @@ spec:
   - name: kar.ibm.com.image-pull
   containers:
   - name: producer
-    image: localhost:5000/kar/kar-kafka-bench
+    image: registry:5000/kar/kar-kafka-bench
     command: ["/kar/bin/producer"]
     env:
     - name: KAFKA_BROKERS

diff --git a/benchmark/kafka-bench/deploy/server.yaml b/benchmark/kafka-bench/deploy/server.yaml
@@ -23,7 +23,7 @@ spec:
   - name: kar.ibm.com.image-pull
   containers:
   - name: consumer
-    image: localhost:5000/kar/kar-kafka-bench
+    image: registry:5000/kar/kar-kafka-bench
     command: ["/kar/bin/consumer"]
     env:
     - name: KAFKA_BROKERS

diff --git a/benchmark/kar-bench/deploy/client.yaml b/benchmark/kar-bench/deploy/client.yaml
@@ -25,13 +25,14 @@ spec:
     metadata:
       annotations:
         kar.ibm.com/app: kar-bench-js
+        kar.ibm.com/extraArgs: -placement_cache=true
     spec:
       restartPolicy: OnFailure
       imagePullSecrets:
       - name: kar.ibm.com.image-pull
       containers:
       - name: client
-        image: localhost:5000/kar/kar-bench-js-image
+        image: registry:5000/kar/kar-bench-js-image
         env:
         - name: MAIN
           value: client.js
diff --git a/benchmark/kar-bench/deploy/server-quay.yaml b/benchmark/kar-bench/deploy/server-quay.yaml
@@ -24,8 +24,6 @@ metadata:
     kar.ibm.com/service: bench
     kar.ibm.com/extraArgs: -kafka_topic_config=retention.ms=3600000
 spec:
-  imagePullSecrets:
-  - name: kar.ibm.com.image-pull
   containers:
   - name: server
     image: quay.io/ibm/kar-bench-js-image

diff --git a/benchmark/kar-bench/deploy/server.yaml b/benchmark/kar-bench/deploy/server.yaml
@@ -23,11 +23,9 @@ metadata:
     kar.ibm.com/actors: BenchActor
     kar.ibm.com/service: bench
 spec:
-  imagePullSecrets:
-  - name: kar.ibm.com.image-pull
   containers:
   - name: server
-    image: localhost:5000/kar/kar-bench-js-image
+    image: registry:5000/kar/kar-bench-js-image
     env:
     - name: KAR_EXTRA_ARGS
       value: -actors BenchActor
diff --git a/scripts/kar-k8s-deploy.sh b/scripts/kar-k8s-deploy.sh
@@ -23,15 +23,20 @@ set -e
 SCRIPTDIR=$(cd $(dirname "$0") && pwd)
 ROOTDIR="$SCRIPTDIR/.."
 
-version=$(kar version)
-case "$version" in
-  unofficial)
-    helmargs="$helmargs --set-string kar.injector.imageName=registry:5000/kar/kar-injector --set-string kar.injector.sidecarImageName=registry:5000/kar/kar-sidecar"
-    kartag="latest";;
-  *)
-    helmargs="$helmargs --set-string kar.injector.imageName=quay.io/ibm/kar-injector --set-string kar.injector.sidecarImageName=quay.io/ibm/kar-sidecar"
-    kartag="$version";;
-esac
+if command -v kar &> /dev/null; then
+    version=$(kar version)
+    case "$version" in
+        unofficial)
+            helmargs="$helmargs --set-string kar.injector.imageName=registry:5000/kar/kar-injector --set-string kar.injector.sidecarImageName=registry:5000/kar/kar-sidecar"
+            kartag="latest";;
+        *)
+            helmargs="$helmargs --set-string kar.injector.imageName=quay.io/ibm/kar-injector --set-string kar.injector.sidecarImageName=quay.io/ibm/kar-sidecar"
+            kartag="$version";;
+    esac
+else
+    echo "No kar cli in path. Unable to infer desired KAR version; must specify explicitly"
+    kartag=""
+fi
 
 help=""
 args=""
@@ -93,7 +98,9 @@ EOF
     exit 0
 fi
 
-helmargs="$helmargs --set-string kar.version=$kartag "
+if [ -n "$kartag" ]; then
+    helmargs="$helmargs --set-string kar.version=$kartag "
+fi
 
 cd $ROOTDIR