diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 42642c3..3429b88 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -18,11 +18,15 @@ jobs: uses: helm/kind-action@v1 with: config: ci/kind.yaml - - name: Build and Load images + cluster_name: flame_ci_cluster + - name: Build images run: | - make - kind load docker-image xflops/flame-session-manager:v0.3.0 - kind load docker-image xflops/flame-executor-manager:v0.3.0 + 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/ diff --git a/Makefile b/Makefile index 61eae19..068841c 100644 --- a/Makefile +++ b/Makefile @@ -9,3 +9,8 @@ init: 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 . diff --git a/installer/flame-console.yaml b/installer/flame-console.yaml index 20ae183..a8682bc 100644 --- a/installer/flame-console.yaml +++ b/installer/flame-console.yaml @@ -16,7 +16,8 @@ spec: spec: containers: - name: console - image: xflops/flame-console:v0.3.0 + image: xflops/flame-console:latest + imagePullPolicy: IfNotPresent env: - name: RUST_LOG value: "info" diff --git a/installer/flame-executor-manager.yaml b/installer/flame-executor-manager.yaml index 4698c15..f756cea 100644 --- a/installer/flame-executor-manager.yaml +++ b/installer/flame-executor-manager.yaml @@ -16,7 +16,8 @@ spec: spec: containers: - name: fem - image: xflops/flame-executor-manager:v0.3.0 + image: xflops/flame-executor-manager:latest + imagePullPolicy: IfNotPresent env: - name: RUST_LOG value: "info" diff --git a/installer/flame-session-manager.yaml b/installer/flame-session-manager.yaml index 11f859a..ba09e77 100644 --- a/installer/flame-session-manager.yaml +++ b/installer/flame-session-manager.yaml @@ -16,7 +16,8 @@ spec: spec: containers: - name: fsm - image: xflops/flame-session-manager:v0.3.0 + image: xflops/flame-session-manager:latest + imagePullPolicy: IfNotPresent env: - name: RUST_LOG value: "info" diff --git a/installer/kustomization.yaml b/installer/kustomization.yaml index 39320e9..9b66617 100644 --- a/installer/kustomization.yaml +++ b/installer/kustomization.yaml @@ -5,6 +5,7 @@ resources: - flame-system.yaml - flame-executor-manager.yaml - flame-session-manager.yaml + - flame-console.yaml - fsm-service.yaml configMapGenerator: - name: flame-conf