Skip to content

Commit

Permalink
chore: bump setup image to 3.6.0
Browse files Browse the repository at this point in the history 
This also includes a small change to field imports. Strictly speaking
our current code was incorrect, but Terraform accepted it up until 1.3.0
where they made some changed that (probably accidentally) broke it.

We are now doing this import correctly.
  • Loading branch information
Mikołaj Świątek committed Feb 16, 2023
1 parent ca05b7f commit ab38977
Show file tree
Hide file tree
Showing 18 changed files with 18 additions and 17 deletions.
1 change: 1 addition & 0 deletions .changelog/2882.changed.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chore: bump setup image to 3.6.0
2 changes: 1 addition & 1 deletion deploy/helm/sumologic/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
| `sumologic.setup.job.podLabels` | Additional labels for the setup Job pod. | `{}` |
| `sumologic.setup.job.podAnnotations` | Additional annotations for the setup Job pod. | `{}` |
| `sumologic.setup.job.image.repository` | Image repository for Sumo Logic setup job docker container. | `public.ecr.aws/sumologic/kubernetes-setup` |
| `sumologic.setup.job.image.tag` | Image tag for Sumo Logic setup job docker container. | `3.5.0` |
| `sumologic.setup.job.image.tag` | Image tag for Sumo Logic setup job docker container. | `3.6.0` |
| `sumologic.setup.job.image.pullPolicy` | Image pullPolicy for Sumo Logic docker container. | `IfNotPresent` |
| `sumologic.setup.job.nodeSelector` | Node selector for sumologic setup job. [See docs/best-practices.md for more information.](/docs/best-practices.md) | `{}` |
| `sumologic.setup.job.tolerations` | Add tolerations for the setup Job. | `[]` |
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/sumologic/conf/setup/setup.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ if should_create_fields ; then

terraform import \
-var="create_fields=1" \
sumologic_field."${FIELD}" "${FIELD_ID}"
sumologic_field."${FIELD}"[0] "${FIELD_ID}"
done
else
readonly CREATE_FIELDS=0
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/sumologic/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ sumologic:
job:
image:
repository: public.ecr.aws/sumologic/kubernetes-setup
tag: 3.5.0
tag: 3.6.0
pullPolicy: IfNotPresent
## Optionally specify an array of pullSecrets.
## They will be added to serviceaccount that is used for Sumo Logic's
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/setup/basic.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
defaultMode: 0777
containers:
- name: setup
image: public.ecr.aws/sumologic/kubernetes-setup:3.5.0
image: public.ecr.aws/sumologic/kubernetes-setup:3.6.0
imagePullPolicy: IfNotPresent
command: ["/etc/terraform/setup.sh"]
resources:
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/terraform/static/all_fields.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ data:
terraform import \
-var="create_fields=1" \
sumologic_field."${FIELD}" "${FIELD_ID}"
sumologic_field."${FIELD}"[0] "${FIELD_ID}"
done
else
readonly CREATE_FIELDS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/terraform/static/collector_fields.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ data:
terraform import \
-var="create_fields=1" \
sumologic_field."${FIELD}" "${FIELD_ID}"
sumologic_field."${FIELD}"[0] "${FIELD_ID}"
done
else
readonly CREATE_FIELDS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/terraform/static/conditional_sources.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ data:
terraform import \
-var="create_fields=1" \
sumologic_field."${FIELD}" "${FIELD_ID}"
sumologic_field."${FIELD}"[0] "${FIELD_ID}"
done
else
readonly CREATE_FIELDS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/terraform/static/custom.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ data:
terraform import \
-var="create_fields=1" \
sumologic_field."${FIELD}" "${FIELD_ID}"
sumologic_field."${FIELD}"[0] "${FIELD_ID}"
done
else
readonly CREATE_FIELDS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/terraform/static/default.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ data:
terraform import \
-var="create_fields=1" \
sumologic_field."${FIELD}" "${FIELD_ID}"
sumologic_field."${FIELD}"[0] "${FIELD_ID}"
done
else
readonly CREATE_FIELDS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/terraform/static/disable_default_metrics.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ data:
terraform import \
-var="create_fields=1" \
sumologic_field."${FIELD}" "${FIELD_ID}"
sumologic_field."${FIELD}"[0] "${FIELD_ID}"
done
else
readonly CREATE_FIELDS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/terraform/static/disabled_dashboards.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ data:
terraform import \
-var="create_fields=1" \
sumologic_field."${FIELD}" "${FIELD_ID}"
sumologic_field."${FIELD}"[0] "${FIELD_ID}"
done
else
readonly CREATE_FIELDS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/terraform/static/disabled_monitors.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ data:
terraform import \
-var="create_fields=1" \
sumologic_field."${FIELD}" "${FIELD_ID}"
sumologic_field."${FIELD}"[0] "${FIELD_ID}"
done
else
readonly CREATE_FIELDS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/terraform/static/monitors_with_email_notifications.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ data:
terraform import \
-var="create_fields=1" \
sumologic_field."${FIELD}" "${FIELD_ID}"
sumologic_field."${FIELD}"[0] "${FIELD_ID}"
done
else
readonly CREATE_FIELDS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/terraform/static/monitors_with_single_email.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ data:
terraform import \
-var="create_fields=1" \
sumologic_field."${FIELD}" "${FIELD_ID}"
sumologic_field."${FIELD}"[0] "${FIELD_ID}"
done
else
readonly CREATE_FIELDS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/terraform/static/strip_extrapolation.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ data:
terraform import \
-var="create_fields=1" \
sumologic_field."${FIELD}" "${FIELD_ID}"
sumologic_field."${FIELD}"[0] "${FIELD_ID}"
done
else
readonly CREATE_FIELDS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/terraform/static/traces.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ data:
terraform import \
-var="create_fields=1" \
sumologic_field."${FIELD}" "${FIELD_ID}"
sumologic_field."${FIELD}"[0] "${FIELD_ID}"
done
else
readonly CREATE_FIELDS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/terraform/static/tracing-metrics-disabled.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ data:
terraform import \
-var="create_fields=1" \
sumologic_field."${FIELD}" "${FIELD_ID}"
sumologic_field."${FIELD}"[0] "${FIELD_ID}"
done
else
readonly CREATE_FIELDS=0
Expand Down

0 comments on commit ab38977

Please sign in to comment.