Skip to content

Commit c3b8fff

Browse files
committed
fixed shellcheck issues
1 parent d59a29c commit c3b8fff

7 files changed

+177
-158
lines changed

.shellcheckrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Disables the check for sourced files
2+
disable=SC1091
3+
# Disables the check for expanding an array, as it predictably gives first element
4+
disable=SC2128

logging/bin/deploy_fluentbit_azmonitor.sh

Lines changed: 71 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
#! /bin/bash
1+
#!/bin/bash
22

33
# Copyright © 2020, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
44
# SPDX-License-Identifier: Apache-2.0
55

6-
cd "$(dirname $BASH_SOURCE)/../.."
6+
# shellcheck source=/dev/null
7+
cd "$(dirname "$BASH_SOURCE")/../.." || exit 1
8+
# shellcheck source=/dev/null
79
source logging/bin/common.sh
810

9-
this_script=`basename "$0"`
11+
# Fix SC2155: Declare and assign separately
12+
this_script=$(basename "$0")
1013

1114
log_debug "Script [$this_script] has started [$(date)]"
1215

@@ -15,32 +18,38 @@ FLUENT_BIT_ENABLED=${FLUENT_BIT_ENABLED:-true}
1518

1619
if [ "$FLUENT_BIT_ENABLED" != "true" ]; then
1720
log_info "Environment variable [FLUENT_BIT_ENABLED] is not set to 'true'; existing WITHOUT deploying Fluent Bit"
18-
exit
21+
exit 0
1922
fi
2023

21-
2224
set -e
2325

2426
HELM_DEBUG="${HELM_DEBUG:-false}"
27+
helmDebug=""
2528
if [ "$HELM_DEBUG" == "true" ]; then
2629
helmDebug="--debug"
2730
fi
2831

29-
helm2ReleaseCheck fb-$LOG_NS
32+
# Address SC2154: Ensure variables from common.sh are available or defined
33+
# The following variables are expected to be set in common.sh:
34+
# LOG_NS, TMP_DIR, USER_DIR, FB_FULL_IMAGE, FB_INITCONTAINER_FULL_IMAGE
35+
# imageKeysFile, FLUENTBIT_HELM_CHART_REPO, FLUENTBIT_HELM_CHART_NAME, FLUENTBIT_HELM_CHART_VERSION
36+
37+
helm2ReleaseCheck "fb-$LOG_NS"
3038

3139
helmRepoAdd fluent https://fluent.github.io/helm-charts
3240

3341
# Confirm namespace exists
34-
if [ "$(kubectl get ns $LOG_NS -o name 2>/dev/null)" == "" ]; then
42+
if [ "$(kubectl get ns "$LOG_NS" -o name 2>/dev/null)" == "" ]; then
3543
log_error "The specified namespace [$LOG_NS] does not exist."
3644
exit 1
3745
fi
3846

3947
log_info "Deploying Fluent Bit (Azure Monitor)"
4048

41-
#Generate yaml file with all container-related keys#Generate yaml file with all container-related keys
42-
generateImageKeysFile "$FB_FULL_IMAGE" "logging/fb/fb_container_image.template"
43-
#Copy imageKeysFile since next call will replace existing one
49+
# Generate yaml file with all container-related keys
50+
generateImageKeysFile "$FB_FULL_IMAGE" "logging/fb/fb_container_image.template"
51+
# Copy imageKeysFile since next call will replace existing one
52+
#shellcheck disable=SC2154
4453
cp "$imageKeysFile" "$TMP_DIR/fb_imagekeysfile.yaml"
4554

4655
generateImageKeysFile "$FB_INITCONTAINER_FULL_IMAGE" "logging/fb/fb_initcontainer_image.template" "" "true"
@@ -49,7 +58,7 @@ generateImageKeysFile "$FB_INITCONTAINER_FULL_IMAGE" "logging/fb/fb_initcontaine
4958
FB_AZMONITOR_USER_YAML="${FB_AZMONITOR_USER_YAML:-$USER_DIR/logging/user-values-fluent-bit-azmonitor.yaml}"
5059
if [ ! -f "$FB_AZMONITOR_USER_YAML" ]; then
5160
log_debug "[$FB_AZMONITOR_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
52-
FB_AZMONITOR_USER_YAML=$TMP_DIR/empty.yaml
61+
FB_AZMONITOR_USER_YAML="$TMP_DIR/empty.yaml"
5362
fi
5463

