Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Flyte components #7

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4dc3849
Revert "[WIP] Import components"
eapolinario Aug 8, 2023
d109052
Merge pull request #2 from eapolinario/revert-1-import-components
eapolinario Aug 8, 2023
c5ba5dc
Prepare monorepo - import eapolinario-flytepropeller
eapolinario Aug 9, 2023
2b9d22e
Merge pull request #3 from eapolinario/prepare-monorepo--import-eapol…
eapolinario Aug 9, 2023
4654477
Add checks.yml gh workflow
eapolinario Aug 16, 2023
29b36d0
Merge pull request #4 from eapolinario/monorepo--build-and-push-images
eapolinario Aug 16, 2023
20024e7
Fix syntax error
eapolinario Aug 16, 2023
3dca6a7
Fix another syntax error
eapolinario Aug 16, 2023
1209caf
Use pat
eapolinario Aug 16, 2023
da3da77
s/Lint/Run unit tests
eapolinario Aug 16, 2023
3fcf0be
Add push_docker_image
eapolinario Aug 17, 2023
5c44c58
Fix github-organization argument
eapolinario Aug 17, 2023
e184826
Enable pushing of images
eapolinario Aug 17, 2023
2caaef9
Merge remote-tracking branch 'flyte/master'
eapolinario Aug 17, 2023
e7385c7
Build single-binary using local components
eapolinario Aug 17, 2023
bfd2fb0
Remove gh-org
eapolinario Aug 20, 2023
717ac7f
Add a TODO(monorepo) for the config docs
eapolinario Aug 20, 2023
d248f29
Move flytepropeller in script/release.sh
eapolinario Aug 20, 2023
c9eec3d
Merge pull request #5 from eapolinario/monorepo--build-single-binary
eapolinario Aug 20, 2023
16559d5
Use github.repository_owner everywhere
eapolinario Aug 20, 2023
908d6ef
Merge pull request #6 from eapolinario/monorepo--use-github.repositor…
eapolinario Aug 20, 2023
ced898e
Remove team-reviewers from generate_flyte_manifest.yml
eapolinario Aug 20, 2023
ba3d3e7
Disable docs gh wf
eapolinario Aug 21, 2023
f62f5c6
Add propeller to sandbox-lite
eapolinario Aug 21, 2023
4e782b4
Update Flyte Components
eapolinario Aug 21, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
109 changes: 109 additions & 0 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
name: Build components images
on:
# TODO: enable push
# push:
# - master
workflow_dispatch:
inputs:
version:
description: 'Version to be released - Just for testing will be removed prior to merging'
required: true
type: string
go-version:
description: 'Go version to install'
default: '1.19'
type: string
jobs:
run-unit-tests:
strategy:
fail-fast: false
matrix:
component:
- flytepropeller
runs-on: ubuntu-latest
defaults:
run:
working-directory: ${{ matrix.component }}
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: ${{ inputs.go-version }}
- name: Run unit tests
# TODO: update this to use test_unit_codecov
# run: make install && make test_unit_codecov
run: make install && make test_unit
build-image:
strategy:
fail-fast: false
matrix:
component:
- flytepropeller
runs-on: ubuntu-latest
defaults:
run:
working-directory: ${{ matrix.component }}
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: ${{ inputs.go-version }}
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: "${{ secrets.FLYTE_BOT_USERNAME }}"
password: "${{ secrets.FLYTE_BOT_PAT }}"

push_docker_image:
name: Build & Push Flytepropeller Image
# TODO: enable this
# needs: [ bump_version ]
strategy:
fail-fast: false
matrix:
component:
- flytepropeller
uses: eapolinario/flytetools/.github/workflows/publish.yml@monorepo--publish-using-components
with:
# TODO: get version from bump_version step
# version: ${{ needs.bump_version.outputs.version }}
version: ${{ inputs.version }}
component: ${{ matrix.component }}
dockerfile: Dockerfile
push: true
secrets:
FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
FLYTE_BOT_USERNAME: ${{ secrets.FLYTE_BOT_USERNAME }}
#
# push_docker_image:
# name: Build & Push Flytepropeller Image
# strategy:
# fail-fast: false
# matrix:
# component:
# - flytepropeller
# runs-on: ubuntu-latest
# defaults:
# run:
# working-directory: ${{ matrix.component }}
# steps:
#
# uses: flyteorg/flytetools/.github/workflows/publish.yml@master
# with:
# # TODO: get version from bump_version step
# # version: ${{ needs.bump_version.outputs.version }}
# version: ${{ inputs.version }}
# dockerfile: Dockerfile
# push: true
# repository: ${{ inputs.organization }}
# secrets:
# # FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
# # TODO: can we use the default github token?
# FLYTE_BOT_PAT: ${{ secrets.GITHUB_TOKEN }}
# # FLYTE_BOT_USERNAME: ${{ secrets.FLYTE_BOT_USERNAME }}
# FLYTE_BOT_USERNAME: ${{ inputs.organization }}
9 changes: 4 additions & 5 deletions .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Tag image to release version
run: |
for release in latest ${{ needs.bump-version.outputs.version }}; do
docker buildx imagetools create --tag "ghcr.io/flyteorg/flyte-binary-release:${release}" "ghcr.io/flyteorg/flyte-binary:sha-${{ github.sha }}"
docker buildx imagetools create --tag "ghcr.io/${{ github.repository_owner }}/flyte-binary-release:${release}" "ghcr.io/${{ github.repository_owner }}/flyte-binary:sha-${{ github.sha }}"
done

