Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 22 additions & 19 deletions .github/workflows/flyte-binary-v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
working-directory: docker/demo-bundled/bootstrap
working-directory: docker/devbox-bundled/bootstrap
- name: Check formatting
working-directory: docker/demo-bundled/bootstrap
working-directory: docker/devbox-bundled/bootstrap
run: |
make check-fmt
- name: Test
working-directory: docker/demo-bundled/bootstrap
working-directory: docker/devbox-bundled/bootstrap
run: |
make test

Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
uses: docker/setup-buildx-action@v2
- name: Setup destination directories for image tarballs
run: |
mkdir -p docker/demo-bundled/images/tar/{arm64,amd64}
mkdir -p docker/devbox-bundled/images/tar/{arm64,amd64}
- name: Export ARM64 Image
uses: docker/build-push-action@v6
with:
Expand All @@ -81,7 +81,7 @@ jobs:
FLYTECONSOLE_VERSION=${{ env.FLYTECONSOLE_VERSION }}
FLYTE_VERSION=${{ env.FLYTE_VERSION }}
file: Dockerfile
outputs: type=docker,dest=docker/demo-bundled/images/tar/arm64/flyte-binary.tar
outputs: type=docker,dest=docker/devbox-bundled/images/tar/arm64/flyte-binary.tar
- name: Export AMD64 Image
uses: docker/build-push-action@v6
with:
Expand All @@ -92,12 +92,12 @@ jobs:
FLYTECONSOLE_VERSION=${{ env.FLYTECONSOLE_VERSION }}
FLYTE_VERSION=${{ env.FLYTE_VERSION }}
file: Dockerfile
outputs: type=docker,dest=docker/demo-bundled/images/tar/amd64/flyte-binary.tar
outputs: type=docker,dest=docker/devbox-bundled/images/tar/amd64/flyte-binary.tar
- name: Upload single binary image
uses: actions/upload-artifact@v4
with:
name: single-binary-image
path: docker/demo-bundled/images/tar
path: docker/devbox-bundled/images/tar
- name: Login to GitHub Container Registry
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
uses: docker/login-action@v2
Expand All @@ -118,7 +118,7 @@ jobs:
file: Dockerfile
push: true

