chore(setup): get namespace from downward API

deploy/helm/sumologic/conf/cleanup/cleanup.sh

@@ -14,6 +14,7 @@ readonly SUMOLOGIC_COLLECTOR_NAME="${SUMOLOGIC_COLLECTOR_NAME:?}"
 # Set variables for terraform
 export TF_VAR_collector_name="${SUMOLOGIC_COLLECTOR_NAME}"
 export TF_VAR_chart_version="${CHART_VERSION:?}"
+export TF_VAR_namespace_name="${NAMESPACE:?}"
 
 cp /etc/terraform/* /terraform/
 cd /terraform || exit 1

deploy/helm/sumologic/conf/setup/setup.sh

@@ -7,6 +7,7 @@ readonly SUMOLOGIC_COLLECTOR_NAME="${SUMOLOGIC_COLLECTOR_NAME:?}"
 # Set variables for terraform
 export TF_VAR_collector_name="${SUMOLOGIC_COLLECTOR_NAME}"
 export TF_VAR_chart_version="${CHART_VERSION:?}"
+export TF_VAR_namespace_name="${NAMESPACE:?}"
 
 # Let's compare the variables ignoring the case with help of ${VARIABLE,,} which makes the string lowercased
 # so that we don't have to deal with True vs true vs TRUE

deploy/helm/sumologic/conf/setup/variables.tf

@@ -4,7 +4,6 @@ variable "collector_name" {
 
 variable "namespace_name" {
   type  = string
-  default = "{{ template "sumologic.namespace" . }}"
 }
 
 variable "create_fields" {

deploy/helm/sumologic/templates/cleanup/job.yaml

@@ -52,6 +52,10 @@ spec:
           - secretRef:
               name: {{ .Values.sumologic.envFromSecret | default (include "sumologic.metadata.name.setup.secret" .)}}
           env:
+          - name: NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
           - name: SUMOLOGIC_BASE_URL
 {{- if eq (include "sumologic-mock.local-mode-enabled" .) "true" }}
             value: http://{{ template "sumologic-mock.hostname" . }}:{{ template "sumologic-mock.port" . }}/terraform/api/

deploy/helm/sumologic/templates/setup/job.yaml

@@ -67,6 +67,10 @@ spec:
         - secretRef:
             name: {{ .Values.sumologic.envFromSecret | default (include "sumologic.metadata.name.setup.secret" .)}}
         env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
         - name: SUMOLOGIC_BASE_URL
 {{- if eq (include "sumologic-mock.local-mode-enabled" .) "true" }}
           value: http://{{ template "sumologic-mock.hostname" . }}:{{ template "sumologic-mock.port" . }}/terraform/api/

tests/helm/testdata/goldenfile/cleanup/basic.output.yaml

@@ -51,6 +51,10 @@ spec:
             - secretRef:
                 name: RELEASE-NAME-sumologic-setup
           env:
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
             - name: SUMOLOGIC_BASE_URL
               value:
             - name: SUMOLOGIC_COLLECTOR_NAME

tests/helm/testdata/goldenfile/cleanup/sumologic-mock-no-secret.output.yaml

@@ -51,6 +51,10 @@ spec:
             - secretRef:
                 name: RELEASE-NAME-sumologic-setup
           env:
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
             - name: SUMOLOGIC_BASE_URL
               value: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/terraform/api/
             - name: SUMOLOGIC_COLLECTOR_NAME

tests/helm/testdata/goldenfile/cleanup/sumologic-mock.output.yaml

@@ -51,6 +51,10 @@ spec:
             - secretRef:
                 name: RELEASE-NAME-sumologic-setup
           env:
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
             - name: SUMOLOGIC_BASE_URL
               value: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/terraform/api/
             - name: SUMOLOGIC_COLLECTOR_NAME

tests/helm/testdata/goldenfile/setup/basic.output.yaml

@@ -55,6 +55,10 @@ spec:
             - secretRef:
                 name: RELEASE-NAME-sumologic-setup
           env:
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
             - name: SUMOLOGIC_BASE_URL
               value:
             - name: SUMOLOGIC_COLLECTOR_NAME

tests/helm/testdata/goldenfile/setup/sumologic-mock-no-secret.output.yaml

@@ -55,6 +55,10 @@ spec:
             - secretRef:
                 name: RELEASE-NAME-sumologic-setup
           env:
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
             - name: SUMOLOGIC_BASE_URL
               value: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/terraform/api/
             - name: SUMOLOGIC_COLLECTOR_NAME

tests/helm/testdata/goldenfile/setup/sumologic-mock.output.yaml

@@ -55,6 +55,10 @@ spec:
             - secretRef:
                 name: RELEASE-NAME-sumologic-setup
           env:
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
             - name: SUMOLOGIC_BASE_URL
               value: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/terraform/api/
             - name: SUMOLOGIC_COLLECTOR_NAME

tests/helm/testdata/goldenfile/terraform/all_fields.output.yaml

@@ -358,6 +358,7 @@ data:
     # Set variables for terraform
     export TF_VAR_collector_name="${SUMOLOGIC_COLLECTOR_NAME}"
     export TF_VAR_chart_version="${CHART_VERSION:?}"
+    export TF_VAR_namespace_name="${NAMESPACE:?}"
 
     # Let's compare the variables ignoring the case with help of ${VARIABLE,,} which makes the string lowercased
     # so that we don't have to deal with True vs true vs TRUE
@@ -836,7 +837,6 @@ data:
 
     variable "namespace_name" {
       type  = string
-      default = "sumologic"
     }
 
     variable "create_fields" {

tests/helm/testdata/goldenfile/terraform/collector_fields.output.yaml

@@ -358,6 +358,7 @@ data:
     # Set variables for terraform
     export TF_VAR_collector_name="${SUMOLOGIC_COLLECTOR_NAME}"
     export TF_VAR_chart_version="${CHART_VERSION:?}"
+    export TF_VAR_namespace_name="${NAMESPACE:?}"
 
     # Let's compare the variables ignoring the case with help of ${VARIABLE,,} which makes the string lowercased
     # so that we don't have to deal with True vs true vs TRUE
@@ -739,7 +740,6 @@ data:
 
     variable "namespace_name" {
       type  = string
-      default = "sumologic"
     }
 
     variable "create_fields" {

tests/helm/testdata/goldenfile/terraform/conditional_sources.output.yaml

@@ -358,6 +358,7 @@ data:
     # Set variables for terraform
     export TF_VAR_collector_name="${SUMOLOGIC_COLLECTOR_NAME}"
     export TF_VAR_chart_version="${CHART_VERSION:?}"
+    export TF_VAR_namespace_name="${NAMESPACE:?}"
 
     # Let's compare the variables ignoring the case with help of ${VARIABLE,,} which makes the string lowercased
     # so that we don't have to deal with True vs true vs TRUE
@@ -535,7 +536,6 @@ data:
 
     variable "namespace_name" {
       type  = string
-      default = "sumologic"
     }
 
     variable "create_fields" {

tests/helm/testdata/goldenfile/terraform/custom.output.yaml

@@ -358,6 +358,7 @@ data:
     # Set variables for terraform
     export TF_VAR_collector_name="${SUMOLOGIC_COLLECTOR_NAME}"
     export TF_VAR_chart_version="${CHART_VERSION:?}"
+    export TF_VAR_namespace_name="${NAMESPACE:?}"
 
     # Let's compare the variables ignoring the case with help of ${VARIABLE,,} which makes the string lowercased
     # so that we don't have to deal with True vs true vs TRUE
@@ -535,7 +536,6 @@ data:
 
     variable "namespace_name" {
       type  = string
-      default = "sumologic"
     }
 
     variable "create_fields" {

tests/helm/testdata/goldenfile/terraform/default.output.yaml

@@ -358,6 +358,7 @@ data:
     # Set variables for terraform
     export TF_VAR_collector_name="${SUMOLOGIC_COLLECTOR_NAME}"
     export TF_VAR_chart_version="${CHART_VERSION:?}"
+    export TF_VAR_namespace_name="${NAMESPACE:?}"
 
     # Let's compare the variables ignoring the case with help of ${VARIABLE,,} which makes the string lowercased
     # so that we don't have to deal with True vs true vs TRUE
@@ -736,7 +737,6 @@ data:
 
     variable "namespace_name" {
       type  = string
-      default = "sumologic"
     }
 
     variable "create_fields" {

tests/helm/testdata/goldenfile/terraform/disable_default_metrics.output.yaml

@@ -358,6 +358,7 @@ data:
     # Set variables for terraform
     export TF_VAR_collector_name="${SUMOLOGIC_COLLECTOR_NAME}"
     export TF_VAR_chart_version="${CHART_VERSION:?}"
+    export TF_VAR_namespace_name="${NAMESPACE:?}"
 
     # Let's compare the variables ignoring the case with help of ${VARIABLE,,} which makes the string lowercased
     # so that we don't have to deal with True vs true vs TRUE
@@ -726,7 +727,6 @@ data:
 
     variable "namespace_name" {
       type  = string
-      default = "sumologic"
     }
 
     variable "create_fields" {

tests/helm/testdata/goldenfile/terraform/disabled_dashboards.output.yaml

@@ -358,6 +358,7 @@ data:
     # Set variables for terraform
     export TF_VAR_collector_name="${SUMOLOGIC_COLLECTOR_NAME}"
     export TF_VAR_chart_version="${CHART_VERSION:?}"
+    export TF_VAR_namespace_name="${NAMESPACE:?}"
 
     # Let's compare the variables ignoring the case with help of ${VARIABLE,,} which makes the string lowercased
     # so that we don't have to deal with True vs true vs TRUE
@@ -738,7 +739,6 @@ data:
 
     variable "namespace_name" {
       type  = string
-      default = "sumologic"
     }
 
     variable "create_fields" {

tests/helm/testdata/goldenfile/terraform/disabled_monitors.output.yaml

@@ -358,6 +358,7 @@ data:
     # Set variables for terraform
     export TF_VAR_collector_name="${SUMOLOGIC_COLLECTOR_NAME}"
     export TF_VAR_chart_version="${CHART_VERSION:?}"
+    export TF_VAR_namespace_name="${NAMESPACE:?}"
 
     # Let's compare the variables ignoring the case with help of ${VARIABLE,,} which makes the string lowercased
     # so that we don't have to deal with True vs true vs TRUE
@@ -738,7 +739,6 @@ data:
 
     variable "namespace_name" {
       type  = string
-      default = "sumologic"
     }
 
     variable "create_fields" {

tests/helm/testdata/goldenfile/terraform/logs_fields.output.yaml

@@ -358,6 +358,7 @@ data:
     # Set variables for terraform
     export TF_VAR_collector_name="${SUMOLOGIC_COLLECTOR_NAME}"
     export TF_VAR_chart_version="${CHART_VERSION:?}"
+    export TF_VAR_namespace_name="${NAMESPACE:?}"
 
     # Let's compare the variables ignoring the case with help of ${VARIABLE,,} which makes the string lowercased
     # so that we don't have to deal with True vs true vs TRUE
@@ -738,7 +739,6 @@ data:
 
     variable "namespace_name" {
       type  = string
-      default = "sumologic"
     }
 
     variable "create_fields" {

tests/helm/testdata/goldenfile/terraform/monitors_with_email_notifications.output.yaml

@@ -364,6 +364,7 @@ data:
     # Set variables for terraform
     export TF_VAR_collector_name="${SUMOLOGIC_COLLECTOR_NAME}"
     export TF_VAR_chart_version="${CHART_VERSION:?}"
+    export TF_VAR_namespace_name="${NAMESPACE:?}"
 
     # Let's compare the variables ignoring the case with help of ${VARIABLE,,} which makes the string lowercased
     # so that we don't have to deal with True vs true vs TRUE
@@ -742,7 +743,6 @@ data:
 
     variable "namespace_name" {
       type  = string
-      default = "sumologic"
     }
 
     variable "create_fields" {

tests/helm/testdata/goldenfile/terraform/monitors_with_single_email.output.yaml

@@ -364,6 +364,7 @@ data:
     # Set variables for terraform
     export TF_VAR_collector_name="${SUMOLOGIC_COLLECTOR_NAME}"
     export TF_VAR_chart_version="${CHART_VERSION:?}"
+    export TF_VAR_namespace_name="${NAMESPACE:?}"
 
     # Let's compare the variables ignoring the case with help of ${VARIABLE,,} which makes the string lowercased
     # so that we don't have to deal with True vs true vs TRUE
@@ -742,7 +743,6 @@ data:
 
     variable "namespace_name" {
       type  = string
-      default = "sumologic"
     }
 
     variable "create_fields" {

tests/helm/testdata/goldenfile/terraform/strip_extrapolation.output.yaml

@@ -359,6 +359,7 @@ data:
     # Set variables for terraform
     export TF_VAR_collector_name="${SUMOLOGIC_COLLECTOR_NAME}"
     export TF_VAR_chart_version="${CHART_VERSION:?}"
+    export TF_VAR_namespace_name="${NAMESPACE:?}"
 
     # Let's compare the variables ignoring the case with help of ${VARIABLE,,} which makes the string lowercased
     # so that we don't have to deal with True vs true vs TRUE
@@ -737,7 +738,6 @@ data:
 
     variable "namespace_name" {
       type  = string
-      default = "sumologic"
     }
 
     variable "create_fields" {

tests/helm/testdata/goldenfile/terraform/traces.output.yaml

@@ -358,6 +358,7 @@ data:
     # Set variables for terraform
     export TF_VAR_collector_name="${SUMOLOGIC_COLLECTOR_NAME}"
     export TF_VAR_chart_version="${CHART_VERSION:?}"
+    export TF_VAR_namespace_name="${NAMESPACE:?}"
 
     # Let's compare the variables ignoring the case with help of ${VARIABLE,,} which makes the string lowercased
     # so that we don't have to deal with True vs true vs TRUE
@@ -576,7 +577,6 @@ data:
 
     variable "namespace_name" {
       type  = string
-      default = "sumologic"
     }
 
     variable "create_fields" {

tests/helm/testdata/goldenfile/terraform/tracing-metrics-disabled.output.yaml

@@ -358,6 +358,7 @@ data:
     # Set variables for terraform
     export TF_VAR_collector_name="${SUMOLOGIC_COLLECTOR_NAME}"
     export TF_VAR_chart_version="${CHART_VERSION:?}"
+    export TF_VAR_namespace_name="${NAMESPACE:?}"
 
     # Let's compare the variables ignoring the case with help of ${VARIABLE,,} which makes the string lowercased
     # so that we don't have to deal with True vs true vs TRUE
@@ -736,7 +737,6 @@ data:
 
     variable "namespace_name" {
       type  = string
-      default = "sumologic"
     }
 
     variable "create_fields" {