Skip to content

Commit

Permalink
chore: Backport Kubernetes setup upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
rnishtala-sumo committed Jul 25, 2024
1 parent 8e1632b commit e6069c2
Show file tree
Hide file tree
Showing 10 changed files with 539 additions and 2 deletions.
1 change: 1 addition & 0 deletions .changelog/3793.changed.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chore: update Sumo Logic Kubernetes Setup to v3.15.1
2 changes: 1 addition & 1 deletion deploy/helm/sumologic/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ sumologic:
job:
image:
repository: public.ecr.aws/sumologic/kubernetes-setup
tag: 3.14.0
tag: 3.15.1
pullPolicy: IfNotPresent
## Optionally specify an array of pullSecrets.
## They will be added to serviceaccount that is used for Sumo Logic's
Expand Down
70 changes: 70 additions & 0 deletions tests/helm/testdata/goldenfile/cleanup/basic.output.yaml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
70 changes: 70 additions & 0 deletions tests/helm/testdata/goldenfile/cleanup/sumologic-mock.output.yaml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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 protected]","[email protected]"]
- name: SUMOLOGIC_DASHBOARDS_ENABLED
value: "true"

- name: NO_PROXY
value: kubernetes.default.svc
securityContext:
runAsUser: 1000
Original file line number Diff line number Diff line change
@@ -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 protected]"]
- name: SUMOLOGIC_DASHBOARDS_ENABLED
value: "true"

- name: NO_PROXY
value: kubernetes.default.svc
securityContext:
runAsUser: 1000
Loading

0 comments on commit e6069c2

Please sign in to comment.