Revert PV and statefulset related changes

deploy/helm/sumologic/conf/buffer.output.conf

@@ -2,5 +2,6 @@ compress gzip
 flush_interval "#{ENV['FLUSH_INTERVAL']}"
 flush_thread_count "#{ENV['NUM_THREADS']}"
 chunk_limit_size "#{ENV['CHUNK_LIMIT_SIZE']}"
+total_limit_size "#{ENV['TOTAL_LIMIT_SIZE']}"
 queued_chunks_limit_size "#{ENV['QUEUE_CHUNK_LIMIT_SIZE']}"
 overflow_action drop_oldest_chunk

deploy/helm/sumologic/conf/events/events.conf

@@ -35,12 +35,11 @@
   verify_ssl "#{ENV['VERIFY_SSL']}"
   proxy_uri "#{ENV['PROXY_URI']}"
   <buffer>
-    {{- if or .Values.sumologic.fluentd.persistence.enabled (eq .Values.sumologic.fluentd.buffer "file") }}
+    {{- if eq .Values.sumologic.fluentd.buffer "file" }}
     @type file
     path /fluentd/buffer/events
     {{- else }}
     @type memory
-    total_limit_size "#{ENV['TOTAL_LIMIT_SIZE']}"
     {{- end }}
     @include buffer.output.conf
   </buffer>

deploy/helm/sumologic/conf/logs/logs.source.containers.conf

@@ -59,12 +59,11 @@
     @id sumologic.endpoint.logs
     @include logs.output.conf
     <buffer>
-      {{- if or .Values.sumologic.fluentd.persistence.enabled (eq .Values.sumologic.fluentd.buffer "file") }}
+      {{- if eq .Values.sumologic.fluentd.buffer "file" }}
       @type file
       path /fluentd/buffer/logs.containers
       {{- else }}
       @type memory
-      total_limit_size "#{ENV['TOTAL_LIMIT_SIZE']}"
       {{- end }}
       @include buffer.output.conf
     </buffer>

deploy/helm/sumologic/conf/logs/logs.source.systemd.conf

@@ -18,12 +18,11 @@
     @id sumologic.endpoint.logs.kubelet
     @include logs.output.conf
     <buffer>
-      {{- if or .Values.sumologic.fluentd.persistence.enabled (eq .Values.sumologic.fluentd.buffer "file") }}
+      {{- if eq .Values.sumologic.fluentd.buffer "file" }}
       @type file
       path /fluentd/buffer/logs.kubelet
       {{- else }}
       @type memory
-      total_limit_size "#{ENV['TOTAL_LIMIT_SIZE']}"
       {{- end }}
       @include buffer.output.conf
     </buffer>
@@ -54,12 +53,11 @@
     @id sumologic.endpoint.logs.systemd
     @include logs.output.conf
     <buffer>
-      {{- if or .Values.sumologic.fluentd.persistence.enabled (eq .Values.sumologic.fluentd.buffer "file") }}
+      {{- if eq .Values.sumologic.fluentd.buffer "file" }}
       @type file
       path /fluentd/buffer/logs.systemd
       {{- else }}
       @type memory
-      total_limit_size "#{ENV['TOTAL_LIMIT_SIZE']}"
       {{- end }}
       @include buffer.output.conf
     </buffer>

deploy/helm/sumologic/conf/metrics/metrics.conf

@@ -26,12 +26,11 @@
     endpoint "#{ENV['SUMO_ENDPOINT_METRICS_APISERVER']}"
     @include metrics.output.conf
     <buffer>
-      {{- if or .Values.sumologic.fluentd.persistence.enabled (eq .Values.sumologic.fluentd.buffer "file") }}
+      {{- if eq .Values.sumologic.fluentd.buffer "file" }}
       @type file
       path /fluentd/buffer/metrics.apiserver
       {{- else }}
       @type memory
-      total_limit_size "#{ENV['TOTAL_LIMIT_SIZE']}"
       {{- end }}
       @include buffer.output.conf
     </buffer>
@@ -43,12 +42,11 @@
     endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBELET']}"
     @include metrics.output.conf
     <buffer>
-      {{- if or .Values.sumologic.fluentd.persistence.enabled (eq .Values.sumologic.fluentd.buffer "file") }}
+      {{- if eq .Values.sumologic.fluentd.buffer "file" }}
       @type file
       path /fluentd/buffer/metrics.kubelet
       {{- else }}
       @type memory
-      total_limit_size "#{ENV['TOTAL_LIMIT_SIZE']}"
       {{- end }}
       @include buffer.output.conf
     </buffer>
