fix gh runner gvisor cri test

Signed-off-by: JooYoung Park <[email protected]>
vhive-serverless · Mar 5, 2024 · d46882a · d46882a
1 parent e493f69
commit d46882a
Show file tree

Hide file tree

Showing 8 changed files with 109 additions and 7 deletions.
diff --git a/configs/knative_workloads/firecracker/helloworld.yaml b/configs/knative_workloads/firecracker/helloworld.yaml
@@ -0,0 +1,17 @@
+apiVersion: serving.knative.dev/v1
+kind: Service
+metadata:
+  namespace: default
+spec:
+  template:
+    spec:
+      containers:
+        - image: crccheck/hello-world:latest # Stub image. See https://github.com/vhive-serverless/vhive/issues/68
+          ports:
+            - name: h2c # For GRPC support
+              containerPort: 50051
+          env:
+            - name: GUEST_PORT # Port on which the firecracker-containerd container is accepting requests
+              value: "50051"
+            - name: GUEST_IMAGE # Container image to use for firecracker-containerd container
+              value: "ghcr.io/ease-lab/helloworld:var_workload"
diff --git a/configs/knative_workloads/firecracker/helloworldSerial.yaml b/configs/knative_workloads/firecracker/helloworldSerial.yaml
@@ -0,0 +1,18 @@
+apiVersion: serving.knative.dev/v1
+kind: Service
+metadata:
+  namespace: default
+spec:
+  template:
+    spec:
+      containerConcurrency: 1
+      containers:
+        - image: crccheck/hello-world:latest # Stub image. See https://github.com/vhive-serverless/vhive/issues/68
+          ports:
+            - name: h2c # For GRPC support
+              containerPort: 50051
+          env:
+            - name: GUEST_PORT # Port on which the firecracker-containerd container is accepting requests
+              value: "50051"
+            - name: GUEST_IMAGE # Container image to use for firecracker-containerd container
+              value: "ghcr.io/ease-lab/helloworld:var_workload"
diff --git a/configs/knative_workloads/firecracker/helloworld_local.yaml b/configs/knative_workloads/firecracker/helloworld_local.yaml
@@ -0,0 +1,17 @@
+apiVersion: serving.knative.dev/v1
+kind: Service
+metadata:
+  namespace: default
+spec:
+  template:
+    spec:
+      containers:
+        - image: crccheck/hello-world:latest # Stub image. See https://github.com/vhive-serverless/vhive/issues/68
+          ports:
+            - name: h2c # For GRPC support
+              containerPort: 50051
+          env:
+            - name: GUEST_PORT # Port on which the firecracker-containerd container is accepting requests
+              value: "50051"
+            - name: GUEST_IMAGE # Container image to use for firecracker-containerd container
+              value: "docker-registry.registry.svc.cluster.local:5000/vhiveease/helloworld:var_workload"
diff --git a/configs/knative_workloads/firecracker/pyaes.yaml b/configs/knative_workloads/firecracker/pyaes.yaml
@@ -0,0 +1,17 @@
+apiVersion: serving.knative.dev/v1
+kind: Service
+metadata:
+  namespace: default
+spec:
+  template:
+    spec:
+      containers:
+        - image: crccheck/hello-world:latest # Stub image. See https://github.com/vhive-serverless/vhive/issues/68
+          ports:
+            - name: h2c # For GRPC support
+              containerPort: 50051
+          env:
+            - name: GUEST_PORT # Port on which the firecracker-containerd container is accepting requests
+              value: "50051"
+            - name: GUEST_IMAGE # Container image to use for firecracker-containerd container
+              value: "ghcr.io/ease-lab/pyaes:var_workload"
diff --git a/configs/knative_workloads/gvisor/helloworld.yaml b/configs/knative_workloads/gvisor/helloworld.yaml
@@ -0,0 +1,12 @@
+apiVersion: serving.knative.dev/v1
+kind: Service
+metadata:
+  namespace: default
+spec:
+  template:
+    spec:
+      containers:
+        - image: ghcr.io/ease-lab/helloworld:var_workload
+          ports:
+            - name: h2c # For GRPC support
+              containerPort: 50051
diff --git a/configs/knative_workloads/gvisor/helloworldSerial.yaml b/configs/knative_workloads/gvisor/helloworldSerial.yaml
@@ -0,0 +1,13 @@
+apiVersion: serving.knative.dev/v1
+kind: Service
+metadata:
+  namespace: default
+spec:
+  template:
+    spec:
+      containerConcurrency: 1
+      containers:
+        - image: ghcr.io/ease-lab/helloworld:var_workload
+          ports:
+            - name: h2c # For GRPC support
+              containerPort: 50051
diff --git a/configs/knative_workloads/gvisor/pyaes.yaml b/configs/knative_workloads/gvisor/pyaes.yaml
@@ -0,0 +1,12 @@
+apiVersion: serving.knative.dev/v1
+kind: Service
+metadata:
+  namespace: default
+spec:
+  template:
+    spec:
+      containers:
+        - image: ghcr.io/ease-lab/helloworld:var_workload
+          ports:
+            - name: h2c # For GRPC support
+              containerPort: 50051
diff --git a/scripts/github_runner/setup_cri_test_env.sh b/scripts/github_runner/setup_cri_test_env.sh
@@ -45,11 +45,7 @@ $VHIVE_ROOT/scripts/setup_tool -vhive-repo-dir $VHIVE_ROOT setup_zipkin
 # FIXME (gh-709)
 #source etc/profile && go run $VHIVE_ROOT/examples/registry/populate_registry.go -imageFile $VHIVE_ROOT/examples/registry/images.txt
 
-sudo KUBECONFIG=/etc/kubernetes/admin.conf kn service apply helloworld -f $VHIVE_ROOT/configs/knative_workloads/helloworld.yaml
-# FIXME (gh-709)
-#KUBECONFIG=/etc/kubernetes/admin.conf sudo kn service apply helloworldlocal -f $VHIVE_ROOT/configs/knative_workloads/helloworld_local.yaml
-#                                      ^^^^^^^ This WILL NOT work because ${KUBECONFIG} would not be set in the context when executing `kn`
-
-sudo KUBECONFIG=/etc/kubernetes/admin.conf kn service apply helloworldserial -f $VHIVE_ROOT/configs/knative_workloads/helloworldSerial.yaml
-sudo KUBECONFIG=/etc/kubernetes/admin.conf kn service apply pyaes -f $VHIVE_ROOT/configs/knative_workloads/pyaes.yaml
+sudo KUBECONFIG=/etc/kubernetes/admin.conf kn service apply helloworld -f $VHIVE_ROOT/configs/knative_workloads/$SANDBOX/helloworld.yaml
+sudo KUBECONFIG=/etc/kubernetes/admin.conf kn service apply helloworldserial -f $VHIVE_ROOT/configs/knative_workloads/$SANDBOX/helloworldSerial.yaml
+sudo KUBECONFIG=/etc/kubernetes/admin.conf kn service apply pyaes -f $VHIVE_ROOT/configs/knative_workloads/$SANDBOX/pyaes.yaml
 sleep 30s