Skip to content

Commit 61a555c

Browse files
authored
Rename flyte-demo to flyte-devbox (#7247)
Signed-off-by: Kevin Su <pingsutw@apache.org>
1 parent 762b0cd commit 61a555c

73 files changed

Lines changed: 293 additions & 272 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/flyte-binary-v2.yml

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ jobs:
2424
- name: golangci-lint
2525
uses: golangci/golangci-lint-action@v3
2626
with:
27-
working-directory: docker/demo-bundled/bootstrap
27+
working-directory: docker/devbox-bundled/bootstrap
2828
- name: Check formatting
29-
working-directory: docker/demo-bundled/bootstrap
29+
working-directory: docker/devbox-bundled/bootstrap
3030
run: |
3131
make check-fmt
3232
- name: Test
33-
working-directory: docker/demo-bundled/bootstrap
33+
working-directory: docker/devbox-bundled/bootstrap
3434
run: |
3535
make test
3636
@@ -70,7 +70,7 @@ jobs:
7070
uses: docker/setup-buildx-action@v2
7171
- name: Setup destination directories for image tarballs
7272
run: |
73-
mkdir -p docker/demo-bundled/images/tar/{arm64,amd64}
73+
mkdir -p docker/devbox-bundled/images/tar/{arm64,amd64}
7474
- name: Export ARM64 Image
7575
uses: docker/build-push-action@v6
7676
with:
@@ -81,7 +81,7 @@ jobs:
8181
FLYTECONSOLE_VERSION=${{ env.FLYTECONSOLE_VERSION }}
8282
FLYTE_VERSION=${{ env.FLYTE_VERSION }}
8383
file: Dockerfile
84-
outputs: type=docker,dest=docker/demo-bundled/images/tar/arm64/flyte-binary.tar
84+
outputs: type=docker,dest=docker/devbox-bundled/images/tar/arm64/flyte-binary.tar
8585
- name: Export AMD64 Image
8686
uses: docker/build-push-action@v6
8787
with:
@@ -92,12 +92,12 @@ jobs:
9292
FLYTECONSOLE_VERSION=${{ env.FLYTECONSOLE_VERSION }}
9393
FLYTE_VERSION=${{ env.FLYTE_VERSION }}
9494
file: Dockerfile
95-
outputs: type=docker,dest=docker/demo-bundled/images/tar/amd64/flyte-binary.tar
95+
outputs: type=docker,dest=docker/devbox-bundled/images/tar/amd64/flyte-binary.tar
9696
- name: Upload single binary image
9797
uses: actions/upload-artifact@v4
9898
with:
9999
name: single-binary-image
100-
path: docker/demo-bundled/images/tar
100+
path: docker/devbox-bundled/images/tar
101101
- name: Login to GitHub Container Registry
102102
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
103103
uses: docker/login-action@v2
@@ -118,7 +118,7 @@ jobs:
118118
file: Dockerfile
119119
push: true
120120

121-
build-and-push-demo-bundled-image:
121+
build-and-push-devbox-bundled-image:
122122
runs-on: ubuntu-latest
123123
needs: [build-and-push-single-binary-image]
124124
steps:
@@ -127,7 +127,7 @@ jobs:
127127
- uses: actions/download-artifact@v4
128128
with:
129129
name: single-binary-image
130-
path: docker/demo-bundled/images/tar
130+
path: docker/devbox-bundled/images/tar
131131
- name: Set up QEMU
132132
uses: docker/setup-qemu-action@v2
133133
- name: Set up Docker Buildx
@@ -138,18 +138,20 @@ jobs:
138138
- name: Set version
139139
id: set_version
140140
run: |
141-
echo "FLYTE_DEMO_VERSION=${{ github.sha }}" >> $GITHUB_ENV
141+
echo "FLYTE_DEVBOX_VERSION=${{ github.sha }}" >> $GITHUB_ENV
142142
- name: Prepare Image Names
143143
id: image-names
144144
uses: docker/metadata-action@v3
145145
with:
146-
# Push to both flyte-demo and flyte-sandbox-v2 (legacy name)
146+
# Push to both flyte-devbox and flyte-sandbox-v2 (legacy name)
147147
# so existing users pulling the old image continue to work.
148148
images: |
149149
ghcr.io/${{ github.repository_owner }}/flyte-demo
150+
ghcr.io/${{ github.repository_owner }}/flyte-devbox
150151
ghcr.io/${{ github.repository_owner }}/flyte-sandbox-v2
151152
tags: |
152153
type=raw,value=nightly,enable=${{ github.event_name == 'push' && github.ref == 'refs/heads/v2' }}
154+
type=raw,value=latest,enable=${{ github.event_name == 'workflow_dispatch' }}
153155
type=sha,format=long,
154156
- name: Login to GitHub Container Registry
155157
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
@@ -165,10 +167,10 @@ jobs:
165167
# resolve a ghcr-hosted FROM.
166168
uses: docker/build-push-action@v6
167169
with:
168-
context: docker/demo-bundled
170+
context: docker/devbox-bundled
169171
allow: "security.insecure"
170172
platforms: linux/arm64, linux/amd64
171-
build-args: "FLYTE_DEMO_VERSION=${{ env.FLYTE_DEMO_VERSION }}"
173+
build-args: "FLYTE_DEVBOX_VERSION=${{ env.FLYTE_DEVBOX_VERSION }}"
172174
outputs: type=oci,dest=/tmp/cpu-oci.tar
173175
cache-from: type=gha,scope=demo-cpu
174176
cache-to: type=gha,mode=max,scope=demo-cpu
@@ -180,37 +182,38 @@ jobs:
180182
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
181183
uses: docker/build-push-action@v6
182184
with:
183-
context: docker/demo-bundled
185+
context: docker/devbox-bundled
184186
allow: "security.insecure"
185187
platforms: linux/arm64, linux/amd64
186188
tags: ${{ steps.image-names.outputs.tags }}
187-
build-args: "FLYTE_DEMO_VERSION=${{ env.FLYTE_DEMO_VERSION }}"
189+
build-args: "FLYTE_DEVBOX_VERSION=${{ env.FLYTE_DEVBOX_VERSION }}"
188190
push: true
189191
cache-from: type=gha,scope=demo-cpu
190192
- name: Prepare GPU Image Names
191193
id: gpu-image-names
192194
uses: docker/metadata-action@v3
193195
with:
194196
images: |
197+
ghcr.io/${{ github.repository_owner }}/flyte-devbox
195198
ghcr.io/${{ github.repository_owner }}/flyte-demo
196199
ghcr.io/${{ github.repository_owner }}/flyte-sandbox-v2
197200
tags: |
198-
type=raw,value=gpu-latest,enable=${{ github.event_name == 'push' && github.ref == 'refs/heads/v2' }}
199201
type=raw,value=gpu-nightly,enable=${{ github.event_name == 'push' && github.ref == 'refs/heads/v2' }}
202+
type=raw,value=gpu-latest,enable=${{ github.event_name == 'workflow_dispatch' }}
200203
type=sha,format=long,prefix=gpu-
201204
- name: Build and push GPU multi-arch image
202205
uses: docker/build-push-action@v6
203206
with:
204-
context: docker/demo-bundled
205-
file: docker/demo-bundled/Dockerfile.gpu
207+
context: docker/devbox-bundled
208+
file: docker/devbox-bundled/Dockerfile.gpu
206209
# Point Dockerfile.gpu's `FROM ${BASE_IMAGE}` at the OCI archive
207210
# produced above — no registry round-trip needed.
208211
build-contexts: base=oci-layout:///tmp/cpu-oci
209212
allow: "security.insecure"
210213
platforms: linux/arm64, linux/amd64
211214
tags: ${{ steps.gpu-image-names.outputs.tags }}
212215
build-args: |
213-
FLYTE_DEMO_VERSION=${{ env.FLYTE_DEMO_VERSION }}
216+
FLYTE_DEVBOX_VERSION=${{ env.FLYTE_DEVBOX_VERSION }}
214217
BASE_IMAGE=base
215218
push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
216219
cache-from: type=gha,scope=demo-gpu

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dist/
2828
dist
2929
*.db
3030
vendor/
31-
/docker/demo-bundled/images/tar
31+
/docker/devbox-bundled/images/tar
3232
**/bin/
3333
docs/_tags/
3434
docs/api/flytectl

Makefile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,33 +36,33 @@ build: verify ## Build all Go service binaries
3636
# =============================================================================
3737

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

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

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

5151
# =============================================================================
52-
# Demo Commands
52+
# Devbox Commands
5353
# =============================================================================
5454

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

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

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

6767
.PHONY: help
6868
help: ## Show this help message

charts/flyte-binary/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11

22
GENERATED_FILE="gen/binary_manifest.yaml"
3-
DEMO_GENERATED_FILE="gen/demomanifest.yaml"
3+
DEVBOX_GENERATED_FILE="gen/devboxmanifest.yaml"
44

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

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

1111
.PHONY: helm
1212
helm: cleanhelm
1313
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)
1414

