Skip to content

Commit bbe0323

Browse files
committed
Fixing the issue in the installer script
1 parent f6bfc22 commit bbe0323

File tree

5 files changed

+5
-20
lines changed

5 files changed

+5
-20
lines changed

bin/install-envoy-gateway.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ helm_command=(
122122
"${set_args[@]}"
123123

124124
# Post-renderer configuration
125-
# NOTE: Metallb doesn't typically require a post-renderer, but we keep it
126-
# for template compliance.
127125
--post-renderer "$GENESTACK_OVERRIDES_DIR/kustomize/kustomize.sh"
128126
--post-renderer-args "$SERVICE_NAME_DEFAULT/overlay"
129127

bin/install-kube-ovn.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,4 +164,4 @@ printf '%q ' "${helm_command[@]}"
164164
echo
165165

166166
# Execute the command directly from the array
167-
"${helm_command[@]}"
167+
"${helm_command[@]}"

bin/install-kube-prometheus-stack.sh

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,6 @@ fi
4242

4343
echo "Found version for $SERVICE_NAME_DEFAULT: $SERVICE_VERSION"
4444

45-
# --- Kube-OVN specific logic to determine masters and replica count ---
46-
MASTER_NODES=$(kubectl get nodes -l kube-ovn/role=master -o json | jq -r '[.items[].status.addresses[] | select(.type == "InternalIP") | .address] | join(",")' | sed 's/,/\\,/g')
47-
MASTER_NODE_COUNT=$(kubectl get nodes -l kube-ovn/role=master -o json | jq -r '.items[].status.addresses[] | select(.type=="InternalIP") | .address' | wc -l)
48-
49-
if [ "${MASTER_NODE_COUNT}" -eq 0 ]; then
50-
echo "Error: No master nodes found labeled with 'kube-ovn/role=master'" >&2
51-
echo "Be sure to label your master nodes with 'kube-ovn/role=master' before running this script." >&2
52-
exit 1
53-
fi
54-
echo "Found $MASTER_NODE_COUNT master node(s) with IPs: ${MASTER_NODES//\\,/ }."
55-
# --------------------------------------------------------------------
56-
5745
# Load chart metadata from custom override YAML if defined
5846
for yaml_file in "${SERVICE_CUSTOM_OVERRIDES}"/*.yaml; do
5947
if [ -f "$yaml_file" ]; then
@@ -94,7 +82,6 @@ overrides_args=()
9482
# NOTE: Files in this directory are included first.
9583
if [[ -d "$SERVICE_BASE_OVERRIDES" ]]; then
9684
echo "Including base overrides from directory: $SERVICE_BASE_OVERRIDES"
97-
# Include YAML files directly in the base directory (e.g., specific overrides)
9885
for file in "$SERVICE_BASE_OVERRIDES"/*.yaml; do
9986
# Check that there is at least one match
10087
if [[ -e "$file" ]]; then
@@ -135,7 +122,7 @@ fi
135122

136123
echo
137124

138-
# Collect all --set arguments (none in the original script)
125+
# Collect all --set arguments, executing commands and quoting safely
139126
set_args=()
140127

141128

@@ -161,4 +148,4 @@ printf '%q ' "${helm_command[@]}"
161148
echo
162149

163150
# Execute the command directly from the array
164-
"${helm_command[@]}"
151+
"${helm_command[@]}"

bin/install-mariadb-operator.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,4 @@ printf '%q ' "${helm_command[@]}"
163163
echo
164164

165165
# Execute the command directly from the array
166-
"${helm_command[@]}"
166+
"${helm_command[@]}"

bin/install-memcached.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,4 @@ printf '%q ' "${helm_command[@]}"
137137
echo
138138

139139
# Execute the command directly from the array
140-
"${helm_command[@]}"
140+
"${helm_command[@]}"

0 commit comments

Comments
 (0)