5564
if [ -f "$USER_DIR/logging/fluent-bit_config.configmap_azmonitor.yaml" ]; then
@@ -59,16 +68,15 @@ else
5968
# use copy in repo
6069
FB_CONFIGMAP="logging/fb/fluent-bit_config.configmap_azmonitor.yaml"
6170
fi
62-
log_info "Using FB ConfigMap:" $FB_CONFIGMAP
63-
71+
log_info "Using FB ConfigMap: $FB_CONFIGMAP"
6472

6573
# Check/Create Connection Info Secret
66-
if [ "$(kubectl -n $LOG_NS get secret connection-info-azmonitor -o name 2>/dev/null)" == "" ]; then
74+
if [ "$(kubectl -n "$LOG_NS" get secret connection-info-azmonitor -o name 2>/dev/null)" == "" ]; then
6775

6876
export AZMONITOR_CUSTOMER_ID="${AZMONITOR_CUSTOMER_ID:-NotProvided}"
6977
export AZMONITOR_SHARED_KEY="${AZMONITOR_SHARED_KEY:-NotProvided}"
7078

71-
if [ "$AZMONITOR_CUSTOMER_ID" != "NotProvided" ] && [ "$AZMONITOR_SHARED_KEY" != "NotProvided" ]; then
79+
if [ "$AZMONITOR_CUSTOMER_ID" != "NotProvided" ] && [ "$AZMONITOR_SHARED_KEY" != "NotProvided" ]; then
7280
log_info "Creating secret [connection-info-azmonitor] in [$LOG_NS] namespace to hold Azure connection information."
7381
kubectl -n "$LOG_NS" create secret generic connection-info-azmonitor --from-literal=customer_id="$AZMONITOR_CUSTOMER_ID" --from-literal=shared_key="$AZMONITOR_SHARED_KEY"
7482
else
@@ -78,20 +86,28 @@ if [ "$(kubectl -n $LOG_NS get secret connection-info-azmonitor -o name 2>/dev/n
7886
fi
7987
else
8088
log_info "Obtaining connection information from existing secret [$LOG_NS/connection-info-azmonitor]"
81-
export AZMONITOR_CUSTOMER_ID=$(kubectl -n "$LOG_NS" get secret connection-info-azmonitor -o=jsonpath="{.data.customer_id}" |base64 --decode)
82-
export AZMONITOR_SHARED_KEY=$(kubectl -n "$LOG_NS" get secret connection-info-azmonitor -o=jsonpath="{.data.shared_key}" |base64 --decode)
89+
# Fix SC2155: Declare and assign separately
90+
AZMONITOR_CUSTOMER_ID=$(kubectl -n "$LOG_NS" get secret connection-info-azmonitor -o=jsonpath="{.data.customer_id}" | base64 --decode)
91+
export AZMONITOR_CUSTOMER_ID
92+
AZMONITOR_SHARED_KEY=$(kubectl -n "$LOG_NS" get secret connection-info-azmonitor -o=jsonpath="{.data.shared_key}" | base64 --decode)
93+
export AZMONITOR_SHARED_KEY
8394
fi
8495

8596
# Check for an existing Helm release of stable/fluent-bit
86-
if helm3ReleaseExists fbaz $LOG_NS; then
97+
if helm3ReleaseExists fbaz "$LOG_NS"; then
8798
log_info "Removing an existing release of deprecated stable/fluent-bit Helm chart from from the [$LOG_NS] namespace [$(date)]"
88-
helm $helmDebug delete -n "$LOG_NS" fbaz
99+
helm "$helmDebug" delete -n "$LOG_NS" fbaz
89100

90-
if [ $(kubectl get servicemonitors -A |grep fluent-bit-v2 -c) -ge 1 ]; then
101+
# Fix SC2155: Declare and assign separately
102+
num_service_monitors_v2=$(kubectl get servicemonitors -A | grep -c fluent-bit-v2 || true)
103+
if [ "$num_service_monitors_v2" -ge 1 ]; then
91104
log_debug "Updated serviceMonitor [fluent-bit-v2] appears to be deployed."
92-
elif [ $(kubectl get servicemonitors -A |grep fluent-bit -c) -ge 1 ]; then
93-
log_warn "You appear to have an obsolete service monitor in place for monitoring Fluent Bit."
94-
log_warn "Run monitoring/bin/deploy_monitoring_cluster.sh to deploy the current set of service monitors."
105+
else
106+
num_service_monitors=$(kubectl get servicemonitors -A | grep -c fluent-bit || true)
107+
if [ "$num_service_monitors" -ge 1 ]; then
108+
log_warn "You appear to have an obsolete service monitor in place for monitoring Fluent Bit."
109+
log_warn "Run monitoring/bin/deploy_monitoring_cluster.sh to deploy the current set of service monitors."
110+
fi
95111
fi
96112
else
97113
log_debug "No existing release of the deprecated stable/fluent-bit Helm chart was found"
@@ -106,32 +122,34 @@ else
106122
fi
107123

108124
# Create ConfigMap containing Fluent Bit configuration
109-
kubectl -n "$LOG_NS" apply -f $FB_CONFIGMAP
125+
kubectl -n "$LOG_NS" apply -f "$FB_CONFIGMAP"
110126

111127
# Create ConfigMap containing Viya-customized parsers (delete it first)
112128
kubectl -n "$LOG_NS" delete configmap fbaz-viya-parsers --ignore-not-found
113-
kubectl -n "$LOG_NS" create configmap fbaz-viya-parsers --from-file=logging/fb/viya-parsers.conf
129+
kubectl -n "$LOG_NS" create configmap fbaz-viya-parsers --from-file=logging/fb/viya-parsers.conf
114130

115131
TRACING_ENABLE="${TRACING_ENABLE:-false}"
132+
tracingValuesFile=""
116133
if [ "$TRACING_ENABLE" == "true" ]; then
117134
# Create ConfigMap containing tracing config
118135
kubectl -n "$LOG_NS" delete configmap fbaz-viya-tracing --ignore-not-found
119-
kubectl -n "$LOG_NS" create configmap fbaz-viya-tracing --from-file=logging/fb/viya-tracing.conf
136+
kubectl -n "$LOG_NS" create configmap fbaz-viya-tracing --from-file=logging/fb/viya-tracing.conf
120137

121138
tracingValuesFile="logging/fb/fluent-bit_helm_values_tracing.yaml"
122-
else
139+
else
123140
# Create empty ConfigMap for tracing since it is expected to exist in main config
124141
kubectl -n "$LOG_NS" delete configmap fbaz-viya-tracing --ignore-not-found
125-
kubectl -n "$LOG_NS" create configmap fbaz-viya-tracing --from-file="$TMP_DIR"/empty.yaml
142+
kubectl -n "$LOG_NS" create configmap fbaz-viya-tracing --from-file="$TMP_DIR"/empty.yaml
126143

127-
tracingValuesFile=$TMP_DIR/empty.yaml
144+
tracingValuesFile="$TMP_DIR/empty.yaml"
128145
fi
129146

130147
# Check for Kubernetes container runtime log format info
131-
KUBERNETES_RUNTIME_LOGFMT="${KUBERNETES_RUNTIME_LOGFMT}"
148+
KUBERNETES_RUNTIME_LOGFMT="${KUBERNETES_RUNTIME_LOGFMT:-}"
132149
if [ -z "$KUBERNETES_RUNTIME_LOGFMT" ]; then
150+
# Fix SC2155: Declare and assign separately
133151
somenode=$(kubectl get nodes | awk 'NR==2 { print $1 }')
134-
runtime=$(kubectl get node $somenode -o jsonpath={.status.nodeInfo.containerRuntimeVersion} | awk -F: '{print $1}')
152+
runtime=$(kubectl get node "$somenode" -o "jsonpath={.status.nodeInfo.containerRuntimeVersion}" | awk -F: '{print $1}')
135153
log_debug "Kubernetes container runtime [$runtime] found on node [$somenode]"
136154
case $runtime in
137155
docker)
@@ -152,48 +170,48 @@ MON_NS="${MON_NS:-monitoring}"
152170
# Create ConfigMap containing Kubernetes container runtime log format
153171
kubectl -n "$LOG_NS" delete configmap fbaz-env-vars --ignore-not-found
154172
kubectl -n "$LOG_NS" create configmap fbaz-env-vars \
155-
--from-literal=KUBERNETES_RUNTIME_LOGFMT=$KUBERNETES_RUNTIME_LOGFMT \
173+
--from-literal=KUBERNETES_RUNTIME_LOGFMT="$KUBERNETES_RUNTIME_LOGFMT" \
156174
--from-literal=LOG_MULTILINE_PARSER="${LOG_MULTILINE_PARSER}" \
157175
--from-literal=MON_NS="${MON_NS}"
158176