publish-flyte-component-image:
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
- name: Tag Image to release version
run: |
for release in latest ${{ needs.bump-version.outputs.version }}; do
docker buildx imagetools create --tag "ghcr.io/flyteorg/${{ matrix.component }}-release:${release}" "ghcr.io/flyteorg/${{ matrix.component }}:${{ steps.set_version.outputs.version }}"
docker buildx imagetools create --tag "ghcr.io/${{ github.repository_owner }}/${{ matrix.component }}-release:${release}" "ghcr.io/${{ github.repository_owner }}/${{ matrix.component }}:${{ steps.set_version.outputs.version }}"
done

helm-release:
Expand All @@ -105,7 +105,6 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: "0"

- name: Install Helm
uses: azure/setup-helm@v3
with:
Expand All @@ -116,10 +115,10 @@ jobs:
run: |
git config user.name "${{ github.actor }}"
git config user.email "${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
- name: Preprare Flyte Helm Release
- name: Prepare Flyte Helm Release
env:
VERSION: ${{ needs.bump-version.outputs.version }}
REPOSITORY: "https://flyteorg.github.io/flyte"
REPOSITORY: "https://${{ github.repository_owner }}.github.io/flyte"
run: |
make prepare_artifacts
- name: Run chart-releaser
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/generate_flyte_manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,4 @@ jobs:
labels: |
kustomize
helm
team-reviewers: |
flyte-maintainers
draft: false
2 changes: 1 addition & 1 deletion .github/workflows/helm-charts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ jobs:
--app-version=${{ github.sha }} \
--version=0.0-${{ github.sha }} \
${{ matrix.chart }}
helm push ${{ matrix.chart }}-*.tgz oci://ghcr.io/flyteorg/helm-charts
helm push ${{ matrix.chart }}-*.tgz oci://ghcr.io/${{ github.repository_owner }}/helm-charts
31 changes: 16 additions & 15 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,22 @@ jobs:
- name: Compile
run: make compile

docs:
runs-on: ubuntu-latest
steps:
- name: Fetch the code
uses: actions/checkout@v2
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: "3.8"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
if [ -f doc-requirements.txt ]; then pip install -r doc-requirements.txt; fi
- name: Build the documentation
run: make docs
# TODO(monorepo) reenable docs
# docs:
# runs-on: ubuntu-latest
# steps:
# - name: Fetch the code
# uses: actions/checkout@v2
# - name: Set up Python 3.8
# uses: actions/setup-python@v2
# with:
# python-version: "3.8"
# - name: Install dependencies
# run: |
# python -m pip install --upgrade pip
# if [ -f doc-requirements.txt ]; then pip install -r doc-requirements.txt; fi
# - name: Build the documentation
# run: make docs

generate_kustomize:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ ENV GOARCH "${TARGETARCH}"
ENV GOOS linux

WORKDIR /flyteorg/build

# TODO(monorepo): copy other components
COPY flytepropeller flytepropeller

