Skip to content

Commit 1524f43

Browse files
committed
removed comments that arent needed
1 parent 234d475 commit 1524f43

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

logging/bin/deploy_fluentbit_azmonitor.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
cd "$(dirname "$BASH_SOURCE")/../.." || exit 1
77
source logging/bin/common.sh
88

9-
# Fix SC2155: Declare and assign separately
109
this_script=$(basename "$0")
1110

1211
log_debug "Script [$this_script] has started [$(date)]"
@@ -27,11 +26,6 @@ if [ "$HELM_DEBUG" == "true" ]; then
2726
helmDebug="--debug"
2827
fi
2928

30-
# Address SC2154: Ensure variables from common.sh are available or defined
31-
# The following variables are expected to be set in common.sh:
32-
# LOG_NS, TMP_DIR, USER_DIR, FB_FULL_IMAGE, FB_INITCONTAINER_FULL_IMAGE
33-
# imageKeysFile, FLUENTBIT_HELM_CHART_REPO, FLUENTBIT_HELM_CHART_NAME, FLUENTBIT_HELM_CHART_VERSION
34-
3529
helm2ReleaseCheck "fb-$LOG_NS"
3630

3731
helmRepoAdd fluent https://fluent.github.io/helm-charts
@@ -84,7 +78,6 @@ if [ "$(kubectl -n "$LOG_NS" get secret connection-info-azmonitor -o name 2> /de
8478
fi
8579
else
8680
log_info "Obtaining connection information from existing secret [$LOG_NS/connection-info-azmonitor]"
87-
# Fix SC2155: Declare and assign separately
8881
AZMONITOR_CUSTOMER_ID=$(kubectl -n "$LOG_NS" get secret connection-info-azmonitor -o=jsonpath="{.data.customer_id}" | base64 --decode)
8982
export AZMONITOR_CUSTOMER_ID
9083
AZMONITOR_SHARED_KEY=$(kubectl -n "$LOG_NS" get secret connection-info-azmonitor -o=jsonpath="{.data.shared_key}" | base64 --decode)
@@ -96,7 +89,6 @@ if helm3ReleaseExists fbaz "$LOG_NS"; then
9689
log_info "Removing an existing release of deprecated stable/fluent-bit Helm chart from from the [$LOG_NS] namespace [$(date)]"
9790
helm "$helmDebug" delete -n "$LOG_NS" fbaz
9891

99-
# Fix SC2155: Declare and assign separately
10092
num_service_monitors_v2=$(kubectl get servicemonitors -A | grep -c fluent-bit-v2 || true)
10193
if [ "$num_service_monitors_v2" -ge 1 ]; then
10294
log_debug "Updated serviceMonitor [fluent-bit-v2] appears to be deployed."
@@ -145,7 +137,6 @@ fi
145137
# Check for Kubernetes container runtime log format info
146138
KUBERNETES_RUNTIME_LOGFMT="${KUBERNETES_RUNTIME_LOGFMT:-}"
147139
if [ -z "$KUBERNETES_RUNTIME_LOGFMT" ]; then
148-
# Fix SC2155: Declare and assign separately
149140
somenode=$(kubectl get nodes | awk 'NR==2 { print $1 }')
150141
runtime=$(kubectl get node "$somenode" -o "jsonpath={.status.nodeInfo.containerRuntimeVersion}" | awk -F: '{print $1}')
151142
log_debug "Kubernetes container runtime [$runtime] found on node [$somenode]"
@@ -187,7 +178,6 @@ kubectl -n "$LOG_NS" label configmap fbaz-dbmigrate-script managed-by=v4m-es-scr
187178

188179
## Get Helm Chart Name
189180
log_debug "Fluent Bit Helm Chart: repo [$FLUENTBIT_HELM_CHART_REPO] name [$FLUENTBIT_HELM_CHART_NAME] version [$FLUENTBIT_HELM_CHART_VERSION]"
190-
# Fix SC2155: Declare and assign separately
191181
chart2install=$(get_helmchart_reference "$FLUENTBIT_HELM_CHART_REPO" "$FLUENTBIT_HELM_CHART_NAME" "$FLUENTBIT_HELM_CHART_VERSION")
192182
versionstring=$(get_helm_versionstring "$FLUENTBIT_HELM_CHART_VERSION")
193183
log_debug "Installing Helm chart from artifact [$chart2install]"

logging/bin/deploy_fluentbit_k8sevents_opensearch.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ log_debug "Installing Helm chart from artifact [$chart2install]"
9595

9696
# Deploy Fluent Bit via Helm chart
9797
#shellcheck disable=SC2154,SC2086
98-
#imagekeysfile is generated in generateImageKeysFile
9998
helm $helmDebug upgrade --install --namespace "$LOG_NS" v4m-fb-events \
10099
$versionstring \
101100
--values "$imageKeysFile" \

0 commit comments

Comments
 (0)