Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename statefulset configs to avoid breaking change #387

Merged
merged 1 commit into from
Jan 31, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions deploy/helm/sumologic/templates/events-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ spec:
{{- include "sumologic.labels.common" . | nindent 8 }}
spec:
serviceAccountName: {{ template "sumologic.fullname" . }}
{{- if .Values.eventsStatefulset.nodeSelector }}
{{- if .Values.eventsDeployment.nodeSelector }}
nodeSelector:
{{ toYaml .Values.eventsStatefulset.nodeSelector | indent 8 }}
{{ toYaml .Values.eventsDeployment.nodeSelector | indent 8 }}
{{- end }}
{{- if .Values.eventsStatefulset.tolerations }}
{{- if .Values.eventsDeployment.tolerations }}
tolerations:
{{ toYaml .Values.eventsStatefulset.tolerations | indent 8 }}
{{ toYaml .Values.eventsDeployment.tolerations | indent 8 }}
{{- end }}
volumes:
- name: pos-files
Expand All @@ -40,7 +40,7 @@ spec:
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
resources:
{{- toYaml .Values.eventsStatefulset.resources | nindent 10 }}
{{- toYaml .Values.eventsDeployment.resources | nindent 10 }}
volumeMounts:
- name: config-volume
mountPath: /fluentd/etc/
Expand Down
12 changes: 6 additions & 6 deletions deploy/helm/sumologic/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ spec:
selector:
matchLabels:
app: {{ template "sumologic.labels.app" . }}
replicas: {{ .Values.statefulset.replicaCount }}
replicas: {{ .Values.deployment.replicaCount }}
template:
metadata:
labels:
app: {{ template "sumologic.labels.app" . }}
{{- include "sumologic.labels.common" . | nindent 8 }}
spec:
serviceAccountName: {{ template "sumologic.fullname" . }}
{{- if .Values.statefulset.nodeSelector }}
{{- if .Values.deployment.nodeSelector }}
nodeSelector:
{{ toYaml .Values.statefulset.nodeSelector | indent 8 }}
{{ toYaml .Values.deployment.nodeSelector | indent 8 }}
{{- end }}
{{- if .Values.statefulset.tolerations }}
{{- if .Values.deployment.tolerations }}
tolerations:
{{ toYaml .Values.statefulset.tolerations | indent 8 }}
{{ toYaml .Values.deployment.tolerations | indent 8 }}
{{- end }}
volumes:
- name: pos-files
Expand All @@ -40,7 +40,7 @@ spec:
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
resources:
{{- toYaml .Values.statefulset.resources | nindent 10 }}
{{- toYaml .Values.deployment.resources | nindent 10 }}
ports:
- name: prom-write
containerPort: 9888
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/sumologic/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ image:

nameOverride: ""

statefulset:
deployment:
nodeSelector: {}
tolerations: {}
replicaCount: 3
Expand All @@ -17,7 +17,7 @@ statefulset:
memory: 768Mi
cpu: 0.5

eventsStatefulset:
eventsDeployment:
nodeSelector: {}
tolerations: {}
resources:
Expand Down