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
33 changes: 18 additions & 15 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/sandbox-bundled/bootstrap
working-directory: docker/demo-bundled/bootstrap
- name: Check formatting
working-directory: docker/sandbox-bundled/bootstrap
working-directory: docker/demo-bundled/bootstrap
run: |
make check-fmt
- name: Test
working-directory: docker/sandbox-bundled/bootstrap
working-directory: docker/demo-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/sandbox-bundled/images/tar/{arm64,amd64}
mkdir -p docker/demo-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/sandbox-bundled/images/tar/arm64/flyte-binary.tar
outputs: type=docker,dest=docker/demo-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/sandbox-bundled/images/tar/amd64/flyte-binary.tar
outputs: type=docker,dest=docker/demo-bundled/images/tar/amd64/flyte-binary.tar
- name: Upload single binary image
uses: actions/upload-artifact@v4
with:
name: single-binary-image
path: docker/sandbox-bundled/images/tar
path: docker/demo-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-sandbox-bundled-image:
build-and-push-demo-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/sandbox-bundled/images/tar
path: docker/demo-bundled/images/tar
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
Expand All @@ -138,12 +138,15 @@ jobs:
- name: Set version
id: set_version
run: |
echo "FLYTE_SANDBOX_VERSION=${{ github.sha }}" >> $GITHUB_ENV
echo "FLYTE_DEMO_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)
# so existing users pulling the old image continue to work.
images: |
ghcr.io/${{ github.repository_owner }}/flyte-demo
Comment thread
pingsutw marked this conversation as resolved.
ghcr.io/${{ github.repository_owner }}/flyte-sandbox-v2
tags: |
type=raw,value=nightly,enable=${{ github.event_name == 'push' && github.ref == 'refs/heads/v2' }}
Expand All @@ -156,18 +159,18 @@ jobs:
password: "${{ secrets.FLYTE_BOT_PAT }}"
- name: Save console image tarballs
run: |
mkdir -p docker/sandbox-bundled/images/tar/amd64 docker/sandbox-bundled/images/tar/arm64
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/sandbox-bundled/images/tar/amd64/flyte-client-v2.tar
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/sandbox-bundled/images/tar/arm64/flyte-client-v2.tar
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/sandbox-bundled
context: docker/demo-bundled
allow: "security.insecure"
platforms: linux/arm64, linux/amd64
tags: ${{ steps.image-names.outputs.tags }}
build-args: "FLYTE_SANDBOX_VERSION=${{ env.FLYTE_SANDBOX_VERSION }}"
build-args: "FLYTE_DEMO_VERSION=${{ env.FLYTE_DEMO_VERSION }}"
push: true
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/sandbox-bundled/images/tar
/docker/demo-bundled/images/tar
**/bin/
docs/_tags/
docs/api/flytectl
Expand Down
24 changes: 20 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,33 @@ build: verify ## Build all Go service binaries
# =============================================================================

.PHONY: sandbox-build
sandbox-build: ## Build and start the flyte sandbox (docker/sandbox-bundled)
$(MAKE) -C docker/sandbox-bundled build
sandbox-build: ## Build and start the flyte sandbox (docker/demo-bundled)
$(MAKE) -C docker/demo-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/sandbox-bundled start
$(MAKE) -C docker/demo-bundled start

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

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

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

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

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

.PHONY: help
help: ## Show this help message
Expand Down
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-sandbox"
clusterName: "flyte-demo"
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,6 +1,6 @@
apiVersion: v2
name: flyte-sandbox
description: A Helm chart for the Flyte local sandbox
name: flyte-demo
description: A Helm chart for the Flyte local demo cluster

# A chart can be either an 'application' or a 'library' chart.
#
Expand Down Expand Up @@ -36,7 +36,3 @@ dependencies:
version: 12.6.7
repository: https://charts.bitnami.com/bitnami
condition: minio.enabled
- name: postgresql
version: 12.8.1
repository: https://charts.bitnami.com/bitnami
condition: postgresql.enabled
57 changes: 37 additions & 20 deletions charts/flyte-sandbox/README.md → charts/flyte-demo/README.md
Comment thread
pingsutw marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -1,36 +1,43 @@
# flyte-sandbox
# flyte-demo

![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)

A Helm chart for the Flyte local sandbox
A Helm chart for the Flyte local demo cluster

## Requirements

| Repository | Name | Version |
|------------|------|---------|
| file://../flyte-binary | flyte-binary | v0.1.10 |
| file://../flyte-binary | flyte-binary | v0.2.0 |
| https://charts.bitnami.com/bitnami | minio | 12.6.7 |
| https://charts.bitnami.com/bitnami | postgresql | 12.8.1 |
| https://twuni.github.io/docker-registry.helm | docker-registry | 2.2.2 |

## Values