build-and-push-demo-bundled-image:
build-and-push-devbox-bundled-image:
runs-on: ubuntu-latest
needs: [build-and-push-single-binary-image]
steps:
Expand All @@ -127,7 +127,7 @@ jobs:
- uses: actions/download-artifact@v4
with:
name: single-binary-image
path: docker/demo-bundled/images/tar
path: docker/devbox-bundled/images/tar
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
Expand All @@ -138,18 +138,20 @@ jobs:
- name: Set version
id: set_version
run: |
echo "FLYTE_DEMO_VERSION=${{ github.sha }}" >> $GITHUB_ENV
echo "FLYTE_DEVBOX_VERSION=${{ github.sha }}" >> $GITHUB_ENV
- name: Prepare Image Names
id: image-names
uses: docker/metadata-action@v3
with:
# Push to both flyte-demo and flyte-sandbox-v2 (legacy name)
# Push to both flyte-devbox and flyte-sandbox-v2 (legacy name)
# so existing users pulling the old image continue to work.
images: |
ghcr.io/${{ github.repository_owner }}/flyte-demo
ghcr.io/${{ github.repository_owner }}/flyte-devbox
ghcr.io/${{ github.repository_owner }}/flyte-sandbox-v2
tags: |
type=raw,value=nightly,enable=${{ github.event_name == 'push' && github.ref == 'refs/heads/v2' }}
type=raw,value=latest,enable=${{ github.event_name == 'workflow_dispatch' }}
type=sha,format=long,
- name: Login to GitHub Container Registry
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
Expand All @@ -165,10 +167,10 @@ jobs:
# resolve a ghcr-hosted FROM.
uses: docker/build-push-action@v6
with:
context: docker/demo-bundled
context: docker/devbox-bundled
allow: "security.insecure"
platforms: linux/arm64, linux/amd64
build-args: "FLYTE_DEMO_VERSION=${{ env.FLYTE_DEMO_VERSION }}"
build-args: "FLYTE_DEVBOX_VERSION=${{ env.FLYTE_DEVBOX_VERSION }}"
outputs: type=oci,dest=/tmp/cpu-oci.tar
cache-from: type=gha,scope=demo-cpu
cache-to: type=gha,mode=max,scope=demo-cpu
Expand All @@ -180,37 +182,38 @@ jobs:
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
uses: docker/build-push-action@v6
with:
context: docker/demo-bundled
context: docker/devbox-bundled
allow: "security.insecure"
platforms: linux/arm64, linux/amd64
tags: ${{ steps.image-names.outputs.tags }}
build-args: "FLYTE_DEMO_VERSION=${{ env.FLYTE_DEMO_VERSION }}"
build-args: "FLYTE_DEVBOX_VERSION=${{ env.FLYTE_DEVBOX_VERSION }}"
push: true
cache-from: type=gha,scope=demo-cpu
- name: Prepare GPU Image Names
id: gpu-image-names
uses: docker/metadata-action@v3
with:
images: |
ghcr.io/${{ github.repository_owner }}/flyte-devbox
ghcr.io/${{ github.repository_owner }}/flyte-demo
ghcr.io/${{ github.repository_owner }}/flyte-sandbox-v2
tags: |
type=raw,value=gpu-latest,enable=${{ github.event_name == 'push' && github.ref == 'refs/heads/v2' }}
type=raw,value=gpu-nightly,enable=${{ github.event_name == 'push' && github.ref == 'refs/heads/v2' }}
type=raw,value=gpu-latest,enable=${{ github.event_name == 'workflow_dispatch' }}
type=sha,format=long,prefix=gpu-
- name: Build and push GPU multi-arch image
uses: docker/build-push-action@v6
with:
context: docker/demo-bundled
file: docker/demo-bundled/Dockerfile.gpu
context: docker/devbox-bundled
file: docker/devbox-bundled/Dockerfile.gpu
# Point Dockerfile.gpu's `FROM ${BASE_IMAGE}` at the OCI archive
# produced above — no registry round-trip needed.
build-contexts: base=oci-layout:///tmp/cpu-oci
allow: "security.insecure"
platforms: linux/arm64, linux/amd64
tags: ${{ steps.gpu-image-names.outputs.tags }}
build-args: |
FLYTE_DEMO_VERSION=${{ env.FLYTE_DEMO_VERSION }}
FLYTE_DEVBOX_VERSION=${{ env.FLYTE_DEVBOX_VERSION }}
BASE_IMAGE=base
push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
cache-from: type=gha,scope=demo-gpu
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dist/
dist
*.db
vendor/
/docker/demo-bundled/images/tar
/docker/devbox-bundled/images/tar
**/bin/
docs/_tags/
docs/api/flytectl
Expand Down
28 changes: 14 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,33 +36,33 @@ build: verify ## Build all Go service binaries
# =============================================================================

.PHONY: sandbox-build
sandbox-build: ## Build and start the flyte sandbox (docker/demo-bundled)
$(MAKE) -C docker/demo-bundled build
sandbox-build: ## Build and start the flyte sandbox (docker/devbox-bundled)
$(MAKE) -C docker/devbox-bundled build

# Run in dev mode with extra arg FLYTE_DEV=True
.PHONY: sandbox-run
sandbox-run: ## Start the flyte sandbox without rebuilding the image
$(MAKE) -C docker/demo-bundled start
$(MAKE) -C docker/devbox-bundled start

.PHONY: sandbox-stop
sandbox-stop: ## Stop the flyte sandbox
$(MAKE) -C docker/demo-bundled stop
$(MAKE) -C docker/devbox-bundled stop

# =============================================================================
# Demo Commands
# Devbox Commands
# =============================================================================

