From 9bd7209424975ae499804b40f18eeef5fe0aa556 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com> Date: Mon, 1 Jul 2024 12:21:01 +0200 Subject: [PATCH] chore: update Sumo Logic Kubernetes Setup to v3.15.1 (#3793) * chore: update Sumo Logic Kubernetes Setup to v3.15.1 Signed-off-by: Dominik Rosiek * chore: changelog Signed-off-by: Dominik Rosiek * chore: update Sumo Logic Kubernetes Setup to v3.15.1 Signed-off-by: Dominik Rosiek * chore: update Sumo Logic Kubernetes Setup to v3.15.1 Signed-off-by: Dominik Rosiek --------- Signed-off-by: Dominik Rosiek (cherry picked from commit 3c7e1e68d07fc5080b1fc9bdb31124f48005daf2) --- deploy/helm/sumologic/README.md | 2 +- .../goldenfile/cleanup/basic.output.yaml | 70 ++++++++++++++++ .../sumologic-mock-no-secret.output.yaml | 70 ++++++++++++++++ .../cleanup/sumologic-mock.output.yaml | 70 ++++++++++++++++ ...itors_with_email_notifications.output.yaml | 83 +++++++++++++++++++ .../monitors_with_single_email.output.yaml | 83 +++++++++++++++++++ .../sumologic-mock-no-secret.output.yaml | 80 ++++++++++++++++++ .../setup/sumologic-mock.output.yaml | 80 ++++++++++++++++++ 8 files changed, 537 insertions(+), 1 deletion(-) create mode 100644 tests/helm/testdata/goldenfile/cleanup/basic.output.yaml create mode 100644 tests/helm/testdata/goldenfile/cleanup/sumologic-mock-no-secret.output.yaml create mode 100644 tests/helm/testdata/goldenfile/cleanup/sumologic-mock.output.yaml create mode 100644 tests/helm/testdata/goldenfile/setup/monitors_with_email_notifications.output.yaml create mode 100644 tests/helm/testdata/goldenfile/setup/monitors_with_single_email.output.yaml create mode 100644 tests/helm/testdata/goldenfile/setup/sumologic-mock-no-secret.output.yaml create mode 100644 tests/helm/testdata/goldenfile/setup/sumologic-mock.output.yaml diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md index 5d5d905ef..2abbaa546 100644 --- a/deploy/helm/sumologic/README.md +++ b/deploy/helm/sumologic/README.md @@ -175,7 +175,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.15.1` | +| `sumologic.setup.job.image.tag` | Image tag for Sumo Logic setup job docker container. | `3.14.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. | `[]` | diff --git a/tests/helm/testdata/goldenfile/cleanup/basic.output.yaml b/tests/helm/testdata/goldenfile/cleanup/basic.output.yaml new file mode 100644 index 000000000..39f4f1520 --- /dev/null +++ b/tests/helm/testdata/goldenfile/cleanup/basic.output.yaml @@ -0,0 +1,70 @@ +--- +# Source: sumologic/templates/cleanup/job.yaml +apiVersion: batch/v1 +kind: Job +metadata: + name: RELEASE-NAME-sumologic-cleanup + namespace: sumologic + annotations: + helm.sh/hook: pre-delete + helm.sh/hook-weight: "3" + helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded + labels: + app: RELEASE-NAME-sumologic-cleanup + chart: "sumologic-%CURRENT_CHART_VERSION%" + release: "RELEASE-NAME" + heritage: "Helm" +spec: + ttlSecondsAfterFinished: 120 + template: + metadata: + annotations: + labels: + spec: + restartPolicy: OnFailure + serviceAccountName: RELEASE-NAME-sumologic-cleanup + volumes: + - name: configmap + configMap: + name: RELEASE-NAME-sumologic-cleanup + defaultMode: 0777 + - name: cleanup + emptyDir: {} + initContainers: + - name: copy-files + image: public.ecr.aws/sumologic/busybox:latest + command: ["sh", "-c", "cp /configmap/* /etc/terraform"] + volumeMounts: + - name: configmap + mountPath: /configmap + - name: cleanup + mountPath: /etc/terraform + containers: + - name: cleanup + image: public.ecr.aws/sumologic/kubernetes-setup:3.15.1 + imagePullPolicy: IfNotPresent + volumeMounts: + - name: cleanup + mountPath: /etc/terraform + command: ["/etc/terraform/cleanup.sh"] + envFrom: + - secretRef: + name: RELEASE-NAME-sumologic-cleanup + env: + - name: NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: SUMOLOGIC_BASE_URL + value: + - name: SUMOLOGIC_COLLECTOR_NAME + value: kubernetes + - name: CHART_VERSION + value: "%CURRENT_CHART_VERSION%" + - name: SUMOLOGIC_SECRET_NAME + value: "sumologic" + + - name: NO_PROXY + value: kubernetes.default.svc + securityContext: + runAsUser: 1000 diff --git a/tests/helm/testdata/goldenfile/cleanup/sumologic-mock-no-secret.output.yaml b/tests/helm/testdata/goldenfile/cleanup/sumologic-mock-no-secret.output.yaml new file mode 100644 index 000000000..872c28f2b --- /dev/null +++ b/tests/helm/testdata/goldenfile/cleanup/sumologic-mock-no-secret.output.yaml @@ -0,0 +1,70 @@ +--- +# Source: sumologic/templates/cleanup/job.yaml +apiVersion: batch/v1 +kind: Job +metadata: + name: RELEASE-NAME-sumologic-cleanup + namespace: sumologic + annotations: + helm.sh/hook: pre-delete + helm.sh/hook-weight: "3" + helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded + labels: + app: RELEASE-NAME-sumologic-cleanup + chart: "sumologic-%CURRENT_CHART_VERSION%" + release: "RELEASE-NAME" + heritage: "Helm" +spec: + ttlSecondsAfterFinished: 120 + template: + metadata: + annotations: + labels: + spec: + restartPolicy: OnFailure + serviceAccountName: RELEASE-NAME-sumologic-cleanup + volumes: + - name: configmap + configMap: + name: RELEASE-NAME-sumologic-cleanup + defaultMode: 0777 + - name: cleanup + emptyDir: {} + initContainers: + - name: copy-files + image: public.ecr.aws/sumologic/busybox:latest + command: ["sh", "-c", "cp /configmap/* /etc/terraform"] + volumeMounts: + - name: configmap + mountPath: /configmap + - name: cleanup + mountPath: /etc/terraform + containers: + - name: cleanup + image: public.ecr.aws/sumologic/kubernetes-setup:3.15.1 + imagePullPolicy: IfNotPresent + volumeMounts: + - name: cleanup + mountPath: /etc/terraform + command: ["/etc/terraform/cleanup.sh"] + envFrom: + - secretRef: + name: RELEASE-NAME-sumologic-cleanup + 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 + value: kubernetes + - name: CHART_VERSION + value: "%CURRENT_CHART_VERSION%" + - name: SUMOLOGIC_SECRET_NAME + value: "sumologic" + + - name: NO_PROXY + value: kubernetes.default.svc + securityContext: + runAsUser: 1000 diff --git a/tests/helm/testdata/goldenfile/cleanup/sumologic-mock.output.yaml b/tests/helm/testdata/goldenfile/cleanup/sumologic-mock.output.yaml new file mode 100644 index 000000000..e54124b33 --- /dev/null +++ b/tests/helm/testdata/goldenfile/cleanup/sumologic-mock.output.yaml @@ -0,0 +1,70 @@ +--- +# Source: sumologic/templates/cleanup/job.yaml +apiVersion: batch/v1 +kind: Job +metadata: + name: RELEASE-NAME-sumologic-cleanup + namespace: sumologic + annotations: + helm.sh/hook: pre-delete + helm.sh/hook-weight: "3" + helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded + labels: + app: RELEASE-NAME-sumologic-cleanup + chart: "sumologic-%CURRENT_CHART_VERSION%" + release: "RELEASE-NAME" + heritage: "Helm" +spec: + ttlSecondsAfterFinished: 120 + template: + metadata: + annotations: + labels: + spec: + restartPolicy: OnFailure + serviceAccountName: RELEASE-NAME-sumologic-cleanup + volumes: + - name: configmap + configMap: + name: RELEASE-NAME-sumologic-cleanup + defaultMode: 0777 + - name: cleanup + emptyDir: {} + initContainers: + - name: copy-files + image: myrepo:mytag + command: ["sh", "-c", "cp /configmap/* /etc/terraform"] + volumeMounts: + - name: configmap + mountPath: /configmap + - name: cleanup + mountPath: /etc/terraform + containers: + - name: cleanup + image: public.ecr.aws/sumologic/kubernetes-setup:3.15.1 + imagePullPolicy: IfNotPresent + volumeMounts: + - name: cleanup + mountPath: /etc/terraform + command: ["/etc/terraform/cleanup.sh"] + envFrom: + - secretRef: + name: RELEASE-NAME-sumologic-cleanup + 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 + value: kubernetes + - name: CHART_VERSION + value: "%CURRENT_CHART_VERSION%" + - name: SUMOLOGIC_SECRET_NAME + value: "sumologic" + + - name: NO_PROXY + value: kubernetes.default.svc + securityContext: + runAsUser: 1000 diff --git a/tests/helm/testdata/goldenfile/setup/monitors_with_email_notifications.output.yaml b/tests/helm/testdata/goldenfile/setup/monitors_with_email_notifications.output.yaml new file mode 100644 index 000000000..a74f846af --- /dev/null +++ b/tests/helm/testdata/goldenfile/setup/monitors_with_email_notifications.output.yaml @@ -0,0 +1,83 @@ +--- +# Source: sumologic/templates/setup/job.yaml +apiVersion: batch/v1 +kind: Job +metadata: + name: RELEASE-NAME-sumologic-setup + namespace: sumologic + annotations: + helm.sh/hook: pre-install,pre-upgrade + helm.sh/hook-weight: "3" + helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded + labels: + app: RELEASE-NAME-sumologic + chart: "sumologic-%CURRENT_CHART_VERSION%" + release: "RELEASE-NAME" + heritage: "Helm" +spec: + ttlSecondsAfterFinished: 120 + template: + metadata: + annotations: + labels: + spec: + restartPolicy: OnFailure + serviceAccountName: RELEASE-NAME-sumologic-setup + nodeSelector: + kubernetes.io/os: linux + volumes: + - name: setup + configMap: + name: RELEASE-NAME-sumologic-setup + defaultMode: 0777 + - name: custom + configMap: + name: RELEASE-NAME-sumologic-setup-custom + defaultMode: 0777 + containers: + - name: setup + image: public.ecr.aws/sumologic/kubernetes-setup:3.15.1 + imagePullPolicy: IfNotPresent + command: ["/etc/terraform/setup.sh"] + resources: + limits: + cpu: 2000m + memory: 256Mi + requests: + cpu: 200m + memory: 64Mi + volumeMounts: + - name: setup + mountPath: /etc/terraform + - name: custom + mountPath: /customer-scripts + envFrom: + - secretRef: + name: RELEASE-NAME-sumologic-setup + env: + - name: NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: SUMOLOGIC_BASE_URL + value: + - name: SUMOLOGIC_COLLECTOR_NAME + value: kubernetes + - name: SUMOLOGIC_SECRET_NAME + value: "sumologic" + - name: CHART_VERSION + value: "%CURRENT_CHART_VERSION%" + - name: SUMOLOGIC_MONITORS_ENABLED + value: "true" + - name: SUMOLOGIC_MONITORS_STATUS + value: "enabled" + - name: SUMOLOGIC_MONITORS_NOTIFICATIONS_RECIPIENTS + value: | + ["test@test.lh","email@locahost.lh"] + - name: SUMOLOGIC_DASHBOARDS_ENABLED + value: "true" + + - name: NO_PROXY + value: kubernetes.default.svc + securityContext: + runAsUser: 1000 diff --git a/tests/helm/testdata/goldenfile/setup/monitors_with_single_email.output.yaml b/tests/helm/testdata/goldenfile/setup/monitors_with_single_email.output.yaml new file mode 100644 index 000000000..03ee27dca --- /dev/null +++ b/tests/helm/testdata/goldenfile/setup/monitors_with_single_email.output.yaml @@ -0,0 +1,83 @@ +--- +# Source: sumologic/templates/setup/job.yaml +apiVersion: batch/v1 +kind: Job +metadata: + name: RELEASE-NAME-sumologic-setup + namespace: sumologic + annotations: + helm.sh/hook: pre-install,pre-upgrade + helm.sh/hook-weight: "3" + helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded + labels: + app: RELEASE-NAME-sumologic + chart: "sumologic-%CURRENT_CHART_VERSION%" + release: "RELEASE-NAME" + heritage: "Helm" +spec: + ttlSecondsAfterFinished: 120 + template: + metadata: + annotations: + labels: + spec: + restartPolicy: OnFailure + serviceAccountName: RELEASE-NAME-sumologic-setup + nodeSelector: + kubernetes.io/os: linux + volumes: + - name: setup + configMap: + name: RELEASE-NAME-sumologic-setup + defaultMode: 0777 + - name: custom + configMap: + name: RELEASE-NAME-sumologic-setup-custom + defaultMode: 0777 + containers: + - name: setup + image: public.ecr.aws/sumologic/kubernetes-setup:3.15.1 + imagePullPolicy: IfNotPresent + command: ["/etc/terraform/setup.sh"] + resources: + limits: + cpu: 2000m + memory: 256Mi + requests: + cpu: 200m + memory: 64Mi + volumeMounts: + - name: setup + mountPath: /etc/terraform + - name: custom + mountPath: /customer-scripts + envFrom: + - secretRef: + name: RELEASE-NAME-sumologic-setup + env: + - name: NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: SUMOLOGIC_BASE_URL + value: + - name: SUMOLOGIC_COLLECTOR_NAME + value: kubernetes + - name: SUMOLOGIC_SECRET_NAME + value: "sumologic" + - name: CHART_VERSION + value: "%CURRENT_CHART_VERSION%" + - name: SUMOLOGIC_MONITORS_ENABLED + value: "true" + - name: SUMOLOGIC_MONITORS_STATUS + value: "enabled" + - name: SUMOLOGIC_MONITORS_NOTIFICATIONS_RECIPIENTS + value: | + ["email@locahost.lh"] + - name: SUMOLOGIC_DASHBOARDS_ENABLED + value: "true" + + - name: NO_PROXY + value: kubernetes.default.svc + securityContext: + runAsUser: 1000 diff --git a/tests/helm/testdata/goldenfile/setup/sumologic-mock-no-secret.output.yaml b/tests/helm/testdata/goldenfile/setup/sumologic-mock-no-secret.output.yaml new file mode 100644 index 000000000..9249f0e93 --- /dev/null +++ b/tests/helm/testdata/goldenfile/setup/sumologic-mock-no-secret.output.yaml @@ -0,0 +1,80 @@ +--- +# Source: sumologic/templates/setup/job.yaml +apiVersion: batch/v1 +kind: Job +metadata: + name: RELEASE-NAME-sumologic-setup + namespace: sumologic + annotations: + helm.sh/hook: pre-install,pre-upgrade + helm.sh/hook-weight: "3" + helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded + labels: + app: RELEASE-NAME-sumologic + chart: "sumologic-%CURRENT_CHART_VERSION%" + release: "RELEASE-NAME" + heritage: "Helm" +spec: + ttlSecondsAfterFinished: 120 + template: + metadata: + annotations: + labels: + spec: + restartPolicy: OnFailure + serviceAccountName: RELEASE-NAME-sumologic-setup + nodeSelector: + kubernetes.io/os: linux + volumes: + - name: setup + configMap: + name: RELEASE-NAME-sumologic-setup + defaultMode: 0777 + - name: custom + configMap: + name: RELEASE-NAME-sumologic-setup-custom + defaultMode: 0777 + containers: + - name: setup + image: public.ecr.aws/sumologic/kubernetes-setup:3.15.1 + imagePullPolicy: IfNotPresent + command: ["/etc/terraform/setup.sh"] + resources: + limits: + cpu: 2000m + memory: 256Mi + requests: + cpu: 200m + memory: 64Mi + volumeMounts: + - name: setup + mountPath: /etc/terraform + - name: custom + mountPath: /customer-scripts + envFrom: + - 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 + value: kubernetes + - name: SUMOLOGIC_SECRET_NAME + value: "sumologic" + - name: CHART_VERSION + value: "%CURRENT_CHART_VERSION%" + - name: SUMOLOGIC_MONITORS_ENABLED + value: "true" + - name: SUMOLOGIC_MONITORS_STATUS + value: "enabled" + - name: SUMOLOGIC_DASHBOARDS_ENABLED + value: "true" + + - name: NO_PROXY + value: kubernetes.default.svc + securityContext: + runAsUser: 1000 diff --git a/tests/helm/testdata/goldenfile/setup/sumologic-mock.output.yaml b/tests/helm/testdata/goldenfile/setup/sumologic-mock.output.yaml new file mode 100644 index 000000000..9249f0e93 --- /dev/null +++ b/tests/helm/testdata/goldenfile/setup/sumologic-mock.output.yaml @@ -0,0 +1,80 @@ +--- +# Source: sumologic/templates/setup/job.yaml +apiVersion: batch/v1 +kind: Job +metadata: + name: RELEASE-NAME-sumologic-setup + namespace: sumologic + annotations: + helm.sh/hook: pre-install,pre-upgrade + helm.sh/hook-weight: "3" + helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded + labels: + app: RELEASE-NAME-sumologic + chart: "sumologic-%CURRENT_CHART_VERSION%" + release: "RELEASE-NAME" + heritage: "Helm" +spec: + ttlSecondsAfterFinished: 120 + template: + metadata: + annotations: + labels: + spec: + restartPolicy: OnFailure + serviceAccountName: RELEASE-NAME-sumologic-setup + nodeSelector: + kubernetes.io/os: linux + volumes: + - name: setup + configMap: + name: RELEASE-NAME-sumologic-setup + defaultMode: 0777 + - name: custom + configMap: + name: RELEASE-NAME-sumologic-setup-custom + defaultMode: 0777 + containers: + - name: setup + image: public.ecr.aws/sumologic/kubernetes-setup:3.15.1 + imagePullPolicy: IfNotPresent + command: ["/etc/terraform/setup.sh"] + resources: + limits: + cpu: 2000m + memory: 256Mi + requests: + cpu: 200m + memory: 64Mi + volumeMounts: + - name: setup + mountPath: /etc/terraform + - name: custom + mountPath: /customer-scripts + envFrom: + - 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 + value: kubernetes + - name: SUMOLOGIC_SECRET_NAME + value: "sumologic" + - name: CHART_VERSION + value: "%CURRENT_CHART_VERSION%" + - name: SUMOLOGIC_MONITORS_ENABLED + value: "true" + - name: SUMOLOGIC_MONITORS_STATUS + value: "enabled" + - name: SUMOLOGIC_DASHBOARDS_ENABLED + value: "true" + + - name: NO_PROXY + value: kubernetes.default.svc + securityContext: + runAsUser: 1000