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

Retag flyteagent image upon release #5509

Merged
merged 3 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
3 changes: 3 additions & 0 deletions .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ jobs:
[
datacatalog,
flyteadmin,
flyteagent,
flyteconsole,
flytecopilot,
flytepropeller,
Expand All @@ -107,6 +108,8 @@ jobs:
run: |
if [ ${{ matrix.component }} = "flytecopilot" ]; then
echo ::set-output name=version::$(yq eval '.configmap.copilot.plugins.k8s.co-pilot.image' charts/flyte-core/values.yaml | cut -d ":" -f 2 )
elif [ ${{ matrix.component }} = "flyteagent" ]; then
echo ::set-output name=version::$(yq eval '.${{ matrix.component }}.image.tag' charts/flyteagent/values.yaml)
else
echo ::set-output name=version::$(yq eval '.${{ matrix.component }}.image.tag' charts/flyte-core/values.yaml)
fi
Expand Down
2 changes: 1 addition & 1 deletion charts/flyteagent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ A Helm chart for Flyte agent
| extraArgs | object | `{}` | Appends extra command line arguments to the main command |
| fullnameOverride | string | `""` | |
| image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
| image.repository | string | `"ghcr.io/flyteorg/flyteagent"` | Docker image for flyteagent deployment |
| image.repository | string | `"cr.flyte.org/flyteorg/flyteagent"` | Docker image for flyteagent deployment |
| image.tag | string | `"1.12.1-rc0"` | Docker image tag |
| nameOverride | string | `""` | |
| nodeSelector | object | `{}` | nodeSelector for flyteagent deployment |
Expand Down
2 changes: 1 addition & 1 deletion charts/flyteagent/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ agentSecret:
replicaCount: 1
image:
# -- Docker image for flyteagent deployment
repository: ghcr.io/flyteorg/flyteagent
repository: cr.flyte.org/flyteorg/flyteagent # FLYTEAGENT_IMAGE
# -- Docker image tag
tag: 1.12.1-rc0 # FLYTEAGENT_TAG
# -- Docker image pull policy
Expand Down
2 changes: 1 addition & 1 deletion deployment/agent/flyte_agent_helm_generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ spec:
- pyflyte
- serve
- agent
image: "ghcr.io/flyteorg/flyteagent:1.12.1-rc0"
image: "cr.flyte.org/flyteorg/flyteagent:1.12.1-rc0"
imagePullPolicy: "IfNotPresent"
name: flyteagent
volumeMounts:
Expand Down
6 changes: 3 additions & 3 deletions docker/sandbox-bundled/manifests/complete-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ type: Opaque
---
apiVersion: v1
data:
haSharedSecret: eHMzc0p4bTZoSVVFb1V0Uw==
haSharedSecret: MjNrN3dwS3U1cTJPZnNIVw==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -1412,7 +1412,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: 174761d8b2609550a723b808cf0807c0b29cd4d3e1050ee85178a46fbca1a61c
checksum/secret: c195f31b8dfb9d32bb6e899129d6d87a9dd1293831c4463fd97fc9dcb72e5bd1
labels:
app: docker-registry
release: flyte-sandbox
Expand Down Expand Up @@ -1755,7 +1755,7 @@ spec:
value: minio
- name: FLYTE_AWS_SECRET_ACCESS_KEY
value: miniostorage
image: ghcr.io/flyteorg/flyteagent:1.12.1-rc0
image: cr.flyte.org/flyteorg/flyteagent:1.12.1-rc0
imagePullPolicy: IfNotPresent
name: flyteagent
ports:
Expand Down
4 changes: 2 additions & 2 deletions docker/sandbox-bundled/manifests/complete.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ type: Opaque
---
apiVersion: v1
data:
haSharedSecret: OFdhR0JObmY4TkFWd1JaMg==
haSharedSecret: VDlFcFJ1eEJsVEtKRjBkeA==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -1360,7 +1360,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: 71ade407a1350a0e7ee684b637e0a0d15cf511e83431b5466448e1a79da1d275
checksum/secret: e26fded12ac947769f148674dbdb70c5bf1bd7e54322774debaf969160a912ea
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
4 changes: 2 additions & 2 deletions docker/sandbox-bundled/manifests/dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ metadata:
---
apiVersion: v1
data:
haSharedSecret: b1k1Q0xLa2hkR3doaG9NMg==
haSharedSecret: Q3dhYjVlbEx1OWtmVmFKcg==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -934,7 +934,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: 7d2c67983dc470228224d912a242b2abcc695e391dc54f755e95dd5b820c7215
checksum/secret: d91af089ad29a8e3bceb9aed388bd6759e8ce0c092e724d913f13593c58af1ea
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
3 changes: 3 additions & 0 deletions script/prepare_artifacts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,6 @@ sed -i "s,repository:[^P]*# FLYTE_IMAGE,repository: cr.flyte.org/flyteorg/flyte-
sed -i "s,tag:[^P]*# FLYTE_TAG,tag: ${VERSION} # FLYTE_TAG," ./charts/flyte-binary/values.yaml
sed -i "s,repository:[^P]*# FLYTECOPILOT_IMAGE,repository: cr.flyte.org/flyteorg/flytecopilot-release # FLYTECOPILOT_IMAGE," ./charts/flyte-binary/values.yaml
sed -i "s,tag:[^P]*# FLYTECOPILOT_TAG,tag: ${VERSION} # FLYTECOPILOT_TAG," ./charts/flyte-binary/values.yaml

sed -i "s,tag:[^P]*# FLYTEAGENT_TAG,tag: ${VERSION} # FLYTEAGENT_TAG," ./charts/flyteagent/values.yaml
sed -i "s,repository:[^P]*# FLYTEAGENT_IMAGE,repository: cr.flyte.org/flyteorg/flyteagent-release # FLYTEAGENT_IMAGE," ./charts/flyteagent/values.yaml
3 changes: 1 addition & 2 deletions script/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

set -ex

# NOTE: Flyte and flytekit should be released at the same time. If not, Flyte chart will use a flyteagent image that does not exist.
FLYTEKIT_TAG=$(echo "${VERSION}" | sed 's/^v//')
FLYTEKIT_TAG=$(curl --silent "https://api.github.com/repos/flyteorg/flytekit/releases/latest" | jq -r .tag_name | sed 's/^v//')
FLYTECONSOLE_TAG=$(curl --silent "https://api.github.com/repos/flyteorg/flyteconsole/releases/latest" | jq -r .tag_name)

# bump latest release of flyte component in helm
Expand Down
Loading