159-
kubectl -n "$LOG_NS" label configmap fbaz-env-vars managed-by=v4m-es-script
177+
kubectl -n "$LOG_NS" label configmap fbaz-env-vars managed-by=v4m-es-script
160178

161179
# Check to see if we are upgrading from earlier version requiring root access
162-
if [ "$( kubectl -n $LOG_NS get configmap fbaz-dbmigrate-script -o name --ignore-not-found)" != "configmap/fbaz-dbmigrate-script" ]; then
180+
if [ "$(kubectl -n "$LOG_NS" get configmap fbaz-dbmigrate-script -o name --ignore-not-found)" != "configmap/fbaz-dbmigrate-script" ]; then
163181
log_debug "Removing FB pods (if they exist) to allow migration."
164182
kubectl -n "$LOG_NS" delete daemonset v4m-fbaz --ignore-not-found
165183
fi
166184

167185
# Create ConfigMap containing Fluent Bit database migration script
168186
kubectl -n "$LOG_NS" delete configmap fbaz-dbmigrate-script --ignore-not-found
169-
kubectl -n "$LOG_NS" create configmap fbaz-dbmigrate-script --from-file logging/fb/migrate_fbstate_db.sh
170-
kubectl -n "$LOG_NS" label configmap fbaz-dbmigrate-script managed-by=v4m-es-script
171-
187+
kubectl -n "$LOG_NS" create configmap fbaz-dbmigrate-script --from-file=logging/fb/migrate_fbstate_db.sh
188+
kubectl -n "$LOG_NS" label configmap fbaz-dbmigrate-script managed-by=v4m-es-script
172189

