Skip to content

[draft] Add pvs.yaml template and remove empty lines from values.yaml #1512

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.

Sign up for GitHub

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

Closed
patrykw-splunk wants to merge 3 commits into from
Closed

[draft] Add pvs.yaml template and remove empty lines from values.yaml #1512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd34a23
Add pvs.yaml template and remove empty lines from values.yaml
May 21, 2025
10352d0
fix typo in pvs.yaml
May 21, 2025
89387c3
Fix values.yaml
May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 45 additions & 45 deletions helm-chart/splunk-enterprise/templates/enterprise_v4_clustermanager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{{- if or .Values.clusterManager.enabled ( and (not $.Values.existingClusterManager) ( or .Values.sva.c3.enabled .Values.sva.m4.enabled ) )}}
{{- if or .Values.customResources.clusterManager.enabled ( and (not $.Values.existingClusterManager) ( or .Values.sva.c3.enabled .Values.sva.m4.enabled ) )}}
apiVersion: enterprise.splunk.com/v4
kind: ClusterManager
metadata:
name: {{ .Values.clusterManager.name }}
namespace: {{ default (include "splunk-enterprise.namespace" . ) .Values.clusterManager.namespaceOverride }}
{{- with .Values.clusterManager.additionalLabels }}
name: {{ .Values.customResources.clusterManager.name }}
namespace: {{ default (include "splunk-enterprise.namespace" . ) .Values.customResources.clusterManager.namespaceOverride }}
{{- with .Values.customResources.clusterManager.additionalLabels }}
labels:
{{ toYaml . | indent 4 }}
{{- end }}
{{- with .Values.clusterManager.additionalAnnotations }}
{{- with .Values.customResources.clusterManager.additionalAnnotations }}
annotations:
{{ toYaml . | indent 4 }}
{{- end }}
spec:
{{- with .Values.clusterManager.appRepo }}
{{- with .Values.customResources.clusterManager.appRepo }}
appRepo:
{{ toYaml . | indent 4 }}
{{- end }}
{{- with .Values.clusterManager.smartstore }}
{{- with .Values.customResources.clusterManager.smartstore }}
smartstore:
{{ toYaml . | indent 4 }}
{{- end }}
Expand All @@ -27,11 +27,11 @@ spec:
{{- if .Values.existingLicenseManager.namespace }}
namespace: {{ .Values.existingLicenseManager.namespace }}
{{- end }}
{{- else if .Values.licenseManager.enabled }}
{{- else if .Values.customResources.licenseManager.enabled }}
licenseManagerRef:
name: {{ .Values.licenseManager.name }}
{{- if .Values.licenseManager.namespaceOverride }}
namespace: {{ .Values.licenseManager.namespaceOverride }}
name: {{ .Values.customResources.licenseManager.name }}
{{- if .Values.customResources.licenseManager.namespaceOverride }}
namespace: {{ .Values.customResources.licenseManager.namespaceOverride }}
{{- end }}
{{- end }}
{{- if .Values.existingMonitoringConsole }}
Expand All @@ -40,11 +40,11 @@ spec:
{{- if .Values.existingMonitoringConsole.namespace }}
namespace: {{ .Values.existingMonitoringConsole.namespace }}
{{- end }}
{{- else if .Values.monitoringConsole.enabled }}
{{- else if .Values.customResources.monitoringConsole.enabled }}
monitoringConsoleRef:
name: {{ .Values.monitoringConsole.name }}
{{- if .Values.monitoringConsole.namespaceOverride }}
namespace: {{ .Values.monitoringConsole.namespaceOverride }}
name: {{ .Values.customResources.monitoringConsole.name }}
{{- if .Values.customResources.monitoringConsole.namespaceOverride }}
namespace: {{ .Values.customResources.monitoringConsole.namespaceOverride }}
{{- end }}
{{- end }}
{{- if .Values.image.repository }}
Expand All @@ -57,15 +57,15 @@ spec:
imagePullSecrets:
{{ toYaml . | indent 4 }}
{{- end }}
{{- with .Values.clusterManager.volumes }}
{{- with .Values.customResources.clusterManager.volumes }}
volumes:
{{ toYaml . | indent 4 }}
{{- end }}
{{- if .Values.clusterManager.licenseUrl }}
licenseUrl: {{ .Values.clusterManager.licenseUrl }}
{{- if .Values.customResources.clusterManager.licenseUrl }}
licenseUrl: {{ .Values.customResources.clusterManager.licenseUrl }}
{{- end }}
{{- if .Values.clusterManager.defaultsUrl }}
defaultsUrl: {{ .Values.clusterManager.defaultsUrl }}
{{- if .Values.customResources.clusterManager.defaultsUrl }}
defaultsUrl: {{ .Values.customResources.clusterManager.defaultsUrl }}
{{- end }}
{{- if .Values.sva.m4.enabled }}
defaults: |-
Expand All @@ -80,60 +80,60 @@ spec:
idxc:
search_factor: 2
replication_factor: 2
{{- else if .Values.clusterManager.defaults }}
{{- else if .Values.customResources.clusterManager.defaults }}
defaults: |-
{{ toYaml .Values.clusterManager.defaults | indent 4 }}
{{ toYaml .Values.customResources.clusterManager.defaults | indent 4 }}
{{- end }}
{{- if .Values.clusterManager.defaultsUrlApps }}
defaultsUrlApps: {{ .Values.clusterManager.defaultsUrlApps }}
{{- if .Values.customResources.clusterManager.defaultsUrlApps }}
defaultsUrlApps: {{ .Values.customResources.clusterManager.defaultsUrlApps }}
{{- end }}
{{- with .Values.clusterManager.extraEnv }}
{{- with .Values.customResources.clusterManager.extraEnv }}
extraEnv:
{{ toYaml . | indent 4 }}
{{- end }}
{{- if .Values.clusterManager.livenessInitialDelaySeconds }}
livenessInitialDelaySeconds: {{ .Values.clusterManager.livenessInitialDelaySeconds }}
{{- if .Values.customResources.clusterManager.livenessInitialDelaySeconds }}
livenessInitialDelaySeconds: {{ .Values.customResources.clusterManager.livenessInitialDelaySeconds }}
{{- end }}
{{- if .Values.clusterManager.readinessInitialDelaySeconds }}
readinessInitialDelaySeconds: {{ .Values.clusterManager.readinessInitialDelaySeconds }}
{{- if .Values.customResources.clusterManager.readinessInitialDelaySeconds }}
readinessInitialDelaySeconds: {{ .Values.customResources.clusterManager.readinessInitialDelaySeconds }}
{{- end }}
{{- if .Values.clusterManager.startupProbe }}
{{- if .Values.customResources.clusterManager.startupProbe }}
startupProbe:
{{ toYaml .Values.clusterManager.startupProbe | indent 4 }}
{{ toYaml .Values.customResources.clusterManager.startupProbe | indent 4 }}
{{- end }}
{{- if .Values.clusterManager.livenessProbe }}
{{- if .Values.customResources.clusterManager.livenessProbe }}
livenessProbe:
{{ toYaml .Values.clusterManager.livenessProbe | indent 4 }}
{{ toYaml .Values.customResources.clusterManager.livenessProbe | indent 4 }}
{{- end }}
{{- if .Values.clusterManager.readinessProbe }}
{{- if .Values.customResources.clusterManager.readinessProbe }}
readinessProbe:
{{ toYaml .Values.clusterManager.readinessProbe | indent 4 }}
{{ toYaml .Values.customResources.clusterManager.readinessProbe | indent 4 }}
{{- end }}
{{- with .Values.clusterManager.etcVolumeStorageConfig }}
{{- with .Values.customResources.clusterManager.etcVolumeStorageConfig }}
etcVolumeStorageConfig:
{{ toYaml . | indent 4 }}
{{- end }}
{{- with .Values.clusterManager.varVolumeStorageConfig }}
{{- with .Values.customResources.clusterManager.varVolumeStorageConfig }}
varVolumeStorageConfig:
{{ toYaml . | indent 4 }}
{{- end }}
{{- with .Values.clusterManager.resources }}
{{- with .Values.customResources.clusterManager.resources }}
resources:
{{ toYaml . | indent 4 }}
{{- end }}
{{- if .Values.clusterManager.serviceAccount }}
serviceAccount: {{ .Values.clusterManager.serviceAccount }}
{{- if .Values.customResources.clusterManager.serviceAccount }}
serviceAccount: {{ .Values.customResources.clusterManager.serviceAccount }}
{{- end }}
{{- with .Values.clusterManager.serviceTemplate }}
{{- with .Values.customResources.clusterManager.serviceTemplate }}
serviceTemplate:
{{ toYaml . | indent 4 }}
{{- end }}
{{- with .Values.clusterManager.tolerations }}
{{- with .Values.customResources.clusterManager.tolerations }}
tolerations:
{{ toYaml . | indent 4 }}
{{- end }}
{{- if .Values.clusterManager.topologySpreadConstraints }}
{{- with .Values.clusterManager.topologySpreadConstraints }}
{{- if .Values.customResources.clusterManager.topologySpreadConstraints }}
{{- with .Values.customResources.clusterManager.topologySpreadConstraints }}
topologySpreadConstraints:
{{ toYaml . | indent 4 }}
{{- end }}
Expand All @@ -149,7 +149,7 @@ spec:
values:
- {{ .Values.sva.m4.clusterManager.zone }}
{{- else }}
{{- with .Values.clusterManager.affinity }}
{{- with .Values.customResources.clusterManager.affinity }}
affinity:
{{ toYaml . | indent 4 }}
{{- end }}
Expand Down
98 changes: 49 additions & 49 deletions helm-chart/splunk-enterprise/templates/enterprise_v4_indexercluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if or .Values.indexerCluster.enabled .Values.sva.c3.enabled .Values.sva.m4.enabled }}
{{- if or .Values.customResources.indexerCluster.enabled .Values.sva.c3.enabled .Values.sva.m4.enabled }}
apiVersion: v1
kind: List
items:
Expand All @@ -8,36 +8,36 @@ items:
metadata:
{{- if or $.Values.sva.c3.enabled $.Values.sva.m4.enabled }}
name: {{ .name }}
{{- else if $.Values.indexerCluster.enabled }}
name: {{ $.Values.indexerCluster.name }}
{{- else if $.Values.customResources.indexerCluster.enabled }}
name: {{ $.Values.customResources.indexerCluster.name }}
{{- end }}
namespace: {{ default $.Release.Namespace $.Values.indexerCluster.namespaceOverride }}
{{- with $.Values.indexerCluster.additionalLabels }}
namespace: {{ default $.Release.Namespace $.Values.customResources.indexerCluster.namespaceOverride }}
{{- with $.Values.customResources.indexerCluster.additionalLabels }}
labels:
{{ toYaml . | indent 6 }}
{{- end }}
{{- with $.Values.indexerCluster.additionalAnnotations }}
{{- with $.Values.customResources.indexerCluster.additionalAnnotations }}
annotations:
{{ toYaml . | indent 6 }}
{{- end }}
spec:
{{- if $.Values.indexerCluster.serviceAccount }}
serviceAccount: {{ $.Values.indexerCluster.serviceAccount }}
{{- if $.Values.customResources.indexerCluster.serviceAccount }}
serviceAccount: {{ $.Values.customResources.indexerCluster.serviceAccount }}
{{- end }}
{{- if $.Values.indexerCluster.replicaCount }}
replicas: {{ $.Values.indexerCluster.replicaCount }}
{{- if $.Values.customResources.indexerCluster.replicaCount }}
replicas: {{ $.Values.customResources.indexerCluster.replicaCount }}
{{- end }}
{{- if $.Values.existingClusterManager }}
clusterManagerRef:
name: {{ $.Values.existingClusterManager.name }}
{{- if $.Values.existingClusterManager.namespace }}
namespace: {{ $.Values.existingClusterManager.namespace }}
{{- end }}
{{- else if or $.Values.clusterManager.enabled $.Values.sva.c3.enabled $.Values.sva.m4.enabled }}
{{- else if or $.Values.customResources.clusterManager.enabled $.Values.sva.c3.enabled $.Values.sva.m4.enabled }}
clusterManagerRef:
name: {{ $.Values.clusterManager.name }}
{{- if $.Values.clusterManager.namespaceOverride }}
namespace: {{ $.Values.clusterManager.namespaceOverride }}
name: {{ $.Values.customResources.clusterManager.name }}
{{- if $.Values.customResources.clusterManager.namespaceOverride }}
namespace: {{ $.Values.customResources.clusterManager.namespaceOverride }}
{{- end }}
{{- end }}
{{- if $.Values.existingLicenseManager }}
Expand All @@ -46,11 +46,11 @@ items:
{{- if $.Values.existingLicenseManager.namespace }}
namespace: {{ $.Values.existingLicenseManager.namespace }}
{{- end }}
{{- else if $.Values.licenseManager.enabled }}
{{- else if $.Values.customResources.licenseManager.enabled }}
licenseManagerRef:
name: {{ $.Values.licenseManager.name }}
{{- if $.Values.licenseManager.namespaceOverride }}
namespace: {{ $.Values.licenseManager.namespaceOverride }}
name: {{ $.Values.customResources.licenseManager.name }}
{{- if $.Values.customResources.licenseManager.namespaceOverride }}
namespace: {{ $.Values.customResources.licenseManager.namespaceOverride }}
{{- end }}
{{- end }}
{{- if $.Values.existingMonitoringConsole }}
Expand All @@ -59,11 +59,11 @@ items:
{{- if $.Values.existingMonitoringConsole.namespace }}
namespace: {{ $.Values.existingMonitoringConsole.namespace }}
{{- end }}
{{- else if $.Values.monitoringConsole.enabled }}
{{- else if $.Values.customResources.monitoringConsole.enabled }}
monitoringConsoleRef:
name: {{ $.Values.monitoringConsole.name }}
{{- if $.Values.monitoringConsole.namespaceOverride }}
namespace: {{ $.Values.monitoringConsole.namespaceOverride }}
name: {{ $.Values.customResources.monitoringConsole.name }}
{{- if $.Values.customResources.monitoringConsole.namespaceOverride }}
namespace: {{ $.Values.customResources.monitoringConsole.namespaceOverride }}
{{- end }}
{{- end }}
{{- if $.Values.image.repository }}
Expand All @@ -76,73 +76,73 @@ items:
imagePullSecrets:
{{ toYaml . | indent 6 }}
{{- end }}
{{- with $.Values.indexerCluster.volumes }}
{{- with $.Values.customResources.indexerCluster.volumes }}
volumes:
{{ toYaml . | indent 6 }}
{{- end }}
{{- if $.Values.indexerCluster.licenseUrl }}
licenseUrl: {{ $.Values.indexerCluster.licenseUrl }}
{{- if $.Values.customResources.indexerCluster.licenseUrl }}
licenseUrl: {{ $.Values.customResources.indexerCluster.licenseUrl }}
{{- end }}
{{- if $.Values.indexerCluster.defaultsUrl }}
defaultsUrl: {{ $.Values.indexerCluster.defaultsUrl }}
{{- if $.Values.customResources.indexerCluster.defaultsUrl }}
defaultsUrl: {{ $.Values.customResources.indexerCluster.defaultsUrl }}
{{- end }}
{{- if $.Values.sva.m4.enabled }}
{{- $cm_name := $.Values.clusterManager.name -}}
{{- $cm_name := $.Values.customResources.clusterManager.name -}}
{{- if $.Values.existingClusterManager }}
{{- $cm_name = $.Values.existingClusterManager.name -}}
{{- end }}
defaults: |-
splunk:
multisite_master: splunk-{{ $cm_name }}-cluster-manager-service
site: {{ .site }}
{{- else if $.Values.indexerCluster.defaults }}
{{- else if $.Values.customResources.indexerCluster.defaults }}
defaults: |-
{{ toYaml $.Values.indexerCluster.defaults | indent 6 }}
{{ toYaml $.Values.customResources.indexerCluster.defaults | indent 6 }}
{{- end }}
{{- with $.Values.indexerCluster.extraEnv }}
{{- with $.Values.customResources.indexerCluster.extraEnv }}
extraEnv:
{{ toYaml . | indent 6 }}
{{- end }}
{{- if $.Values.indexerCluster.livenessInitialDelaySeconds }}
livenessInitialDelaySeconds: {{ $.Values.indexerCluster.livenessInitialDelaySeconds }}
{{- if $.Values.customResources.indexerCluster.livenessInitialDelaySeconds }}
livenessInitialDelaySeconds: {{ $.Values.customResources.indexerCluster.livenessInitialDelaySeconds }}
{{- end }}
{{- if $.Values.indexerCluster.readinessInitialDelaySeconds }}
readinessInitialDelaySeconds: {{ $.Values.indexerCluster.readinessInitialDelaySeconds }}
{{- if $.Values.customResources.indexerCluster.readinessInitialDelaySeconds }}
readinessInitialDelaySeconds: {{ $.Values.customResources.indexerCluster.readinessInitialDelaySeconds }}
{{- end }}
{{- if $.Values.indexerCluster.startupProbe }}
{{- if $.Values.customResources.indexerCluster.startupProbe }}
startupProbe:
{{ toYaml $.Values.indexerCluster.startupProbe | indent 6 }}
{{ toYaml $.Values.customResources.indexerCluster.startupProbe | indent 6 }}
{{- end }}
{{- if $.Values.indexerCluster.livenessProbe }}
{{- if $.Values.customResources.indexerCluster.livenessProbe }}
livenessProbe:
{{ toYaml $.Values.indexerCluster.livenessProbe | indent 6 }}
{{ toYaml $.Values.customResources.indexerCluster.livenessProbe | indent 6 }}
{{- end }}
{{- if $.Values.indexerCluster.readinessProbe }}
{{- if $.Values.customResources.indexerCluster.readinessProbe }}
readinessProbe:
{{ toYaml $.Values.indexerCluster.readinessProbe | indent 6 }}
{{ toYaml $.Values.customResources.indexerCluster.readinessProbe | indent 6 }}
{{- end }}
{{- with $.Values.indexerCluster.etcVolumeStorageConfig }}
{{- with $.Values.customResources.indexerCluster.etcVolumeStorageConfig }}
etcVolumeStorageConfig:
{{ toYaml . | indent 6 }}
{{- end }}
{{- with $.Values.indexerCluster.varVolumeStorageConfig }}
{{- with $.Values.customResources.indexerCluster.varVolumeStorageConfig }}
varVolumeStorageConfig:
{{ toYaml . | indent 6 }}
{{- end }}
{{- with $.Values.indexerCluster.resources }}
{{- with $.Values.customResources.indexerCluster.resources }}
resources:
{{ toYaml . | indent 6 }}
{{- end }}
{{- with $.Values.indexerCluster.serviceTemplate }}
{{- with $.Values.customResources.indexerCluster.serviceTemplate }}
serviceTemplate:
{{ toYaml . | indent 6 }}
{{- end }}
{{- with $.Values.indexerCluster.tolerations }}
{{- with $.Values.customResources.indexerCluster.tolerations }}
tolerations:
{{ toYaml . | indent 6 }}
{{- end }}
{{- if $.Values.indexerCluster.topologySpreadConstraints }}
{{- with $.Values.indexerCluster.topologySpreadConstraints }}
{{- if $.Values.customResources.indexerCluster.topologySpreadConstraints }}
{{- with $.Values.customResources.indexerCluster.topologySpreadConstraints }}
topologySpreadConstraints:
{{ toYaml . | indent 6 }}
{{- end }}
Expand All @@ -158,7 +158,7 @@ items:
values:
- {{ .zone }}
{{- else }}
{{- with $.Values.indexerCluster.affinity }}
{{- with $.Values.customResources.indexerCluster.affinity }}
affinity:
{{ toYaml . | indent 6 }}
{{- end }}
Expand Down
Loading
Loading