@@ -59,12 +57,11 @@
     endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBELET']}"
     @include metrics.output.conf
     <buffer>
-      {{- if or .Values.sumologic.fluentd.persistence.enabled (eq .Values.sumologic.fluentd.buffer "file") }}
+      {{- if eq .Values.sumologic.fluentd.buffer "file" }}
       @type file
       path /fluentd/buffer/metrics.container
       {{- else }}
       @type memory
-      total_limit_size "#{ENV['TOTAL_LIMIT_SIZE']}"
       {{- end }}
       @include buffer.output.conf
     </buffer>
@@ -75,12 +72,11 @@
     endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_CONTROLLER_MANAGER']}"
     @include metrics.output.conf
     <buffer>
-      {{- if or .Values.sumologic.fluentd.persistence.enabled (eq .Values.sumologic.fluentd.buffer "file") }}
+      {{- if eq .Values.sumologic.fluentd.buffer "file" }}
       @type file
       path /fluentd/buffer/metrics.controller
       {{- else }}
       @type memory
-      total_limit_size "#{ENV['TOTAL_LIMIT_SIZE']}"
       {{- end }}
       @include buffer.output.conf
     </buffer>
@@ -91,12 +87,11 @@
     endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_SCHEDULER']}"
     @include metrics.output.conf
     <buffer>
-      {{- if or .Values.sumologic.fluentd.persistence.enabled (eq .Values.sumologic.fluentd.buffer "file") }}
+      {{- if eq .Values.sumologic.fluentd.buffer "file" }}
       @type file
       path /fluentd/buffer/metrics.scheduler
       {{- else }}
       @type memory
-      total_limit_size "#{ENV['TOTAL_LIMIT_SIZE']}"
       {{- end }}
       @include buffer.output.conf
     </buffer>
@@ -107,12 +102,11 @@
     endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_STATE']}"
     @include metrics.output.conf
     <buffer>
-      {{- if or .Values.sumologic.fluentd.persistence.enabled (eq .Values.sumologic.fluentd.buffer "file") }}
+      {{- if eq .Values.sumologic.fluentd.buffer "file" }}
       @type file
       path /fluentd/buffer/metrics.state
       {{- else }}
       @type memory
-      total_limit_size "#{ENV['TOTAL_LIMIT_SIZE']}"
       {{- end }}
       @include buffer.output.conf
     </buffer>
@@ -123,12 +117,11 @@
     endpoint "#{ENV['SUMO_ENDPOINT_METRICS_NODE_EXPORTER']}"
     @include metrics.output.conf
     <buffer>
-      {{- if or .Values.sumologic.fluentd.persistence.enabled (eq .Values.sumologic.fluentd.buffer "file") }}
+      {{- if eq .Values.sumologic.fluentd.buffer "file" }}
       @type file
       path /fluentd/buffer/metrics.node
       {{- else }}
       @type memory
-      total_limit_size "#{ENV['TOTAL_LIMIT_SIZE']}"
       {{- end }}
       @include buffer.output.conf
     </buffer>
@@ -139,12 +132,11 @@
     endpoint "#{ENV['SUMO_ENDPOINT_METRICS']}"
     @include metrics.output.conf
     <buffer>
-      {{- if or .Values.sumologic.fluentd.persistence.enabled (eq .Values.sumologic.fluentd.buffer "file") }}
+      {{- if eq .Values.sumologic.fluentd.buffer "file" }}
       @type file
       path /fluentd/buffer/metrics.all
       {{- else }}
       @type memory
-      total_limit_size "#{ENV['TOTAL_LIMIT_SIZE']}"
       {{- end }}
       @include buffer.output.conf
     </buffer>

deploy/helm/sumologic/templates/statefulset.yaml → deploy/helm/sumologic/templates/deployment.yaml

@@ -1,5 +1,5 @@
 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata:
   name: {{ template "sumologic.fullname" . }}
   labels:
@@ -16,7 +16,6 @@ spec:
         app: {{ template "sumologic.labels.app" . }}
         {{- include "sumologic.labels.common" . | nindent 8 }}
     spec:
-      podManagementPolicy: "Parallel"
       serviceAccountName: {{ template "sumologic.fullname" . }}
 {{- if .Values.deployment.nodeSelector }}
       nodeSelector:
@@ -34,8 +33,6 @@ spec:
       - name: config-volume
         configMap:
           name: {{ template "sumologic.fullname" . }}
-      securityContext:
-        fsGroup: {{ .Values.sumologic.fluentd.securityContext.fsGroup }}
       containers:
       - name: fluentd
         image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
