Skip to content

Commit 5d23542

Browse files
demetriusmoroDemetrius Moro
andauthored
fix: install script version handling and development flags (#9)
* fix: installation correct version and arch * chore: version bump * chore: avoiding /bin deletion setting default path --------- Co-authored-by: Demetrius Moro <[email protected]>
1 parent cf2f502 commit 5d23542

File tree

2 files changed

+77
-45
lines changed

2 files changed

+77
-45
lines changed

plugin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: "cel"
2-
version: "3.0.1"
2+
version: "3.0.2"
33
usage: "Validate Helm values using CEL expressions"
44
description: |-
55
A Helm plugin to validate values.yaml using CEL expressions defined in values.cel.yaml.

scripts/install.sh

Lines changed: 76 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,61 +3,93 @@ set -e
33

44
# Development mode: skip download if env var is set
55
if [ -n "$HELM_CEL_PLUGIN_NO_INSTALL_HOOK" ]; then
6-
echo "Development mode: not downloading versioned release."
7-
exit 0
6+
echo "Development mode: not downloading versioned release."
7+
exit 0
88
fi
99

10-
# Get version from plugin.yaml (assumes version: "x.y.z" is present)
11-
VERSION=$(grep '^version:' plugin.yaml | cut -d '"' -f 2)
10+
if [ -n "$HELM_CEL_PLUGIN_VERSION" ]; then
11+
# Development mode: version override
12+
echo "Development mode: overrinding VERSION with ${HELM_CEL_PLUGIN_VERSION}."
13+
VERSION="$HELM_CEL_PLUGIN_VERSION"
14+
else
15+
# Get version from plugin.yaml (assumes version: "x.y.z" is present)
16+
VERSION=$(grep '^version:' plugin.yaml | cut -d '"' -f 2)
17+
fi
18+
echo "VERSION: ${VERSION}"
1219

13-
# Detect OS
14-
OS=""
15-
case "$(uname -s)" in
16-
Darwin)
17-
OS="Darwin"
18-
;;
19-
Linux)
20-
OS="Linux"
21-
;;
22-
MINGW*|MSYS*|CYGWIN*|Windows_NT)
23-
OS="Windows"
24-
;;
25-
*)
26-
echo "Unsupported OS: $(uname -s)"
27-
exit 1
28-
;;
29-
esac
20+
if [ -n "$HELM_CEL_PLUGIN_OS" ]; then
21+
# Development mode: OS override
22+
echo "Development mode: overrinding OS with ${HELM_CEL_PLUGIN_OS}."
23+
OS="$HELM_CEL_PLUGIN_OS"
24+
else
25+
# Detect OS
26+
OS=""
27+
case "$(uname -s)" in
28+
Darwin)
29+
OS="Darwin"
30+
;;
31+
Linux)
32+
OS="Linux"
33+
;;
34+
MINGW* | MSYS* | CYGWIN* | Windows_NT)
35+
OS="Windows"
36+
;;
37+
*)
38+
echo "Unsupported OS: $(uname -s)"
39+
exit 1
40+
;;
41+
esac
42+
fi
43+
echo "OS: ${OS}"
3044

31-
# Detect ARCH
32-
ARCH=""
33-
case "$(uname -m)" in
34-
x86_64)
35-
ARCH="amd64"
36-
;;
37-
aarch64|arm64)
38-
ARCH="arm64"
39-
;;
40-
armv6*)
41-
ARCH="armv6"
42-
;;
43-
armv7*)
44-
ARCH="armv7"
45-
;;
46-
*)
47-
echo "Failed to detect target architecture: $(uname -m)"
48-
exit 1
49-
;;
50-
esac
45+
if [ -n "$HELM_CEL_PLUGIN_ARCH" ]; then
46+
# Development mode: ARCH override
47+
echo "Development mode: overrinding ARCH with ${HELM_CEL_PLUGIN_ARCH}."
48+
ARCH="$HELM_CEL_PLUGIN_ARCH"
49+
else
50+
# Detect ARCH
51+
ARCH=""
52+
case "$(uname -m)" in
53+
x86_64)
54+
ARCH="x86_64"
55+
;;
56+
aarch64 | arm64)
57+
ARCH="arm64"
58+
;;
59+
armv6*)
60+
ARCH="armv6"
61+
;;
62+
armv7*)
63+
ARCH="armv7"
64+
;;
65+
*)
66+
echo "Failed to detect target architecture: $(uname -m)"
67+
exit 1
68+
;;
69+
esac
70+
fi
71+
echo "ARCH: ${ARCH}"
5172

5273
ARCHIVE="helm-cel_${VERSION}_${OS}_${ARCH}"
5374
if [ "$OS" = "Windows" ]; then
54-
ARCHIVE="${ARCHIVE}.zip"
75+
ARCHIVE="${ARCHIVE}.zip"
5576
else
56-
ARCHIVE="${ARCHIVE}.tar.gz"
77+
ARCHIVE="${ARCHIVE}.tar.gz"
78+
fi
79+
echo "ARCHIVE: ${ARCHIVE}"
80+
81+
if [ -n "$HELM_CEL_PLUGIN_DIR" ]; then
82+
# Development mode: DIR override
83+
echo "Development mode: overrinding DIR with ${HELM_CEL_PLUGIN_DIR}."
84+
HELM_PLUGIN_DIR="$HELM_CEL_PLUGIN_DIR"
85+
fi
86+
if [ -z "$HELM_PLUGIN_DIR" ]; then
87+
HELM_PLUGIN_DIR="${HELM_PLUGIN_HOME:-$HOME/.local/share/helm/plugins}/helm-cel"
5788
fi
89+
echo "DIR: ${HELM_PLUGIN_DIR}"
5890

5991
URL="https://github.com/idsulik/helm-cel/releases/download/v${VERSION}/${ARCHIVE}"
60-
echo "Downloading $URL"
92+
echo "URL: ${URL}"
6193

6294
# Clean and create bin directory
6395
rm -rf "$HELM_PLUGIN_DIR/bin"

0 commit comments

Comments
 (0)