173-
## Get Helm Chart Name
174-
log_debug "Fluent Bit Helm Chart: repo [$FLUENTBIT_HELM_CHART_REPO] name [$FLUENTBIT_HELM_CHART_NAME] version [$FLUENTBIT_HELM_CHART_VERSION]"
175-
chart2install="$(get_helmchart_reference $FLUENTBIT_HELM_CHART_REPO $FLUENTBIT_HELM_CHART_NAME $FLUENTBIT_HELM_CHART_VERSION)"
176-
versionstring="$(get_helm_versionstring $FLUENTBIT_HELM_CHART_VERSION)"
177-
log_debug "Installing Helm chart from artifact [$chart2install]"
190+
## Get Helm Chart Name
191+
log_debug "Fluent Bit Helm Chart: repo [$FLUENTBIT_HELM_CHART_REPO] name [$FLUENTBIT_HELM_CHART_NAME] version [$FLUENTBIT_HELM_CHART_VERSION]"
192+
# Fix SC2155: Declare and assign separately
193+
chart2install=$(get_helmchart_reference "$FLUENTBIT_HELM_CHART_REPO" "$FLUENTBIT_HELM_CHART_NAME" "$FLUENTBIT_HELM_CHART_VERSION")
194+
versionstring=$(get_helm_versionstring "$FLUENTBIT_HELM_CHART_VERSION")
195+
log_debug "Installing Helm chart from artifact [$chart2install]"
178196

179197
# Deploy Fluent Bit via Helm chart
180-
helm $helmDebug upgrade --install v4m-fbaz --namespace $LOG_NS \
181-
$versionstring \
182-
--values $TMP_DIR/fb_imagekeysfile.yaml \
183-
--values $imageKeysFile \
198+
helm "$helmDebug" upgrade --install v4m-fbaz --namespace "$LOG_NS" \
199+
"$versionstring" \
200+
--values "$TMP_DIR/fb_imagekeysfile.yaml" \
201+
--values "$imageKeysFile" \
184202
--values logging/fb/fluent-bit_helm_values_azmonitor.yaml \
185-
--values $FB_AZMONITOR_USER_YAML \
186-
--values $tracingValuesFile \
203+
--values "$FB_AZMONITOR_USER_YAML" \
204+
--values "$tracingValuesFile" \
187205
--set fullnameOverride=v4m-fbaz \
188-
$chart2install
206+
"$chart2install"
189207