@@ -67,10 +64,6 @@ spec:
           mountPath: /fluentd/etc/
         - name: pos-files
           mountPath: /mnt/pos/
-{{- if .Values.sumologic.fluentd.persistence.enabled }}
-        - name: buffer
-          mountPath: "/fluentd/buffer"
-{{- end}}
         env:
         - name: SUMO_ENDPOINT_METRICS
           valueFrom:
@@ -163,15 +156,4 @@ spec:
         - name: EXCLUDE_HOST_REGEX
           value: {{ .Values.sumologic.excludeHostRegex | quote }}
         - name: EXCLUDE_POD_REGEX
-          value: {{ .Values.sumologic.excludePodRegex | quote }}
-{{- if .Values.sumologic.fluentd.persistence.enabled }}
-  volumeClaimTemplates:
-  - metadata:
-      name: buffer
-    spec:
-      accessModes: [{{ .Values.sumologic.fluentd.persistence.accessMode }}]
-      storageClassName: {{ .Values.sumologic.fluentd.persistence.storageClass }}
-      resources:
-        requests:
-          storage: {{ .Values.sumologic.fluentd.persistence.size }}
-{{- end }}
+          value: {{ .Values.sumologic.excludePodRegex | quote }}

deploy/helm/sumologic/templates/events-statefulset.yaml → deploy/helm/sumologic/templates/events-deployment.yaml

@@ -1,6 +1,6 @@
 {{- if eq .Values.sumologic.eventCollectionEnabled true }}
 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata:
   name: {{ printf "%s-events" (include "sumologic.fullname" .) }}
   labels:
@@ -16,7 +16,6 @@ spec:
         app: {{ printf "%s-events" (include "sumologic.labels.app" .) }}
         {{- include "sumologic.labels.common" . | nindent 8 }}
     spec:
-      podManagementPolicy: "Parallel"
       serviceAccountName: {{ template "sumologic.fullname" . }}
 {{- if .Values.eventsDeployment.nodeSelector }}
       nodeSelector:
@@ -34,8 +33,6 @@ spec:
       - name: config-volume
         configMap:
           name: {{ printf "%s-events" (include "sumologic.fullname" .) }}
-      securityContext:
-        fsGroup: {{ .Values.sumologic.fluentd.securityContext.fsGroup }}
       containers:
       - name: fluentd-events
         image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
@@ -47,10 +44,6 @@ spec:
           mountPath: /fluentd/etc/
         - name: pos-files
           mountPath: /mnt/pos/
-{{- if .Values.sumologic.fluentd.persistence.enabled }}
-        - name: buffer
-          mountPath: "/fluentd/buffer"
-{{- end}}
         livenessProbe:
           httpGet:
             path: /fluentd.pod.healthcheck?json=%7B%22log%22%3A+%22health+check%22%7D
@@ -82,15 +75,4 @@ spec:
           value: {{ .Values.sumologic.queueChunkLimitSize | quote }}
         - name: TOTAL_LIMIT_SIZE
           value: {{ .Values.sumologic.totalLimitSize | quote }}
-{{- if .Values.sumologic.fluentd.persistence.enabled }}
-  volumeClaimTemplates:
-  - metadata:
-      name: buffer
-    spec:
-      accessModes: [{{ .Values.sumologic.fluentd.persistence.accessMode }}]
-      storageClassName: {{ .Values.sumologic.fluentd.persistence.storageClass }}
-      resources:
-        requests:
-          storage: {{ .Values.sumologic.fluentd.persistence.size }}
-{{- end }}
-{{- end }}
+{{- end }}

deploy/helm/sumologic/values.yaml

@@ -179,25 +179,6 @@ sumologic:
       maxReplicas: 10
       targetCPUUtilizationPercentage: 50
 
-    securityContext:
-      ## The group ID of all processes in the statefulset containers. By default this needs to be fluent(999).
-      fsGroup: 999
-
-    ## Persist data to a persistent volume; When enabled, fluentd uses the file buffer instead of memory buffer.
-    persistence:
-      enabled: false
-
-      ## If defined, storageClassName: <storageClass>
-      ## If set to "-", storageClassName: "", which disables dynamic provisioning
-      ## If undefined (the default) or set to null, no storageClassName spec is
-      ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-      ##   GKE, Azure & OpenStack)
-      ##
-      # storageClass: "-"
-      # annotations: {}
-      accessMode: ReadWriteOnce
-      size: 10Gi
-
   k8sMetadataFilter:
     ## Option to control the enabling of metadata filter plugin watch.
     ## ref: https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter#configuration