.PHONY: demo-build
demo-build: ## Build and start the flyte demo cluster (docker/demo-bundled)
$(MAKE) -C docker/demo-bundled build
.PHONY: devbox-build
devbox-build: ## Build and start the flyte devbox cluster (docker/devbox-bundled)
$(MAKE) -C docker/devbox-bundled build

.PHONY: demo-run
demo-run: ## Start the flyte demo cluster without rebuilding the image
$(MAKE) -C docker/demo-bundled start
.PHONY: devbox-run
devbox-run: ## Start the flyte devbox cluster without rebuilding the image
$(MAKE) -C docker/devbox-bundled start

.PHONY: demo-stop
demo-stop: ## Stop the flyte demo cluster
$(MAKE) -C docker/demo-bundled stop
.PHONY: devbox-stop
devbox-stop: ## Stop the flyte devbox cluster
$(MAKE) -C docker/devbox-bundled stop

.PHONY: help
help: ## Show this help message
Expand Down
12 changes: 6 additions & 6 deletions charts/flyte-binary/Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@

GENERATED_FILE="gen/binary_manifest.yaml"
DEMO_GENERATED_FILE="gen/demomanifest.yaml"
DEVBOX_GENERATED_FILE="gen/devboxmanifest.yaml"

cleanhelm:
@[ -f $(GENERATED_FILE) ] && rm $(GENERATED_FILE) || true

cleandemo:
@[ -f $(DEMO_GENERATED_FILE) ] && rm $(DEMO_GENERATED_FILE) || true
cleandevbox:
@[ -f $(DEVBOX_GENERATED_FILE) ] && rm $(DEVBOX_GENERATED_FILE) || true

.PHONY: helm
helm: cleanhelm
helm template binary-tst-deploy ./ -n flyte --dependency-update --debug --create-namespace -a rbac.authorization.k8s.io/v1 -a networking.k8s.io/v1/Ingress -a apiextensions.k8s.io/v1/CustomResourceDefinition > $(GENERATED_FILE)

.PHONY: demohelm
demohelm: cleandemo
helm template flytedemo ./ -f flytectldemo.yaml -n flyte --dependency-update --debug --create-namespace -a rbac.authorization.k8s.io/v1 -a networking.k8s.io/v1/Ingress -a apiextensions.k8s.io/v1/CustomResourceDefinition > $(DEMO_GENERATED_FILE)
.PHONY: devboxhelm
devboxhelm: cleandevbox
helm template flytedevbox ./ -f flytectldemo.yaml -n flyte --dependency-update --debug --create-namespace -a rbac.authorization.k8s.io/v1 -a networking.k8s.io/v1/Ingress -a apiextensions.k8s.io/v1/CustomResourceDefinition > $(DEVBOX_GENERATED_FILE)
2 changes: 1 addition & 1 deletion charts/flyte-binary/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ flyte-core-components:
secret:
kubernetes:
namespace: "flyte"
clusterName: "flyte-demo"
clusterName: "flyte-devbox"
kubeconfig: ""
qps: 100
burst: 200
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
name: flyte-demo
name: flyte-devbox
description: A Helm chart for the Flyte local demo cluster

# A chart can be either an 'application' or a 'library' chart.
Expand Down
10 changes: 5 additions & 5 deletions charts/flyte-demo/README.md → charts/flyte-devbox/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# flyte-demo
# flyte-devbox