190-
#pause to allow migration script to complete (if necessary)
208+
# pause to allow migration script to complete (if necessary)
191209
sleep 20
192210

193-
#Container Security: Disable Token Automounting at ServiceAccount; enable for Pod
194-
disable_sa_token_automount $LOG_NS v4m-fbaz
211+
# Container Security: Disable Token Automounting at ServiceAccount; enable for Pod
212+
disable_sa_token_automount "$LOG_NS" v4m-fbaz
195213
# FB pods will restart after following call if automount is not already enabled
196-
enable_pod_token_automount $LOG_NS daemonset v4m-fbaz
214+
enable_pod_token_automount "$LOG_NS" daemonset v4m-fbaz
197215

198216
# Force restart of daemonset to ensure we pick up latest config changes
199217
# since Helm won't notice if the only changes are in the configMap

logging/bin/deploy_fluentbit_k8sevents_opensearch.sh

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
#! /bin/bash
1+
#!/bin/bash
22

33
# Copyright © 2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
44
# SPDX-License-Identifier: Apache-2.0
55

6-
cd "$(dirname $BASH_SOURCE)/../.."
6+
cd "$(dirname "$BASH_SOURCE")/../.." || exit 1
7+
# shellcheck source=logging/bin/common.sh
78
source logging/bin/common.sh
9+
# shellcheck source=logging/bin/secrets-include.sh
810
source logging/bin/secrets-include.sh
911

10-
this_script=`basename "$0"`
12+
this_script=$(basename "$0")
1113

1214
log_debug "Script [$this_script] has started [$(date)]"
1315

@@ -16,7 +18,7 @@ FLUENT_BIT_EVENTS_ENABLED=${FLUENT_BIT_EVENTS_ENABLED:-true}
1618

1719
if [ "$FLUENT_BIT_EVENTS_ENABLED" != "true" ]; then
1820
log_info "Environment variable [FLUENT_BIT_EVENTS_ENABLED] is not set to 'true'; exiting WITHOUT deploying Fluent Bit deployment"
19-
exit
21+
exit 0
2022
fi
2123

2224
set -e
@@ -31,7 +33,7 @@ log_info "Deploying Fluent Bit for collecting Kubernetes Events..."
3133
# Remove an existing Event Routher deployment?
3234
REMOVE_EVENTROUTER=${REMOVE_EVENTROUTER:-true}
3335
if [ "$REMOVE_EVENTROUTER" == "true" ]; then
34-
if [ "$(kubectl get deployment -n $LOG_NS -o name -l app=eventrouter 2>/dev/null)" == "" ]; then
36+
if [ "$(kubectl get deployment -n "$LOG_NS" -o name -l app=eventrouter 2>/dev/null)" == "" ]; then
3537
log_debug "No existing instance of Event Router found in namespace [$LOG_NS]."
3638
else
3739
log_debug "Removing an existing instance of Event Router found in namespace [$LOG_NS]."
@@ -42,22 +44,23 @@ fi
4244

4345
# check for pre-reqs
4446
# Confirm namespace exists
45-
if [ "$(kubectl get ns $LOG_NS -o name 2>/dev/null)" == "" ]; then
47+
if [ "$(kubectl get ns "$LOG_NS" -o name 2>/dev/null)" == "" ]; then
4648
log_error "Namespace [$LOG_NS] does NOT exist."
4749
exit 1
4850
fi
4951

5052
# get credentials
51-
if [ "$(kubectl -n $LOG_NS get secret internal-user-logcollector -o name 2>/dev/null)" == "" ]; then
53+
if [ "$(kubectl -n "$LOG_NS" get secret internal-user-logcollector -o name 2>/dev/null)" == "" ]; then
5254
export ES_LOGCOLLECTOR_PASSWD=${ES_LOGCOLLECTOR_PASSWD}
53-
create_user_secret internal-user-logcollector logcollector "$ES_LOGCOLLECTOR_PASSWD" managed-by=v4m-es-script
55+
create_user_secret internal-user-logcollector logcollector "$ES_LOGCOLLECTOR_PASSWD" managed-by=v4m-es-script
5456
else
5557
get_credentials_from_secret logcollector
5658
rc=$?
57-
if [ "$rc" != "0" ] ;then log_debug "RC=$rc"; exit $rc;fi
59+
if [ "$rc" != "0" ] ;then log_debug "RC=$rc"; exit "$rc";fi
5860
fi
5961

