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.

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

[OCI Helm repo compatability]: Add support for optional skip of passing versions of k8s and APIs from command line #53

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[OCI Helm repo compatability]: Add support for optional skip of passing versions of k8s and APIs from command line #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions src/argo-cd-helmfile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
# HELMFILE_REPO_CACHE_TIMEOUT - seconds to cache the repo update process
# HELMFILE_USE_CONTEXT_NAMESPACE - do not set helmfile namespace to ARGOCD_APP_NAMESPACE (for multi-namespace apps)
# HELMFILE_DISCOVERY_RESPONSE - truthy value for forced response
# HELMFILE_PASS_VERSIONS - pass the K8s and API versions as command-line args
# HELM_HOME - perform variable expansion
# HELM_CACHE_HOME - perform variable expansion
# HELM_CONFIG_HOME - perform variable expansion
Expand Down Expand Up @@ -185,6 +186,10 @@ fi
# immediately correct PATH if necessary
export PATH=$(variable_expansion "${PATH}")

# pass k8s and api versions to helm as command-line args if set to true
# maybe set to false for some edge cases like working with OCI registry
: ${HELMFILE_PASS_VERSIONS:=true}

# expand nested variables
if [[ "${HELMFILE_GLOBAL_OPTIONS}" ]]; then
HELMFILE_GLOBAL_OPTIONS=$(variable_expansion "${HELMFILE_GLOBAL_OPTIONS}")
Expand Down Expand Up @@ -385,17 +390,17 @@ case $phase in
# --no-hooks prevent hooks from running during install
# --skip-crds if set, no CRDs will be installed. By default, CRDs are installed if not already present

if [[ ${helm_major_version} -eq 2 && "${KUBE_VERSION}" ]]; then
if truthy_test "${HELMFILE_PASS_VERSIONS}" && [[ ${helm_major_version} -eq 2 && "${KUBE_VERSION}" ]]; then
INTERNAL_HELM_TEMPLATE_OPTIONS="${INTERNAL_HELM_TEMPLATE_OPTIONS} --kube-version=${KUBE_VERSION}"
fi

# support added for --kube-version in 3.6
# https://github.com/helm/helm/pull/9040
if [[ ${helm_major_version} -eq 3 && ${helm_minor_version} -ge 6 && "${KUBE_VERSION}" ]]; then
if truthy_test "${HELMFILE_PASS_VERSIONS}" && [[ ${helm_major_version} -eq 3 && ${helm_minor_version} -ge 6 && "${KUBE_VERSION}" ]]; then
INTERNAL_HELM_TEMPLATE_OPTIONS="${INTERNAL_HELM_TEMPLATE_OPTIONS} --kube-version=${KUBE_VERSION}"
fi

if [[ ${helm_major_version} -eq 3 && "${KUBE_API_VERSIONS}" ]]; then
if truthy_test "${HELMFILE_PASS_VERSIONS}" && [[ ${helm_major_version} -eq 3 && "${KUBE_API_VERSIONS}" ]]; then
INTERNAL_HELM_API_VERSIONS=""
for v in ${KUBE_API_VERSIONS//,/ }; do
INTERNAL_HELM_API_VERSIONS="${INTERNAL_HELM_API_VERSIONS} --api-versions=$v"
Expand Down