Merge pull request #102 from k82cn/ci_minikube

Run CI with minikube

.github/workflows/code-verify.yaml

@@ -38,3 +38,8 @@ jobs:
         with:
           command: make
           args: clippy-ci-flow
+      - name: Cargo make
+        uses: actions-rs/cargo@v1
+        with:
+          command: make
+          args: build-release

.github/workflows/e2e.yaml

@@ -14,6 +14,25 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Setup Kind Cluster
+        uses: helm/kind-action@v1
+        with:
+          config: ci/kind.yaml
+          cluster_name: flame-ci-cluster
+      - name: Build images
+        run: |
+          make ci-image
+      - name: Load images
+        run: |
+          kind load docker-image --name flame-ci-cluster xflops/flame-session-manager:latest
+          kind load docker-image --name flame-ci-cluster xflops/flame-executor-manager:latest
+          kind load docker-image --name flame-ci-cluster xflops/flame-console:latest
+      - name: Deploy Flame
+        run: |
+          kubectl apply -k installer/
+      - name: Install gRPC
+        run: |
+          sudo apt-get update && sudo apt-get install -y protobuf-compiler
       - name: Install rust
         uses: actions-rs/toolchain@v1
         with:
@@ -25,22 +44,6 @@ jobs:
         with:
           command: install
           args: --debug cargo-make
-      - name: Install gRPC
-        run: |
-          sudo apt-get update && sudo apt-get install -y protobuf-compiler
-      - name: Cargo build
-        uses: actions-rs/cargo@v1
-        with:
-          command: make
-          args: build
-      - name: Install supervisord
-        run: |
-          sudo apt-get update && sudo apt-get install -y supervisor
-      - name: Start supervisord
-        run: |
-          mkdir -p ci/logs
-          cp -r session_manager/migrations .
-          supervisord -c ci/supervisord.conf
       - name: Run E2E Test
         run: |
           cargo make test

Makefile

@@ -4,8 +4,13 @@ FEM_TAG=`cargo get --entry executor_manager/ package.version --pretty`
 all: docker-release
 
 init:
-	cargo install cargo-get
+	cargo install cargo-get --force
 
 docker-release: init
 	sudo docker build -t xflops/flame-session-manager:${FSM_TAG} -f docker/Dockerfile.fsm .
 	sudo docker build -t xflops/flame-executor-manager:${FEM_TAG} -f docker/Dockerfile.fem .
+
+ci-image:
+	sudo docker build -t xflops/flame-session-manager -f docker/Dockerfile.fsm .
+	sudo docker build -t xflops/flame-executor-manager -f docker/Dockerfile.fem .
+	sudo docker build -t xflops/flame-console -f docker/Dockerfile.console .

ci/flame-conf.yaml

@@ -1,6 +1,6 @@
 ---
 name: flame
-endpoint: "http://127.0.0.1:8080"
+endpoint: "http://flame-session-manager.flame-system:8080"
 slot: "cpu=1,mem=1g"
 policy: priority
 storage: sqlite://flame.db

ci/kind.yaml

@@ -0,0 +1,10 @@
+apiVersion: kind.x-k8s.io/v1alpha4
+kind: Cluster
+nodes:
+- role: control-plane
+  extraPortMappings:
+  - containerPort: 30080
+    hostPort: 30080
+- role: worker
+- role: worker
+- role: worker

client/rust/tests/integration_test.rs

@@ -20,7 +20,7 @@ use flame_client as flame;
 
 use self::flame::{FlameError, SessionAttributes, SessionState};
 
-const FLAME_DEFAULT_ADDR: &str = "http://127.0.0.1:8080";
+const FLAME_DEFAULT_ADDR: &str = "http://127.0.0.1:30080";
 
 const FLAME_DEFAULT_APP: &str = "flmexec";
 

docker/Dockerfile.console

@@ -1,4 +1,4 @@
-FROM rust:1.74-slim-bookworm as builder
+FROM rust:1.82-slim-bookworm as builder
 
 WORKDIR /usr/src/flame
 COPY . .

docker/Dockerfile.fem

@@ -1,4 +1,4 @@
-FROM rust:1.74-slim-bookworm as builder
+FROM rust:1.82-slim-bookworm as builder
 
 WORKDIR /usr/src/flame
 COPY . .

docker/Dockerfile.fsm

@@ -1,4 +1,4 @@
-FROM rust:1.74-slim-bookworm as builder
+FROM rust:1.82-slim-bookworm as builder
 
 WORKDIR /usr/src/flame
 COPY . .

installer/flame-console.yaml

@@ -16,7 +16,8 @@ spec:
     spec:
       containers:
       - name: console
-        image: registry.minikube/flame-console:latest
+        image: xflops/flame-console:latest
+        imagePullPolicy: IfNotPresent
         env:
         - name: RUST_LOG
           value: "info"
@@ -26,4 +27,4 @@ spec:
       volumes:
       - name: flame-conf
         configMap:
-          name: flame-conf
+          name: flame-conf

installer/flame-executor-manager.yaml

@@ -5,7 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/name: flame-executor-manager
 spec:
-  replicas: 3
+  replicas: 6
   selector:
     matchLabels:
       app.kubernetes.io/name: flame-executor-manager
@@ -16,7 +16,8 @@ spec:
     spec:
       containers:
       - name: fem
-        image: registry.minikube/flame-executor-manager:latest
+        image: xflops/flame-executor-manager:latest
+        imagePullPolicy: IfNotPresent
         env:
         - name: RUST_LOG
           value: "info"
@@ -26,4 +27,4 @@ spec:
       volumes:
       - name: flame-conf
         configMap:
-          name: flame-conf
+          name: flame-conf

installer/flame-session-manager.yaml

@@ -16,7 +16,8 @@ spec:
     spec:
       containers:
       - name: fsm
-        image: registry.minikube/flame-session-manager:latest
+        image: xflops/flame-session-manager:latest
+        imagePullPolicy: IfNotPresent
         env:
         - name: RUST_LOG
           value: "info"
@@ -32,4 +33,4 @@ spec:
       volumes:
       - name: flame-conf
         configMap:
-          name: flame-conf
+          name: flame-conf

installer/fsm-service.yaml

@@ -3,9 +3,11 @@ kind: Service
 metadata:
   name: flame-session-manager
 spec:
+  type: NodePort
   selector:
     app.kubernetes.io/name: flame-session-manager
   ports:
     - protocol: TCP
       port: 8080
-      targetPort: 8080
+      targetPort: 8080
+      nodePort: 30080

installer/kustomization.yaml

@@ -1,15 +1,15 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: flame-system
 resources:
   - flame-system.yaml
   - flame-executor-manager.yaml
   - flame-session-manager.yaml
-  - fsm-service.yaml
   - flame-console.yaml
+  - fsm-service.yaml
 configMapGenerator:
   - name: flame-conf
     files:
       - flame-conf.yaml
-
 generatorOptions:
-  disableNameSuffixHash: true
+  disableNameSuffixHash: true