6062
HELM_DEBUG="${HELM_DEBUG:-false}"
63+
helmDebug=""
6164
if [ "$HELM_DEBUG" == "true" ]; then
6265
helmDebug="--debug"
6366
fi
@@ -66,7 +69,7 @@ fi
6669
helmRepoAdd fluent https://fluent.github.io/helm-charts
6770

6871
#Generate yaml file with all container-related keys
69-
generateImageKeysFile "$FB_FULL_IMAGE" "logging/fb/fb_container_image.template"
72+
generateImageKeysFile "$FB_FULL_IMAGE" "logging/fb/fb_container_image.template"
7073

7174
# Fluent Bit user customizations
7275
FB_EVENTS_USER_YAML="${FB_EVENTS_USER_YAML:-$USER_DIR/logging/user-values-fluent-bit-events.yaml}"
@@ -77,41 +80,41 @@ fi
7780

7881

7982
# Point to OpenShift response file or dummy as appropriate
83+
openshiftValuesFile="$TMP_DIR/empty.yaml"
8084
if [ "$OPENSHIFT_CLUSTER" == "true" ]; then
8185
log_info "Deploying Fluent Bit on OpenShift cluster"
8286
openshiftValuesFile="logging/openshift/values-fluent-bit-events.yaml"
8387
else
8488
log_debug "Fluent Bit is NOT being deployed on OpenShift cluster"
85-
openshiftValuesFile="$TMP_DIR/empty.yaml"
8689
fi
8790

8891

8992
## Get Helm Chart Name
9093
log_debug "Fluent Bit Helm Chart: repo [$FLUENTBIT_HELM_CHART_REPO] name [$FLUENTBIT_HELM_CHART_NAME] version [$FLUENTBIT_HELM_CHART_VERSION]"
91-
chart2install="$(get_helmchart_reference $FLUENTBIT_HELM_CHART_REPO $FLUENTBIT_HELM_CHART_NAME $FLUENTBIT_HELM_CHART_VERSION)"
92-
versionstring="$(get_helm_versionstring $FLUENTBIT_HELM_CHART_VERSION)"
94+
chart2install="$(get_helmchart_reference "$FLUENTBIT_HELM_CHART_REPO" "$FLUENTBIT_HELM_CHART_NAME" "$FLUENTBIT_HELM_CHART_VERSION")"
95+
versionstring="$(get_helm_versionstring "$FLUENTBIT_HELM_CHART_VERSION")"
9396

9497
log_debug "Installing Helm chart from artifact [$chart2install]"
9598

9699
# Deploy Fluent Bit via Helm chart
97-
helm $helmDebug upgrade --install --namespace $LOG_NS v4m-fb-events \
98-
$versionstring \
99-
--values $imageKeysFile \
100-
--values logging/fb/fluent-bit_helm_values_events.yaml \
101-
--values $openshiftValuesFile \
102-
--values $FB_EVENTS_USER_YAML \
100+
#shellcheck disable=SC2154
101+
#imagekeysfile is generated in generateImageKeysFile
102+
helm $helmDebug upgrade --install --namespace "$LOG_NS" v4m-fb-events \
103+
"$versionstring" \
104+
--values "$imageKeysFile" \
105+
--values logging/fb/fluent-bit_helm_values_events.yaml \
106+
--values "$openshiftValuesFile" \
107+
--values "$FB_EVENTS_USER_YAML" \
103108
--set fullnameOverride=v4m-fb-events \
104-
$chart2install
109+
"$chart2install"
105110

106111
#Container Security: Disable Token Automounting at ServiceAccount; enable for Pod
107-
disable_sa_token_automount $LOG_NS v4m-fb-events
108-
enable_pod_token_automount $LOG_NS deployment v4m-fb-events
112+
disable_sa_token_automount "$LOG_NS" v4m-fb-events
113+
enable_pod_token_automount "$LOG_NS" deployment v4m-fb-events
109114

110-
kubectl -n $LOG_NS scale deployment v4m-fb-events --replicas 1
115+
kubectl -n "$LOG_NS" scale deployment v4m-fb-events --replicas 1
111116

112117
log_info "Fluent Bit deployment completed"
113118

114-
115119
log_debug "Script [$this_script] has completed [$(date)]"
116120
echo ""
117-

0 commit comments

Comments
 (0)