COPY go.mod go.sum ./
RUN go mod download
COPY cmd cmd
Expand Down
8 changes: 4 additions & 4 deletions charts/flyte-core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ helm install gateway bitnami/contour -n flyte
| flyteadmin.extraArgs | object | `{}` | Appends extra command line arguments to the serve command |
| flyteadmin.image.pullPolicy | string | `"IfNotPresent"` | |
| flyteadmin.image.repository | string | `"cr.flyte.org/flyteorg/flyteadmin"` | Docker image for Flyteadmin deployment |
| flyteadmin.image.tag | string | `"v1.1.118"` | |
| flyteadmin.image.tag | string | `"v1.1.122"` | |
| flyteadmin.initialProjects | list | `["flytesnacks","flytetester","flyteexamples"]` | Initial projects to create |
| flyteadmin.nodeSelector | object | `{}` | nodeSelector for Flyteadmin deployment |
| flyteadmin.podAnnotations | object | `{}` | Annotations for Flyteadmin pods |
Expand Down Expand Up @@ -196,7 +196,7 @@ helm install gateway bitnami/contour -n flyte
| flyteconsole.ga.tracking_id | string | `"G-0QW4DJWJ20"` | |
| flyteconsole.image.pullPolicy | string | `"IfNotPresent"` | |
| flyteconsole.image.repository | string | `"cr.flyte.org/flyteorg/flyteconsole"` | Docker image for Flyteconsole deployment |
| flyteconsole.image.tag | string | `"v1.9.2"` | |
| flyteconsole.image.tag | string | `"v1.9.5"` | |
| flyteconsole.nodeSelector | object | `{}` | nodeSelector for Flyteconsole deployment |
| flyteconsole.podAnnotations | object | `{}` | Annotations for Flyteconsole pods |
| flyteconsole.priorityClassName | string | `""` | Sets priorityClassName for flyte console pod(s). |
Expand All @@ -216,7 +216,7 @@ helm install gateway bitnami/contour -n flyte
| flytepropeller.extraArgs | object | `{}` | Appends extra command line arguments to the main command |
| flytepropeller.image.pullPolicy | string | `"IfNotPresent"` | |
| flytepropeller.image.repository | string | `"cr.flyte.org/flyteorg/flytepropeller"` | Docker image for Flytepropeller deployment |
| flytepropeller.image.tag | string | `"v1.1.116"` | |
| flytepropeller.image.tag | string | `"f62f5c60a2f614b377204f499ff0a8c9e07571fa"` | |
| flytepropeller.manager | bool | `false` | |
| flytepropeller.nodeSelector | object | `{}` | nodeSelector for Flytepropeller deployment |
| flytepropeller.podAnnotations | object | `{}` | Annotations for Flytepropeller pods |
Expand All @@ -236,7 +236,7 @@ helm install gateway bitnami/contour -n flyte
| flytescheduler.configPath | string | `"/etc/flyte/config/*.yaml"` | Default regex string for searching configuration files |
| flytescheduler.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
| flytescheduler.image.repository | string | `"cr.flyte.org/flyteorg/flytescheduler"` | Docker image for Flytescheduler deployment |
| flytescheduler.image.tag | string | `"v1.1.118"` | Docker image tag |
| flytescheduler.image.tag | string | `"v1.1.122"` | Docker image tag |
| flytescheduler.nodeSelector | object | `{}` | nodeSelector for Flytescheduler deployment |
| flytescheduler.podAnnotations | object | `{}` | Annotations for Flytescheduler pods |
| flytescheduler.priorityClassName | string | `""` | Sets priorityClassName for flyte scheduler pod(s). |
Expand Down
8 changes: 4 additions & 4 deletions charts/flyte-core/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ flyteadmin:
image:
# -- Docker image for Flyteadmin deployment
repository: cr.flyte.org/flyteorg/flyteadmin # FLYTEADMIN_IMAGE
tag: v1.1.118 # FLYTEADMIN_TAG
tag: v1.1.122 # FLYTEADMIN_TAG
pullPolicy: IfNotPresent
# -- Additional flyteadmin container environment variables
#
Expand Down Expand Up @@ -97,7 +97,7 @@ flytescheduler:
# -- Docker image for Flytescheduler deployment
repository: cr.flyte.org/flyteorg/flytescheduler # FLYTESCHEDULER_IMAGE
# -- Docker image tag
tag: v1.1.118 # FLYTESCHEDULER_TAG
tag: v1.1.122 # FLYTESCHEDULER_TAG
# -- Docker image pull policy
pullPolicy: IfNotPresent
# -- Default resources requests and limits for Flytescheduler deployment
Expand Down Expand Up @@ -274,7 +274,7 @@ flytepropeller:
image:
# -- Docker image for Flytepropeller deployment
repository: cr.flyte.org/flyteorg/flytepropeller # FLYTEPROPELLER_IMAGE
tag: v1.1.116 # FLYTEPROPELLER_TAG
tag: f62f5c60a2f614b377204f499ff0a8c9e07571fa # FLYTEPROPELLER_TAG
pullPolicy: IfNotPresent
# -- Default resources requests and limits for Flytepropeller deployment
resources:
Expand Down Expand Up @@ -332,7 +332,7 @@ flyteconsole:
image:
# -- Docker image for Flyteconsole deployment
repository: cr.flyte.org/flyteorg/flyteconsole # FLYTECONSOLE_IMAGE
tag: v1.9.2 # FLYTECONSOLE_TAG
tag: v1.9.5 # FLYTECONSOLE_TAG
pullPolicy: IfNotPresent
# -- Default resources requests and limits for Flyteconsole deployment
resources:
Expand Down
Loading