Skip to content

Commit

Permalink
Merge branch 'master' into pryce-turner/nested-parallelization
Browse files Browse the repository at this point in the history
  • Loading branch information
pryce-turner committed Mar 11, 2024
2 parents b2398c8 + aea794f commit 0237f91
Show file tree
Hide file tree
Showing 44 changed files with 133 additions and 622 deletions.
Empty file removed ,
Empty file.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
docs/**/*html linguist-generated=true
flyteidl/gen/** linguist-generated=true
flyteidl/protos/**/*.rst linguist-generated=true
flyteidl/clients/go/assets/admin.swagger.json linguist-generated=true

70 changes: 0 additions & 70 deletions .github/workflows/lite-image-manual.yml

This file was deleted.

57 changes: 0 additions & 57 deletions .github/workflows/sandbox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,60 +62,3 @@ jobs:
tags: ${{ steps.dind-names.outputs.tags }}
build-args: "FLYTE_VERSION=${{ steps.set_version.outputs.flyte_version }}"
file: docker/sandbox/Dockerfile

trigger-sandbox-lite-build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: "0"
- name: Setup Golang caches
uses: actions/cache@v3
with:
path: |
/root/.cache/go-build
/root/go/pkg/mod
key: ${{ runner.os }}-golang-${{ hashFiles('go.sum') }}
restore-keys: |
${{ runner.os }}-golang-
- name: Set flyte version to release
id: set_version
run: |
if [ ${{ github.event_name}} = "release" ]; then
echo ::set-output name=flyte_version::$(echo ${{ github.event.release.tag_name }})
else
echo ::set-output name=flyte_version::latest
fi
- name: Prepare DIND Image Names
id: dind-names
uses: docker/metadata-action@v3
with:
# list of Docker images to use as base name for tags
images: |
ghcr.io/${{ github.repository_owner }}/flyte-sandbox-lite
tags: |
${{ steps.set_version.outputs.flyte_version }}
type=sha,format=long
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
- name: Login to GitHub Container Registry
if: ${{ github.event_name == 'release' }}
uses: docker/login-action@v1
with:
registry: ghcr.io
username: "${{ secrets.FLYTE_BOT_USERNAME }}"
password: "${{ secrets.FLYTE_BOT_PAT }}"
- name: Build and push DIND Image
uses: docker/build-push-action@v2
with:
context: .
platforms: linux/arm64, linux/amd64
push: ${{ github.event_name == 'release' }}
target: dind
tags: ${{ steps.dind-names.outputs.tags }}
build-args: "FLYTE_VERSION=${{ steps.set_version.outputs.flyte_version }}"
file: Dockerfile.sandbox-lite
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ __pycache__/
/charts/flyteagent/Chart.lock
/charts/flyte-deps/Chart.lock
/charts/flyte-core/Chart.lock
/docker/sandbox-lite/storage/charts
/docker/sandbox-lite/storage/Chart.lock
**/*.bak-
.python-version
dist/
Expand Down
115 changes: 0 additions & 115 deletions Dockerfile.sandbox-lite

This file was deleted.

2 changes: 1 addition & 1 deletion charts/flyte-core/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ storage:
region: us-east-1
signedUrl:
stowConfigOverride:
endpoint: http://localhost:30084
endpoint: http://minio.{{ .Release.Namespace }}.svc.cluster.local:9000
{{- else if eq .Values.storage.type "custom" }}
{{- with .Values.storage.custom -}}
{{ tpl (toYaml .) $ | nindent 2 }}
Expand Down
Loading

0 comments on commit 0237f91

Please sign in to comment.