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

Rename agent chart #4019

Merged
merged 4 commits into from
Sep 8, 2023
Merged
Show file tree
Hide file tree
Changes from 3 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
16 changes: 13 additions & 3 deletions .github/workflows/helm-charts.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Package & Push Flyte Helm Charts

on:
pull_request:
push:
branches:
- master
Expand All @@ -13,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
chart: ["flyte-binary", "flyte-core", "flyte-agent"]
chart: ["flyte-binary", "flyte-core", "flyteagent"]
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -25,12 +26,21 @@ jobs:
registry: ghcr.io
username: "${{ secrets.FLYTE_BOT_USERNAME }}"
password: "${{ secrets.FLYTE_BOT_PAT }}"
- name: Publish Helm chart to GHCR
- name: Build helm chart
working-directory: charts
run: |
helm dep update ${{ matrix.chart }}
helm package \
--app-version=${{ github.sha }} \
--version=0.0-${{ github.sha }} \
${{ matrix.chart }}
helm push ${{ matrix.chart }}-*.tgz oci://ghcr.io/flyteorg/helm-charts

if ! ls ${{ matrix.chart }}-* 2>&1 >/dev/null;
then
echo "Chart package not found."
exit 1
fi
eapolinario marked this conversation as resolved.
Show resolved Hide resolved
- name: Publish Helm chart to GHCR
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
run:
helm push ${{ matrix.chart }}-*.tgz oci://ghcr.io/flyteorg/helm-charts
pingsutw marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ __pycache__/
/charts/flyte-deps/charts
/charts/flyte/Chart.lock
/charts/flyte-binary/Chart.lock
/charts/flyte-agent/Chart.lock
/charts/flyteagent/Chart.lock
/charts/flyte-deps/Chart.lock
/charts/flyte-core/Chart.lock
/docker/sandbox-lite/storage/charts
Expand Down
2 changes: 1 addition & 1 deletion charts/flyte-binary/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ dependencies:
condition: flyteagent.enabled
alias: flyteagent
version: v0.1.10 # VERSION
repository: file://../flyte-agent # REPOSITORY
repository: file://../flyteagent # REPOSITORY
2 changes: 1 addition & 1 deletion charts/flyte-binary/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Chart for basic single Flyte executable deployment

| Repository | Name | Version |
|------------|------|---------|
| file://../flyte-agent | flyteagent(flyteagent) | v0.1.10 |
| file://../flyteagent | flyteagent(flyteagent) | v0.1.10 |

## Values

Expand Down
2 changes: 1 addition & 1 deletion charts/flyte-core/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ dependencies:
condition: flyteagent.enabled
alias: flyteagent
version: v0.1.10 # VERSION
repository: file://../flyte-agent # REPOSITORY
repository: file://../flyteagent # REPOSITORY
2 changes: 1 addition & 1 deletion charts/flyte-core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ A Helm chart for Flyte core

| Repository | Name | Version |
|------------|------|---------|
| file://../flyte-agent | flyteagent(flyteagent) | v0.1.10 |
| file://../flyteagent | flyteagent(flyteagent) | v0.1.10 |

### Flyte INSTALLATION:
- [Install helm 3](https://helm.sh/docs/intro/install/)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# FLYTE_AGENT SETTINGS
# ---------------------------------------------------------------------

# nameOverride String to override flyte-agent.name template
# nameOverride String to override flyteagent.name template
nameOverride: ""
# fullnameOverride String to override flyte-agent.fullname template
# fullnameOverride String to override flyteagent.fullname template
fullnameOverride: ""
# commonLabels Add labels to all the deployed resources
commonLabels: {}
Expand Down
2 changes: 1 addition & 1 deletion flyteplugins/go/tasks/plugins/webapi/agent/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var (
},
},
DefaultAgent: Agent{
Endpoint: "dns:///flyte-agent.flyte.svc.cluster.local:80",
Endpoint: "dns:///flyteagent.flyte.svc.cluster.local:80",
Insecure: true,
DefaultTimeout: config.Duration{Duration: 10 * time.Second},
},
Expand Down
2 changes: 1 addition & 1 deletion script/generate_helm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ helm template flyte -n flyte ${DIR}/../charts/flyte-deps/ ${HELM_CAPABILITIES} -
helm template flyte -n flyte ${DIR}/../charts/flyte-binary/ ${HELM_CAPABILITIES} --debug > ${DIR}/../deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml

# Generate manifest flyte agent
helm template flyte -n flyte ${DIR}/../charts/flyte-agent/ ${HELM_CAPABILITIES} --debug > ${DIR}/../deployment/agent/flyte_agent_helm_generated.yaml
helm template flyte -n flyte ${DIR}/../charts/flyteagent/ ${HELM_CAPABILITIES} --debug > ${DIR}/../deployment/agent/flyte_agent_helm_generated.yaml


echo "Generating helm docs"
Expand Down
Loading