From 12617ae0887c374ca195dcbff5159b8f43a43e01 Mon Sep 17 00:00:00 2001 From: Eduardo Apolinario Date: Mon, 24 Jun 2024 22:16:17 -0700 Subject: [PATCH 1/2] Retag flyteagent image upon release Signed-off-by: Eduardo Apolinario --- .github/workflows/create_release.yml | 3 +++ charts/flyteagent/values.yaml | 2 +- script/prepare_artifacts.sh | 3 +++ script/release.sh | 3 +-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 152c1cd042..8fc6586901 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -88,6 +88,7 @@ jobs: [ datacatalog, flyteadmin, + flyteagent, flyteconsole, flytecopilot, flytepropeller, @@ -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 diff --git a/charts/flyteagent/values.yaml b/charts/flyteagent/values.yaml index 4d02d59454..d5123c3d2e 100755 --- a/charts/flyteagent/values.yaml +++ b/charts/flyteagent/values.yaml @@ -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 diff --git a/script/prepare_artifacts.sh b/script/prepare_artifacts.sh index 159ce40d7d..3893da8527 100644 --- a/script/prepare_artifacts.sh +++ b/script/prepare_artifacts.sh @@ -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 diff --git a/script/release.sh b/script/release.sh index 056ee1e253..9816fb6a7c 100755 --- a/script/release.sh +++ b/script/release.sh @@ -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 From 00a35b705bce3702cf6e150720fcfa8f05b9ed69 Mon Sep 17 00:00:00 2001 From: Eduardo Apolinario Date: Mon, 24 Jun 2024 22:58:59 -0700 Subject: [PATCH 2/2] Run make helm Signed-off-by: Eduardo Apolinario --- charts/flyteagent/README.md | 2 +- deployment/agent/flyte_agent_helm_generated.yaml | 2 +- docker/sandbox-bundled/manifests/complete-agent.yaml | 6 +++--- docker/sandbox-bundled/manifests/complete.yaml | 4 ++-- docker/sandbox-bundled/manifests/dev.yaml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/flyteagent/README.md b/charts/flyteagent/README.md index c9619c8403..43058757c9 100644 --- a/charts/flyteagent/README.md +++ b/charts/flyteagent/README.md @@ -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 | diff --git a/deployment/agent/flyte_agent_helm_generated.yaml b/deployment/agent/flyte_agent_helm_generated.yaml index 565ac70464..49b8f492c2 100644 --- a/deployment/agent/flyte_agent_helm_generated.yaml +++ b/deployment/agent/flyte_agent_helm_generated.yaml @@ -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: diff --git a/docker/sandbox-bundled/manifests/complete-agent.yaml b/docker/sandbox-bundled/manifests/complete-agent.yaml index 0a18e42b33..d3714f2ae8 100644 --- a/docker/sandbox-bundled/manifests/complete-agent.yaml +++ b/docker/sandbox-bundled/manifests/complete-agent.yaml @@ -816,7 +816,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: eHMzc0p4bTZoSVVFb1V0Uw== + haSharedSecret: MjNrN3dwS3U1cTJPZnNIVw== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1412,7 +1412,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 174761d8b2609550a723b808cf0807c0b29cd4d3e1050ee85178a46fbca1a61c + checksum/secret: c195f31b8dfb9d32bb6e899129d6d87a9dd1293831c4463fd97fc9dcb72e5bd1 labels: app: docker-registry release: flyte-sandbox @@ -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: diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml index 2bdaa4bb4a..cced0a5875 100644 --- a/docker/sandbox-bundled/manifests/complete.yaml +++ b/docker/sandbox-bundled/manifests/complete.yaml @@ -796,7 +796,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: OFdhR0JObmY4TkFWd1JaMg== + haSharedSecret: VDlFcFJ1eEJsVEtKRjBkeA== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1360,7 +1360,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 71ade407a1350a0e7ee684b637e0a0d15cf511e83431b5466448e1a79da1d275 + checksum/secret: e26fded12ac947769f148674dbdb70c5bf1bd7e54322774debaf969160a912ea labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml index 0ea904cd28..243dff22f0 100644 --- a/docker/sandbox-bundled/manifests/dev.yaml +++ b/docker/sandbox-bundled/manifests/dev.yaml @@ -499,7 +499,7 @@ metadata: --- apiVersion: v1 data: - haSharedSecret: b1k1Q0xLa2hkR3doaG9NMg== + haSharedSecret: Q3dhYjVlbEx1OWtmVmFKcg== proxyPassword: "" proxyUsername: "" kind: Secret @@ -934,7 +934,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 7d2c67983dc470228224d912a242b2abcc695e391dc54f755e95dd5b820c7215 + checksum/secret: d91af089ad29a8e3bceb9aed388bd6759e8ce0c092e724d913f13593c58af1ea labels: app: docker-registry release: flyte-sandbox