| Key | Type | Default | Description |
|-----|------|---------|-------------|
| docker-registry.enabled | bool | `true` | |
| docker-registry.fullnameOverride | string | `"docker-registry"` | |
| docker-registry.image.pullPolicy | string | `"Never"` | |
| docker-registry.image.tag | string | `"sandbox"` | |
| docker-registry.persistence.enabled | bool | `false` | |
| 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-sandbox.clusterResourceTemplates.inlineConfigMap\" . }}"` | |
| flyte-binary.configuration.database.host | string | `"{{ printf \"%s-postgresql\" .Release.Name | trunc 63 | trimSuffix \"-\" }}"` | |
| flyte-binary.clusterResourceTemplates.inlineConfigMap | string | `"{{ include \"flyte-demo.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://{{ printf \"%s-minio\" .Release.Name | trunc 63 | trimSuffix \"-\" }}.{{ .Release.Namespace }}:9000"` | |
| flyte-binary.configuration.inline.plugins.k8s.default-env-vars[0].FLYTE_AWS_ENDPOINT | string | `"http://minio.{{ .Release.Namespace }}:9000"` | |
| flyte-binary.configuration.inline.plugins.k8s.default-env-vars[1].FLYTE_AWS_ACCESS_KEY_ID | string | `"minio"` | |
| flyte-binary.configuration.inline.plugins.k8s.default-env-vars[2].FLYTE_AWS_SECRET_ACCESS_KEY | string | `"miniostorage"` | |
| flyte-binary.configuration.inline.plugins.k8s.default-env-vars[3].FLYTE_PLATFORM_URL | string | `"{{ printf \"%s-http\" .Release.Name }}.{{ .Release.Namespace }}:8090"` | |
| flyte-binary.configuration.inline.plugins.k8s.default-env-vars[4].FLYTE_PLATFORM_INSECURE | bool | `true` | |
| flyte-binary.configuration.inline.plugins.k8s.default-env-vars[3]._U_EP_OVERRIDE | string | `"flyte-binary-http.{{ .Release.Namespace }}:8090"` | |
| flyte-binary.configuration.inline.plugins.k8s.default-env-vars[4]._U_INSECURE | string | `"true"` | |
| flyte-binary.configuration.inline.plugins.k8s.default-env-vars[5]._U_USE_ACTIONS | string | `"1"` | |
| flyte-binary.configuration.inline.runs.database.postgres.dbName | string | `"runs"` | |
| flyte-binary.configuration.inline.runs.database.postgres.host | string | `"postgresql.{{ .Release.Namespace }}"` | |
| flyte-binary.configuration.inline.runs.database.postgres.password | string | `"postgres"` | |
| flyte-binary.configuration.inline.runs.database.postgres.port | int | `5432` | |
| flyte-binary.configuration.inline.runs.database.postgres.user | string | `"postgres"` | |
| flyte-binary.configuration.inline.storage.signedURL.stowConfigOverride.endpoint | string | `"http://localhost:30002"` | |
| flyte-binary.configuration.inline.task_resources.defaults.cpu | string | `"500m"` | |
| flyte-binary.configuration.inline.task_resources.defaults.ephemeralStorage | int | `0` | |
Expand All @@ -40,58 +47,68 @@ A Helm chart for the Flyte local sandbox
| 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-sandbox.configuration.inlineConfigMap\" . }}"` | |
| flyte-binary.configuration.inlineConfigMap | string | `"{{ include \"flyte-demo.configuration.inlineConfigMap\" . }}"` | |
| flyte-binary.configuration.logging.level | int | `5` | |
| flyte-binary.configuration.logging.plugins.kubernetes.enabled | bool | `true` | |
| flyte-binary.configuration.storage.metadataContainer | string | `"my-s3-bucket"` | |
| flyte-binary.configuration.storage.metadataContainer | string | `"flyte-data"` | |
| flyte-binary.configuration.storage.provider | string | `"s3"` | |
| flyte-binary.configuration.storage.providerConfig.s3.accessKey | string | `"minio"` | |
| flyte-binary.configuration.storage.providerConfig.s3.authType | string | `"accesskey"` | |
| flyte-binary.configuration.storage.providerConfig.s3.disableSSL | bool | `true` | |
| flyte-binary.configuration.storage.providerConfig.s3.endpoint | string | `"http://{{ printf \"%s-minio\" .Release.Name | trunc 63 | trimSuffix \"-\" }}.{{ .Release.Namespace }}:9000"` | |
| flyte-binary.configuration.storage.providerConfig.s3.endpoint | string | `"http://minio.{{ .Release.Namespace }}:9000"` | |
| flyte-binary.configuration.storage.providerConfig.s3.secretKey | string | `"miniostorage"` | |
| flyte-binary.configuration.storage.providerConfig.s3.v2Signing | bool | `true` | |
| flyte-binary.configuration.storage.userDataContainer | string | `"my-s3-bucket"` | |
| flyte-binary.configuration.storage.userDataContainer | string | `"flyte-data"` | |
| flyte-binary.deployment.image.pullPolicy | string | `"Never"` | |
| flyte-binary.deployment.image.repository | string | `"flyte-binary"` | |
| flyte-binary.deployment.image.repository | string | `"flyte-binary-v2"` | |
| flyte-binary.deployment.image.tag | string | `"sandbox"` | |
| flyte-binary.deployment.livenessProbe.httpGet.path | string | `"/healthz"` | |
| flyte-binary.deployment.livenessProbe.httpGet.port | string | `"http"` | |
| flyte-binary.deployment.readinessProbe.httpGet.path | string | `"/readyz"` | |
| flyte-binary.deployment.readinessProbe.httpGet.port | string | `"http"` | |
| flyte-binary.deployment.readinessProbe.periodSeconds | int | `1` | |
| flyte-binary.deployment.startupProbe.failureThreshold | int | `30` | |
| flyte-binary.deployment.startupProbe.httpGet.path | string | `"/healthz"` | |
| flyte-binary.deployment.startupProbe.httpGet.port | string | `"http"` | |
| flyte-binary.deployment.startupProbe.periodSeconds | int | `1` | |
| flyte-binary.deployment.waitForDB.image.pullPolicy | string | `"Never"` | |
| flyte-binary.deployment.waitForDB.image.repository | string | `"bitnami/postgresql"` | |
| flyte-binary.deployment.waitForDB.image.tag | string | `"sandbox"` | |
| flyte-binary.enabled | bool | `true` | |
| flyte-binary.nameOverride | string | `"flyte-sandbox"` | |
| flyte-binary.fullnameOverride | string | `"flyte-binary"` | |
| flyte-binary.rbac.extraRules[0].apiGroups[0] | string | `"*"` | |
| flyte-binary.rbac.extraRules[0].resources[0] | string | `"*"` | |
| flyte-binary.rbac.extraRules[0].verbs[0] | string | `"*"` | |
| minio.auth.rootPassword | string | `"miniostorage"` | |
| minio.auth.rootUser | string | `"minio"` | |
| minio.defaultBuckets | string | `"my-s3-bucket"` | |
| minio.defaultBuckets | string | `"flyte-data"` | |
| minio.enabled | bool | `true` | |
| minio.extraEnvVars[0].name | string | `"MINIO_BROWSER_REDIRECT_URL"` | |
| minio.extraEnvVars[0].value | string | `"http://localhost:30080/minio"` | |
| minio.fullnameOverride | string | `"minio"` | |
| minio.image.pullPolicy | string | `"Never"` | |
| minio.image.tag | string | `"sandbox"` | |
| minio.persistence.enabled | bool | `true` | |
| minio.persistence.existingClaim | string | `"{{ include \"flyte-sandbox.persistence.minioVolumeName\" . }}"` | |
| minio.persistence.existingClaim | string | `"{{ include \"flyte-demo.persistence.minioVolumeName\" . }}"` | |
| minio.service.nodePorts.api | int | `30002` | |
| minio.service.type | string | `"NodePort"` | |
| minio.volumePermissions.enabled | bool | `true` | |
| minio.volumePermissions.image.pullPolicy | string | `"Never"` | |
| minio.volumePermissions.image.tag | string | `"sandbox"` | |
| postgresql.auth.postgresPassword | string | `"postgres"` | |
| postgresql.enabled | bool | `true` | |
| postgresql.fullnameOverride | string | `"postgresql"` | |
| postgresql.image.pullPolicy | string | `"Never"` | |
| postgresql.image.tag | string | `"sandbox"` | |
| postgresql.primary.persistence.enabled | bool | `true` | |
| postgresql.primary.persistence.existingClaim | string | `"{{ include \"flyte-sandbox.persistence.dbVolumeName\" . }}"` | |
| postgresql.primary.persistence.existingClaim | string | `"{{ include \"flyte-demo.persistence.dbVolumeName\" . }}"` | |
| postgresql.primary.service.nodePorts.postgresql | int | `30001` | |
| postgresql.primary.service.type | string | `"NodePort"` | |
| postgresql.shmVolume.enabled | bool | `false` | |
| postgresql.volumePermissions.enabled | bool | `true` | |
| postgresql.volumePermissions.image.pullPolicy | string | `"Never"` | |
| postgresql.volumePermissions.image.tag | string | `"sandbox"` | |
| sandbox.console.enabled | bool | `true` | |
| sandbox.console.image.pullPolicy | string | `"IfNotPresent"` | |
| sandbox.console.image.pullPolicy | string | `"Never"` | |
| sandbox.console.image.repository | string | `"ghcr.io/flyteorg/flyte-client-v2"` | |
| sandbox.console.image.tag | string | `"latest"` | |
| sandbox.dev | bool | `false` | |
Expand Down
Loading
Loading