doc(otelcloudwatch): Correct the name of the EFS access points

SumoLogic · Jul 6, 2023 · 4ee2602 · 4ee2602
1 parent 2c23592
commit 4ee2602
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/.changelog/3099.fixed.txt b/.changelog/3099.fixed.txt
@@ -0,0 +1,2 @@
+fix(otelcloudwatch): Fixing PVC name for the cloudwatch logs collector
+docs(otelcloudwatch): Correcting the name for EFS Access points
diff --git a/deploy/helm/sumologic/templates/_helpers/_logs.tpl b/deploy/helm/sumologic/templates/_helpers/_logs.tpl
@@ -229,8 +229,7 @@ Return the exporters for kubelet log pipeline.
 {{- end -}}
 
 {{- define "sumologic.labels.app.logs.cloudwatch.pvc" -}}
-{{- $namespace := printf "%s" ( include "sumologic.namespace" .  ) | quote -}}
-{{- printf "file-storage-%s-sumologic-otelcol-logs-0" $namespace -}}
+{{- printf "file-storage-%s-sumologic-otelcol-logs-0" .Release.Name -}}
 {{- end -}}
 
 {{- define "sumologic.labels.app.logs.pod" -}}

diff --git a/docs/fargate.md b/docs/fargate.md
@@ -198,15 +198,15 @@ for (( counter=0; counter<"${LOG_PODS}"; counter++ )); do
     aws efs describe-access-points \
       --region "${AWS_REGION}" |
     jq ".AccessPoints[] |
-      select(.RootDirectory.Path == \"/sumologic/file-storage-${HELM_INSTALLATION_NAME}-sumologic-otelcol-log-${counter}\") |
+      select(.RootDirectory.Path == \"/sumologic/file-storage-${HELM_INSTALLATION_NAME}-sumologic-otelcol-logs-${counter}\") |
       .AccessPointId" \
       --raw-output)"
 
   if [[ -z "${FSAP_ID}" ]]; then
     aws efs create-access-point \
         --file-system-id "${EFS_ID}" \
         --posix-user Uid=1000,Gid=1000 \
-        --root-directory "Path=/${NAMESPACE}/file-storage-${HELM_INSTALLATION_NAME}-sumologic-otelcol-log-${counter},CreationInfo={OwnerUid=1000,OwnerGid=1000,Permissions=777}" \
+        --root-directory "Path=/${NAMESPACE}/file-storage-${HELM_INSTALLATION_NAME}-sumologic-otelcol-logs-${counter},CreationInfo={OwnerUid=1000,OwnerGid=1000,Permissions=777}" \
         --region "${AWS_REGION}"
   fi
 done

diff --git a/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml
@@ -36,7 +36,7 @@ spec:
           name: otelcol-config
         - name: file-storage
           persistentVolumeClaim:
-            claimName: file-storage-sumo-sumologic-otelcol-logs-0
+            claimName: file-storage-RELEASE-NAME-sumologic-otelcol-logs-0
       securityContext:
         fsGroup: 999
       containers:

diff --git a/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/custom.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/custom.output.yaml
@@ -36,7 +36,7 @@ spec:
           name: otelcol-config
         - name: file-storage
           persistentVolumeClaim:
-            claimName: file-storage-sumo-sumologic-otelcol-logs-0
+            claimName: file-storage-RELEASE-NAME-sumologic-otelcol-logs-0
       securityContext:
         fsGroup: 999
       containers: