-
Notifications
You must be signed in to change notification settings - Fork 153
[CRDB-51639]: Add v2 chart packaging and multi-registry publishing, publish self-signer image to DockerHub. #617
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
Open
NishanthNalluri
wants to merge
2
commits into
master
Choose a base branch
from
nishanth/publish-helm-charts-v2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,10 +2,7 @@ | |
|
|
||
| set -euo pipefail | ||
|
|
||
| if [ ! -d build/artifacts ]; then | ||
| echo "Directory build/artifacts does not exist. Skipping release." | ||
| exit 0 | ||
| fi | ||
| HELM="${HELM:-${PWD}/bin/helm}" | ||
|
|
||
| charts_hostname="${CHARTS_HOSTNAME:-charts.cockroachdb.com}" | ||
| case $charts_hostname in | ||
|
|
@@ -22,7 +19,7 @@ case $charts_hostname in | |
| google_project=releases-prod | ||
| ;; | ||
| *) | ||
| echo "uknown host $charts_hostname" | ||
| echo "unknown host $charts_hostname" | ||
| exit 1 | ||
| ;; | ||
| esac | ||
|
|
@@ -33,12 +30,113 @@ remove_files_on_exit() { | |
|
|
||
| trap remove_files_on_exit EXIT | ||
|
|
||
| echo "${google_credentials}" > .google-credentials.json | ||
| gcloud auth activate-service-account --key-file=.google-credentials.json | ||
| gcs_authenticate() { | ||
| echo "${google_credentials}" > .google-credentials.json | ||
| gcloud auth activate-service-account --key-file=.google-credentials.json | ||
| } | ||
|
|
||
| # release_legacy publishes the legacy statefulset chart (cockroachdb/) to the | ||
| # root of the GCS bucket. | ||
| release_legacy() { | ||
| if [ ! -d build/artifacts ]; then | ||
| echo "Directory build/artifacts does not exist. Skipping legacy release." | ||
| return 0 | ||
| fi | ||
|
|
||
| gcs_authenticate | ||
|
|
||
| # Push the new chart file and updated index.yaml file to GCS. | ||
| gsutil rsync -x old-index.yaml "build/artifacts/" "gs://${gcs_bucket}/" | ||
|
|
||
| # Invalidate any cached version of index.yaml (so this version is immediately available). | ||
| gcloud --project "$google_project" compute url-maps invalidate-cdn-cache "$lb_name" --path "/index.yaml" --async | ||
| } | ||
|
|
||
| # release_v2 publishes the operator and cockroachdb charts to the /v2/ path | ||
| # in the GCS bucket, and pushes them as OCI artifacts to container registries. | ||
| release_v2() { | ||
| if [ ! -d build/artifacts/v2 ]; then | ||
| echo "Directory build/artifacts/v2 does not exist. Skipping v2 release." | ||
| return 0 | ||
| fi | ||
|
|
||
| # Check if there are any .tgz chart packages to publish. | ||
| if ! ls build/artifacts/v2/*.tgz 1>/dev/null 2>&1; then | ||
| echo "No v2 chart packages found. Skipping v2 release." | ||
| return 0 | ||
| fi | ||
|
|
||
| gcs_authenticate | ||
|
|
||
| # Push v2 chart packages and index.yaml to GCS under /v2/ prefix. | ||
| gsutil rsync -x old-index.yaml "build/artifacts/v2/" "gs://${gcs_bucket}/v2/" | ||
|
|
||
| # Invalidate cached v2 index.yaml. | ||
| gcloud --project "$google_project" compute url-maps invalidate-cdn-cache "$lb_name" --path "/v2/index.yaml" --async | ||
|
|
||
| # Push charts as OCI artifacts to Google Artifact Registry. | ||
| push_oci_gar | ||
|
|
||
| # Push the new chart file and updated index.yaml file to GCS. | ||
| # We rely on the gcloud CLI version installed system-wide. | ||
| gsutil rsync -x old-index.yaml "build/artifacts/" "gs://${gcs_bucket}/" | ||
| # Push charts as OCI artifacts to DockerHub. | ||
| push_oci_dockerhub | ||
| } | ||
|
|
||
| # push_oci_gar pushes chart packages as OCI artifacts to Google Artifact Registry. | ||
| # Uses the gcloud service account (already activated by gcs_authenticate) to obtain | ||
| # an access token for Helm OCI registry login. | ||
| push_oci_gar() { | ||
| local gar_registry="${OCI_GAR_REGISTRY:-us-docker.pkg.dev/releases-prod/self-hosted/charts}" | ||
| local gar_host="${gar_registry%%/*}" | ||
|
|
||
| echo "Authenticating with GAR for OCI push (${gar_host})..." | ||
| gcloud auth print-access-token | "$HELM" registry login "${gar_host}" --username oauth2accesstoken --password-stdin | ||
|
|
||
| echo "Pushing charts to OCI registry: ${gar_registry}" | ||
| for chart_pkg in build/artifacts/v2/*.tgz; do | ||
| echo " Pushing ${chart_pkg}..." | ||
| push_with_retry "${chart_pkg}" "${gar_registry}" | ||
| done | ||
| } | ||
|
Comment on lines
+94
to
+99
|
||
|
|
||
| # push_oci_dockerhub pushes chart packages as OCI artifacts to DockerHub. | ||
| # Requires DOCKERHUB_USERNAME and DOCKERHUB_TOKEN environment variables. | ||
| push_oci_dockerhub() { | ||
| local dockerhub_registry="${OCI_DOCKERHUB_REGISTRY:-registry-1.docker.io/cockroachdb}" | ||
|
|
||
| if [ -z "${DOCKERHUB_USERNAME:-}" ] || [ -z "${DOCKERHUB_TOKEN:-}" ]; then | ||
| echo "Skipping OCI push to DockerHub: DOCKERHUB_USERNAME and DOCKERHUB_TOKEN not set." | ||
| return 0 | ||
| fi | ||
|
|
||
| # Invalidate any cached version of index.yaml (so this version is immediately available) | ||
| gcloud --project $google_project compute url-maps invalidate-cdn-cache $lb_name --path "/index.yaml" --async | ||
| echo "Authenticating with DockerHub for OCI push..." | ||
| echo "${DOCKERHUB_TOKEN}" | "$HELM" registry login registry-1.docker.io --username "${DOCKERHUB_USERNAME}" --password-stdin | ||
|
|
||
| echo "Pushing charts to OCI registry: ${dockerhub_registry}" | ||
| for chart_pkg in build/artifacts/v2/*.tgz; do | ||
| echo " Pushing ${chart_pkg}..." | ||
| push_with_retry "${chart_pkg}" "${dockerhub_registry}" | ||
| done | ||
| } | ||
|
|
||
| # push_with_retry pushes a chart package to an OCI registry with retries. | ||
| # Usage: push_with_retry <chart_pkg> <registry> [max_attempts] | ||
| push_with_retry() { | ||
| local chart_pkg="$1" registry="$2" max_attempts="${3:-3}" | ||
| for ((i=1; i<=max_attempts; i++)); do | ||
| if "$HELM" push "$chart_pkg" "oci://$registry"; then | ||
| return 0 | ||
| fi | ||
| echo " Attempt $i/$max_attempts failed for $chart_pkg" | ||
| if ((i < max_attempts)); then | ||
| sleep $((i * 5)) | ||
| fi | ||
| done | ||
| echo " All $max_attempts attempts exhausted for $chart_pkg" | ||
| return 1 | ||
| } | ||
|
|
||
| if [[ "${1:-}" == "v2" ]]; then | ||
| release_v2 | ||
| else | ||
| release_legacy | ||
| fi | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
chart_version_existsand the newv2_chart_version_existsuse opposite success semantics (legacy returns non-zero when the version exists, v2 returns zero when the version exists). This inconsistency is easy to misuse and can lead to incorrect skip logic later. Consider aligning the return codes or renaming one of the functions to reflect its actual truthiness.