restructure to run both spin-registry-push and docker-build-push tests

Signed-off-by: Rajat Jindal <[email protected]>

Author: rajatjindal

Makefile

@@ -42,14 +42,33 @@ pod-status-check:
 workloads:
 	./scripts/workloads.sh
 
+./PHONY: workloads-spin-registry-push
+workloads-spin-registry-push:
+	./scripts/workloads-spin-registry-push.sh
+
 ./PHONY: test-workloads-delete
 test-workloads-delete:
 	./scripts/workloads-delete.sh
 
 .PHONY: integration-tests
-integration-tests: check-bins move-bins up pod-status-check workloads test-workloads-delete
+integration-tests: prepare-cluster-and-images integration-docker-build-push-tests integration-spin-registry-push-tests
+
+.PHONY: integration-docker-build-push-tests
+integration-docker-build-push-tests: workloads test-workloads-delete
+	cargo test -p containerd-shim-spin-tests -- --nocapture
+	kubectl delete -f tests/workloads-common --wait --timeout 60s --ignore-not-found=true
+	kubectl delete -f tests/workloads-docker-build-push --wait --timeout 60s --ignore-not-found=true
+	kubectl wait pod --for=delete -l app=wasm-spin -l app=spin-keyvalue -l app=spin-outbound-redis -l app=spin-multi-trigger-app --timeout 60s
+
+.PHONY: integration-spin-registry-push-tests test-workloads-delete
+integration-spin-registry-push-tests: workloads-spin-registry-push
 	cargo test -p containerd-shim-spin-tests -- --nocapture
+	kubectl delete -f tests/workloads-common --wait --timeout 60s
+	kubectl delete -f tests/workloads-spin-registry-push --wait --timeout 60s
+	kubectl wait pod --for=delete -l app=wasm-spin -l app=spin-keyvalue -l app=spin-outbound-redis -l app=spin-multi-trigger-app --timeout 60s
 
+.PHONY: prepare-cluster-and-images
+prepare-cluster-and-images: check-bins move-bins up pod-status-check
 .PHONY: tests/collect-debug-logs
 tests/collect-debug-logs:
 	./scripts/collect-debug-logs.sh 2>&1

scripts/workloads-spin-registry-push.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -euo pipefail
+
+# Check if kubectl is installed
+if ! command -v kubectl &> /dev/null; then
+    echo "kubectl is not installed. Installing..."
+    curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
+    sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl;
+fi
+
+# apply the workloads
+echo ">>> apply workloads"
+kubectl apply -f tests/workloads-common
+kubectl apply -f tests/workloads-spin-registry-push
+
+
+# wait for all the pods to be ready
+kubectl wait --for=condition=ready --timeout=50s pod --all
+
+# get and describe all the pods
+echo ">>> Pods:"
+kubectl get pods -o wide
+kubectl describe pods
+
+# get and describe all the deployments
+echo ">>> Deployments:"
+kubectl get deployments -o wide
+kubectl describe deployments
+
+# get and describe all the services
+echo ">>> Services:"
+kubectl get services -o wide
+kubectl describe services

scripts/workloads.sh

@@ -11,7 +11,8 @@ fi
 
 # apply the workloads
 echo ">>> apply workloads"
-kubectl apply -f tests/workloads
+kubectl apply -f tests/workloads-common
+kubectl apply -f tests/workloads-docker-build-push
 
 
 # wait for all the pods to be ready

tests/workloads/redis-conf.yaml renamed to tests/workloads-common/redis-conf.yaml

@@ -0,0 +1,212 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: wasm-spin
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: wasm-spin
+  template:
+    metadata:
+      labels:
+        app: wasm-spin
+    spec:
+      runtimeClassName: wasmtime-spin
+      containers:
+        - name: testwasm
+          image: test-registry:5000/spin-registry-push/spin-hello-world:latest
+          imagePullPolicy: IfNotPresent
+          command: ["/"]
+          resources: # limit the resources to 128Mi of memory and 100m of CPU
+            limits:
+              cpu: 100m
+              memory: 128Mi
+            requests:
+              cpu: 100m
+              memory: 128Mi
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: wasm-spin
+spec:
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
+  selector:
+    app: wasm-spin
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: spin-keyvalue
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: spin-keyvalue
+  template:
+    metadata:
+      labels:
+        app: spin-keyvalue
+    spec:
+      runtimeClassName: wasmtime-spin
+      containers:
+        - name: keyvalue
+          image: test-registry:5000/spin-registry-push/spin-keyvalue:latest
+          command: ["/"]
+          imagePullPolicy: IfNotPresent
+          volumeMounts:
+          - name: config-volume
+            mountPath: /runtime-config.toml
+            subPath: runtime-config.toml
+            readOnly: true
+      volumes:
+      - name: config-volume
+        configMap:
+          name: spin-runtime-config
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: spin-keyvalue
+spec:
+  type: LoadBalancer
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
+  selector:
+    app: spin-keyvalue
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: spin-outbound-redis
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: spin-outbound-redis
+  template:
+    metadata:
+      labels:
+        app: spin-outbound-redis
+    spec:
+      runtimeClassName: wasmtime-spin
+      containers:
+        - name: outbound-redis
+          image: test-registry:5000/spin-registry-push/spin-outbound-redis:latest
+          command: ["/"]
+          imagePullPolicy: IfNotPresent
+          env:
+          - name: SPIN_VARIABLE_REDIS_ADDRESS
+            value: redis://redis-service.default.svc.cluster.local:6379
+          - name: SPIN_VARIABLE_REDIS_CHANNEL
+            value: test
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: spin-outbound-redis
+spec:
+  type: LoadBalancer
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
+  selector:
+    app: spin-outbound-redis
+---
+# Middleware
+# Strip prefix /spin
+apiVersion: traefik.containo.us/v1alpha1
+kind: Middleware
+metadata:
+  name: strip-prefix
+spec:
+  stripPrefix:
+    forceSlash: false
+    prefixes:
+      - /spin
+      - /outboundredis
+      - /keyvalue
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: wasm-ingress
+  annotations:
+    ingress.kubernetes.io/ssl-redirect: "false"
+    traefik.ingress.kubernetes.io/router.middlewares: default-strip-prefix@kubernetescrd
+spec:
+  ingressClassName: traefik
+  rules:
+    - http:
+        paths:
+          - path: /spin
+            pathType: Prefix
+            backend:
+              service:
+                name: wasm-spin
+                port:
+                  number: 80
+          - path: /keyvalue
+            pathType: Prefix
+            backend:
+              service:
+                name: spin-keyvalue
+                port:
+                  number: 80
+          - path: /outboundredis
+            pathType: Prefix
+            backend:
+              service:
+                name: spin-outbound-redis
+                port:
+                  number: 80
+          - path: /multi-trigger-app
+            pathType: Prefix
+            backend:
+              service:
+                name: spin-multi-trigger-app
+                port:
+                  number: 80
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: spin-multi-trigger-app
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: spin-multi-trigger-app
+  template:
+    metadata:
+      labels:
+        app: spin-multi-trigger-app
+    spec:
+      runtimeClassName: wasmtime-spin
+      containers:
+      - name: spin-multi-trigger-app
+        image: test-registry:5000/spin-registry-push/spin-multi-trigger-app:latest
+        imagePullPolicy: IfNotPresent
+        command: ["/"]
+        ports:
+        - containerPort: 80
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: spin-multi-trigger-app
+spec:
+  type: LoadBalancer
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
+  selector:
+    app: spin-multi-trigger-app