![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.1](https://img.shields.io/badge/AppVersion-1.16.1-informational?style=flat-square)

Expand All @@ -24,7 +24,7 @@ A Helm chart for the Flyte local demo cluster
| docker-registry.secrets.haSharedSecret | string | `"flytesandboxsecret"` | |
| docker-registry.service.nodePort | int | `30000` | |
| docker-registry.service.type | string | `"NodePort"` | |
| flyte-binary.clusterResourceTemplates.inlineConfigMap | string | `"{{ include \"flyte-demo.clusterResourceTemplates.inlineConfigMap\" . }}"` | |
| flyte-binary.clusterResourceTemplates.inlineConfigMap | string | `"{{ include \"flyte-devbox.clusterResourceTemplates.inlineConfigMap\" . }}"` | |
| flyte-binary.configuration.database.host | string | `"postgresql"` | |
| flyte-binary.configuration.database.password | string | `"postgres"` | |
| flyte-binary.configuration.inline.plugins.k8s.default-env-vars[0].FLYTE_AWS_ENDPOINT | string | `"http://minio.{{ .Release.Namespace }}:9000"` | |
Expand All @@ -47,7 +47,7 @@ A Helm chart for the Flyte local demo cluster
| flyte-binary.configuration.inline.task_resources.limits.ephemeralStorage | int | `0` | |
| flyte-binary.configuration.inline.task_resources.limits.gpu | int | `0` | |
| flyte-binary.configuration.inline.task_resources.limits.memory | int | `0` | |
| flyte-binary.configuration.inlineConfigMap | string | `"{{ include \"flyte-demo.configuration.inlineConfigMap\" . }}"` | |
| flyte-binary.configuration.inlineConfigMap | string | `"{{ include \"flyte-devbox.configuration.inlineConfigMap\" . }}"` | |
| flyte-binary.configuration.logging.level | int | `5` | |
| flyte-binary.configuration.storage.metadataContainer | string | `"flyte-data"` | |
| flyte-binary.configuration.storage.provider | string | `"s3"` | |
Expand Down Expand Up @@ -88,7 +88,7 @@ A Helm chart for the Flyte local demo cluster
| minio.image.pullPolicy | string | `"Never"` | |
| minio.image.tag | string | `"sandbox"` | |
| minio.persistence.enabled | bool | `true` | |
| minio.persistence.existingClaim | string | `"{{ include \"flyte-demo.persistence.minioVolumeName\" . }}"` | |
| minio.persistence.existingClaim | string | `"{{ include \"flyte-devbox.persistence.minioVolumeName\" . }}"` | |
| minio.service.nodePorts.api | int | `30002` | |
| minio.service.type | string | `"NodePort"` | |
| minio.volumePermissions.enabled | bool | `true` | |
Expand All @@ -100,7 +100,7 @@ A Helm chart for the Flyte local demo cluster
| postgresql.image.pullPolicy | string | `"Never"` | |
| postgresql.image.tag | string | `"sandbox"` | |
| postgresql.primary.persistence.enabled | bool | `true` | |
| postgresql.primary.persistence.existingClaim | string | `"{{ include \"flyte-demo.persistence.dbVolumeName\" . }}"` | |
| postgresql.primary.persistence.existingClaim | string | `"{{ include \"flyte-devbox.persistence.dbVolumeName\" . }}"` | |
| postgresql.primary.service.nodePorts.postgresql | int | `30001` | |
| postgresql.primary.service.type | string | `"NodePort"` | |
| postgresql.shmVolume.enabled | bool | `false` | |
Expand Down
17 changes: 17 additions & 0 deletions charts/flyte-devbox/charts/flyte-binary/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@

GENERATED_FILE="gen/binary_manifest.yaml"
DEVBOX_GENERATED_FILE="gen/devboxmanifest.yaml"

cleanhelm:
@[ -f $(GENERATED_FILE) ] && rm $(GENERATED_FILE) || true

cleandevbox:
@[ -f $(DEVBOX_GENERATED_FILE) ] && rm $(DEVBOX_GENERATED_FILE) || true

.PHONY: helm
helm: cleanhelm
helm template binary-tst-deploy ./ -n flyte --dependency-update --debug --create-namespace -a rbac.authorization.k8s.io/v1 -a networking.k8s.io/v1/Ingress -a apiextensions.k8s.io/v1/CustomResourceDefinition > $(GENERATED_FILE)

.PHONY: devboxhelm
devboxhelm: cleandevbox
helm template flytedevbox ./ -f flytectldemo.yaml -n flyte --dependency-update --debug --create-namespace -a rbac.authorization.k8s.io/v1 -a networking.k8s.io/v1/Ingress -a apiextensions.k8s.io/v1/CustomResourceDefinition > $(DEVBOX_GENERATED_FILE)
Loading
Loading