diff --git a/.github/workflows/flyte-binary-v2.yml b/.github/workflows/flyte-binary-v2.yml index bb10f4f48d..23d2c70d9b 100644 --- a/.github/workflows/flyte-binary-v2.yml +++ b/.github/workflows/flyte-binary-v2.yml @@ -152,20 +152,13 @@ jobs: type=raw,value=nightly,enable=${{ github.event_name == 'push' && github.ref == 'refs/heads/v2' }} type=sha,format=long, - name: Login to GitHub Container Registry + if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }} uses: docker/login-action@v2 with: registry: ghcr.io username: "${{ secrets.FLYTE_BOT_USERNAME }}" password: "${{ secrets.FLYTE_BOT_PAT }}" - - name: Save console image tarballs - run: | - mkdir -p docker/demo-bundled/images/tar/amd64 docker/demo-bundled/images/tar/arm64 - docker pull --platform linux/amd64 ghcr.io/flyteorg/flyte-client-v2:latest - docker save ghcr.io/flyteorg/flyte-client-v2:latest -o docker/demo-bundled/images/tar/amd64/flyte-client-v2.tar - docker pull --platform linux/arm64 ghcr.io/flyteorg/flyte-client-v2:latest - docker save ghcr.io/flyteorg/flyte-client-v2:latest -o docker/demo-bundled/images/tar/arm64/flyte-client-v2.tar - name: Build and push multi-arch image - if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }} uses: docker/build-push-action@v6 with: context: docker/demo-bundled @@ -173,4 +166,4 @@ jobs: platforms: linux/arm64, linux/amd64 tags: ${{ steps.image-names.outputs.tags }} build-args: "FLYTE_DEMO_VERSION=${{ env.FLYTE_DEMO_VERSION }}" - push: true + push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }} diff --git a/charts/flyte-demo/values.yaml b/charts/flyte-demo/values.yaml index 3b66a4e24f..7f72022562 100644 --- a/charts/flyte-demo/values.yaml +++ b/charts/flyte-demo/values.yaml @@ -145,6 +145,6 @@ sandbox: console: enabled: true image: - repository: ghcr.io/flyteorg/flyte-client-v2 - tag: latest + repository: docker.io/unionai-oss/flyteconsole-v2 + tag: sandbox pullPolicy: Never diff --git a/docker/demo-bundled/Makefile b/docker/demo-bundled/Makefile index b2f1a02713..40ae40005a 100644 --- a/docker/demo-bundled/Makefile +++ b/docker/demo-bundled/Makefile @@ -51,23 +51,12 @@ manifests: dep_update --load-restrictor=LoadRestrictionsNone \ kustomize/dev > manifests/dev.yaml -CONSOLE_IMAGE := ghcr.io/flyteorg/flyte-client-v2 -CONSOLE_TAG := latest - -.PHONY: console -console: - mkdir -p images/tar/amd64 images/tar/arm64 - docker pull --platform linux/amd64 $(CONSOLE_IMAGE):$(CONSOLE_TAG) - docker save $(CONSOLE_IMAGE):$(CONSOLE_TAG) -o images/tar/amd64/flyte-client-v2.tar - docker pull --platform linux/arm64 $(CONSOLE_IMAGE):$(CONSOLE_TAG) - docker save $(CONSOLE_IMAGE):$(CONSOLE_TAG) -o images/tar/arm64/flyte-client-v2.tar - .PHONY: sync-crds sync-crds: $(MAKE) -C ../../executor manifests .PHONY: build -build: sync-crds flyte console dep_update manifests +build: sync-crds flyte dep_update manifests docker buildx build --builder flyte-demo --allow security.insecure --load \ --tag flyte-demo:latest . @@ -120,7 +109,3 @@ kubeconfig: .PHONY: stop stop: docker stop --time 5 flyte-demo - -.venv: - python -m venv .venv - . .venv/bin/activate && pip install flytekit diff --git a/docker/demo-bundled/images/manifest.txt b/docker/demo-bundled/images/manifest.txt index fe6a52ca20..e472a21c60 100644 --- a/docker/demo-bundled/images/manifest.txt +++ b/docker/demo-bundled/images/manifest.txt @@ -5,3 +5,4 @@ docker.io/rancher/mirrored-coredns-coredns:1.9.1 docker.io/rancher/mirrored-library-busybox:1.34.1 docker.io/rancher/mirrored-pause:3.6 docker.io/rustfs/rustfs:sandbox=rustfs/rustfs:latest +docker.io/unionai-oss/flyteconsole-v2:sandbox=ghcr.io/unionai-oss/flyteconsole-v2:latest diff --git a/docker/demo-bundled/manifests/complete.yaml b/docker/demo-bundled/manifests/complete.yaml index a452dabf7c..b8532c03ec 100644 --- a/docker/demo-bundled/manifests/complete.yaml +++ b/docker/demo-bundled/manifests/complete.yaml @@ -1015,7 +1015,7 @@ spec: app.kubernetes.io/name: flyte-demo spec: containers: - - image: ghcr.io/flyteorg/flyte-client-v2:latest + - image: docker.io/unionai-oss/flyteconsole-v2:sandbox imagePullPolicy: Never livenessProbe: httpGet: diff --git a/docker/demo-bundled/manifests/dev.yaml b/docker/demo-bundled/manifests/dev.yaml index 55e645545f..a6b3fa40c6 100644 --- a/docker/demo-bundled/manifests/dev.yaml +++ b/docker/demo-bundled/manifests/dev.yaml @@ -629,7 +629,7 @@ spec: app.kubernetes.io/name: flyte-demo spec: containers: - - image: ghcr.io/flyteorg/flyte-client-v2:latest + - image: docker.io/unionai-oss/flyteconsole-v2:sandbox imagePullPolicy: Never livenessProbe: httpGet: