From e98ba152b774ffbf7e2eabc9edb6d34654826273 Mon Sep 17 00:00:00 2001 From: Demetrius Moro Date: Wed, 6 Aug 2025 09:05:50 -0300 Subject: [PATCH 1/3] fix: installation correct version and arch --- scripts/install.sh | 117 ++++++++++++++++++++++++++++----------------- 1 file changed, 73 insertions(+), 44 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index d966dd1..3463633 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -3,61 +3,90 @@ set -e # Development mode: skip download if env var is set if [ -n "$HELM_CEL_PLUGIN_NO_INSTALL_HOOK" ]; then - echo "Development mode: not downloading versioned release." - exit 0 + echo "Development mode: not downloading versioned release." + exit 0 fi -# Get version from plugin.yaml (assumes version: "x.y.z" is present) -VERSION=$(grep '^version:' plugin.yaml | cut -d '"' -f 2) +if [ -n "$HELM_CEL_PLUGIN_VERSION" ]; then + # Development mode: version override + echo "Development mode: overrinding VERSION with ${HELM_CEL_PLUGIN_VERSION}." + VERSION="$HELM_CEL_PLUGIN_VERSION" +else + # Get version from plugin.yaml (assumes version: "x.y.z" is present) + VERSION=$(grep '^version:' plugin.yaml | cut -d '"' -f 2) +fi +echo "VERSION: ${VERSION}" -# Detect OS -OS="" -case "$(uname -s)" in - Darwin) - OS="Darwin" - ;; - Linux) - OS="Linux" - ;; - MINGW*|MSYS*|CYGWIN*|Windows_NT) - OS="Windows" - ;; - *) - echo "Unsupported OS: $(uname -s)" - exit 1 - ;; -esac +if [ -n "$HELM_CEL_PLUGIN_OS" ]; then + # Development mode: OS override + echo "Development mode: overrinding OS with ${HELM_CEL_PLUGIN_OS}." + OS="$HELM_CEL_PLUGIN_OS" +else + # Detect OS + OS="" + case "$(uname -s)" in + Darwin) + OS="Darwin" + ;; + Linux) + OS="Linux" + ;; + MINGW* | MSYS* | CYGWIN* | Windows_NT) + OS="Windows" + ;; + *) + echo "Unsupported OS: $(uname -s)" + exit 1 + ;; + esac +fi +echo "OS: ${OS}" -# Detect ARCH -ARCH="" -case "$(uname -m)" in - x86_64) - ARCH="amd64" - ;; - aarch64|arm64) - ARCH="arm64" - ;; - armv6*) - ARCH="armv6" - ;; - armv7*) - ARCH="armv7" - ;; - *) - echo "Failed to detect target architecture: $(uname -m)" - exit 1 - ;; -esac +if [ -n "$HELM_CEL_PLUGIN_ARCH" ]; then + # Development mode: ARCH override + echo "Development mode: overrinding ARCH with ${HELM_CEL_PLUGIN_ARCH}." + ARCH="$HELM_CEL_PLUGIN_ARCH" +else + # Detect ARCH + ARCH="" + case "$(uname -m)" in + x86_64) + ARCH="x86_64" + ;; + aarch64 | arm64) + ARCH="arm64" + ;; + armv6*) + ARCH="armv6" + ;; + armv7*) + ARCH="armv7" + ;; + *) + echo "Failed to detect target architecture: $(uname -m)" + exit 1 + ;; + esac +fi +echo "ARCH: ${ARCH}" ARCHIVE="helm-cel_${VERSION}_${OS}_${ARCH}" if [ "$OS" = "Windows" ]; then - ARCHIVE="${ARCHIVE}.zip" + ARCHIVE="${ARCHIVE}.zip" else - ARCHIVE="${ARCHIVE}.tar.gz" + ARCHIVE="${ARCHIVE}.tar.gz" +fi +echo "ARCHIVE: ${ARCHIVE}" + +if [ -n "$HELM_CEL_PLUGIN_DIR" ]; then + # Development mode: DIR override + echo "Development mode: overrinding DIR with ${HELM_CEL_PLUGIN_DIR}." + HELM_PLUGIN_DIR="$HELM_CEL_PLUGIN_DIR" fi +echo "DIR: ${HELM_PLUGIN_DIR}" URL="https://github.com/idsulik/helm-cel/releases/download/v${VERSION}/${ARCHIVE}" -echo "Downloading $URL" +echo "URL: ${URL}" # Clean and create bin directory rm -rf "$HELM_PLUGIN_DIR/bin" From f966ae8bb0b4e9a2459447ff44cd8b1e8f2d5edc Mon Sep 17 00:00:00 2001 From: Demetrius Moro Date: Wed, 6 Aug 2025 09:08:13 -0300 Subject: [PATCH 2/3] chore: version bump --- plugin.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.yaml b/plugin.yaml index e19f34f..d21b2ac 100644 --- a/plugin.yaml +++ b/plugin.yaml @@ -1,5 +1,5 @@ name: "cel" -version: "3.0.1" +version: "3.0.2" usage: "Validate Helm values using CEL expressions" description: |- A Helm plugin to validate values.yaml using CEL expressions defined in values.cel.yaml. From 399b7a81e70b1a864ed0d7de5ea4d5621c266611 Mon Sep 17 00:00:00 2001 From: Demetrius Moro Date: Wed, 6 Aug 2025 09:50:58 -0300 Subject: [PATCH 3/3] chore: avoiding /bin deletion setting default path --- scripts/install.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index 3463633..770c9ce 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -81,7 +81,10 @@ echo "ARCHIVE: ${ARCHIVE}" if [ -n "$HELM_CEL_PLUGIN_DIR" ]; then # Development mode: DIR override echo "Development mode: overrinding DIR with ${HELM_CEL_PLUGIN_DIR}." - HELM_PLUGIN_DIR="$HELM_CEL_PLUGIN_DIR" + HELM_PLUGIN_DIR="$HELM_CEL_PLUGIN_DIR" +fi +if [ -z "$HELM_PLUGIN_DIR" ]; then + HELM_PLUGIN_DIR="${HELM_PLUGIN_HOME:-$HOME/.local/share/helm/plugins}/helm-cel" fi echo "DIR: ${HELM_PLUGIN_DIR}"