15-
.PHONY: demohelm
16-
demohelm: cleandemo
17-
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)
15+
.PHONY: devboxhelm
16+
devboxhelm: cleandevbox
17+
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)

charts/flyte-binary/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ flyte-core-components:
5959
secret:
6060
kubernetes:
6161
namespace: "flyte"
62-
clusterName: "flyte-demo"
62+
clusterName: "flyte-devbox"
6363
kubeconfig: ""
6464
qps: 100
6565
burst: 200
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
name: flyte-demo
2+
name: flyte-devbox
33
description: A Helm chart for the Flyte local demo cluster
44

55
# A chart can be either an 'application' or a 'library' chart.
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# flyte-demo
1+
# flyte-devbox
22

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

@@ -24,7 +24,7 @@ A Helm chart for the Flyte local demo cluster
2424
| docker-registry.secrets.haSharedSecret | string | `"flytesandboxsecret"` | |
2525
| docker-registry.service.nodePort | int | `30000` | |
2626
| docker-registry.service.type | string | `"NodePort"` | |
27-
| flyte-binary.clusterResourceTemplates.inlineConfigMap | string | `"{{ include \"flyte-demo.clusterResourceTemplates.inlineConfigMap\" . }}"` | |
27+
| flyte-binary.clusterResourceTemplates.inlineConfigMap | string | `"{{ include \"flyte-devbox.clusterResourceTemplates.inlineConfigMap\" . }}"` | |
2828
| flyte-binary.configuration.database.host | string | `"postgresql"` | |
2929
| flyte-binary.configuration.database.password | string | `"postgres"` | |
3030
| flyte-binary.configuration.inline.plugins.k8s.default-env-vars[0].FLYTE_AWS_ENDPOINT | string | `"http://minio.{{ .Release.Namespace }}:9000"` | |
@@ -47,7 +47,7 @@ A Helm chart for the Flyte local demo cluster
4747
| flyte-binary.configuration.inline.task_resources.limits.ephemeralStorage | int | `0` | |
4848
| flyte-binary.configuration.inline.task_resources.limits.gpu | int | `0` | |
4949
| flyte-binary.configuration.inline.task_resources.limits.memory | int | `0` | |
50-
| flyte-binary.configuration.inlineConfigMap | string | `"{{ include \"flyte-demo.configuration.inlineConfigMap\" . }}"` | |
50+
| flyte-binary.configuration.inlineConfigMap | string | `"{{ include \"flyte-devbox.configuration.inlineConfigMap\" . }}"` | |
5151
| flyte-binary.configuration.logging.level | int | `5` | |
5252
| flyte-binary.configuration.storage.metadataContainer | string | `"flyte-data"` | |
5353
| flyte-binary.configuration.storage.provider | string | `"s3"` | |
@@ -88,7 +88,7 @@ A Helm chart for the Flyte local demo cluster
8888
| minio.image.pullPolicy | string | `"Never"` | |
8989
| minio.image.tag | string | `"sandbox"` | |
9090
| minio.persistence.enabled | bool | `true` | |
91-
| minio.persistence.existingClaim | string | `"{{ include \"flyte-demo.persistence.minioVolumeName\" . }}"` | |
91+
| minio.persistence.existingClaim | string | `"{{ include \"flyte-devbox.persistence.minioVolumeName\" . }}"` | |
9292
| minio.service.nodePorts.api | int | `30002` | |
9393
| minio.service.type | string | `"NodePort"` | |
9494
| minio.volumePermissions.enabled | bool | `true` | |
@@ -100,7 +100,7 @@ A Helm chart for the Flyte local demo cluster
100100
| postgresql.image.pullPolicy | string | `"Never"` | |
101101
| postgresql.image.tag | string | `"sandbox"` | |
102102
| postgresql.primary.persistence.enabled | bool | `true` | |
103-
| postgresql.primary.persistence.existingClaim | string | `"{{ include \"flyte-demo.persistence.dbVolumeName\" . }}"` | |
103+
| postgresql.primary.persistence.existingClaim | string | `"{{ include \"flyte-devbox.persistence.dbVolumeName\" . }}"` | |
104104
| postgresql.primary.service.nodePorts.postgresql | int | `30001` | |
105105
| postgresql.primary.service.type | string | `"NodePort"` | |
106106
| postgresql.shmVolume.enabled | bool | `false` | |
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
2+
GENERATED_FILE="gen/binary_manifest.yaml"
3+
DEVBOX_GENERATED_FILE="gen/devboxmanifest.yaml"
4+
5+
cleanhelm:
6+
@[ -f $(GENERATED_FILE) ] && rm $(GENERATED_FILE) || true
7+
8+
cleandevbox:
9+
@[ -f $(DEVBOX_GENERATED_FILE) ] && rm $(DEVBOX_GENERATED_FILE) || true
10+
11+
.PHONY: helm
12+
helm: cleanhelm
13+
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)
14+
15+
.PHONY: devboxhelm
16+
devboxhelm: cleandevbox
17+
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)

0 commit comments

Comments
 (0)