Skip to content

fix(kwok): drop recipe suffix from argocd-helm-oci in-cluster repoURL #1047

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.

Sign up for GitHub

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

Merged
mchmarny merged 2 commits into from
May 26, 2026
Merged

fix(kwok): drop recipe suffix from argocd-helm-oci in-cluster repoURL #1047

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52fb835
fix(kwok): drop recipe suffix from argocd-helm-oci in-cluster repoURL
yuanchen8911 May 26, 2026
c70e847
Merge branch 'main' into fix/kwok-argocd-helm-oci-repourl-1032
mchmarny May 26, 2026
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
15 changes: 13 additions & 2 deletions kwok/scripts/validate-scheduling.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,15 +755,26 @@ generate_bundle() {
# Script-global so deploy_bundle's argocd-helm-oci branch can
# pass it through to `helm install --set repoURL=…` without
# duplicating the runner→service-DNS rewrite rule.
OCI_IN_CLUSTER_REF="oci://registry.aicr-registry.svc.cluster.local:5000/aicr/${recipe}"
#
# Per PR #1032's contract change (and #1035's enforcement on the
# parent App template), --set repoURL must carry the PARENT
# NAMESPACE ONLY — without the per-recipe chart name. The
# argocd-helm parent Application appends .Chart.Name via its
# separate `source.chart` field; path-based child Applications
# append /{{ .Chart.Name }} via their template, so both halves
# resolve to the same artifact regardless of which Argo source
# type the cluster picks. The pushed artifact lives at
# oci://…/aicr/<recipe>:<tag>; the recipe segment is the chart
# name, which Argo appends itself.
OCI_IN_CLUSTER_REF="oci://registry.aicr-registry.svc.cluster.local:5000/aicr"
local in_cluster_repo="$OCI_IN_CLUSTER_REF"

# Map our deployer-matrix name to aicr's --deployer value.
local deployer_arg="argocd"
[[ "$DEPLOYER" == "argocd-helm-oci" ]] && deployer_arg="argocd-helm"

log_info "Bundling for ${deployer_arg}, pushing to ${OCI_REF}"
log_info "Argo CD will pull from ${in_cluster_repo}:${tag}"
log_info "Argo CD will pull from ${in_cluster_repo}/${recipe}:${tag} (parent namespace + .Chart.Name appended by the parent App)"
# When --output is an oci:// reference, `aicr bundle` writes the
# local bundle to ./bundle (relative to CWD) — there's no way to
# redirect it to an absolute path. cd into WORK_DIR so the local
Expand Down
Loading