Revert "fix for #1083 (#1086)" (#1088)

This reverts commit 324c5ba.
splunk · Feb 23, 2023 · 7bbc464 · 7bbc464
1 parent 324c5ba
commit 7bbc464
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 180 deletions.
diff --git a/helm-chart/splunk-enterprise/templates/enterprise_v4_clustermanager.yaml b/helm-chart/splunk-enterprise/templates/enterprise_v4_clustermanager.yaml
@@ -93,18 +93,6 @@ spec:
 {{- if .Values.clusterManager.readinessInitialDelaySeconds }}
   readinessInitialDelaySeconds: {{ .Values.clusterManager.readinessInitialDelaySeconds }}
 {{- end }}
-{{- if .Values.clusterManager.startupProbe }}
-  startupProbe:
-{{ toYaml .Values.clusterManager.startupProbe | indent 4 }}
-{{- end }}
-{{- if .Values.clusterManager.livenessProbe }}
-  livenessProbe:
-{{ toYaml .Values.clusterManager.livenessProbe | indent 4 }}
-{{- end }}
-{{- if .Values.clusterManager.readinessProbe }}
-  readinessProbe:
-{{ toYaml .Values.clusterManager.readinessProbe | indent 4 }}
-{{- end }}
 {{- with .Values.clusterManager.etcVolumeStorageConfig }}
   etcVolumeStorageConfig:
 {{ toYaml . | indent 4 }}

diff --git a/helm-chart/splunk-enterprise/templates/enterprise_v4_indexercluster.yaml b/helm-chart/splunk-enterprise/templates/enterprise_v4_indexercluster.yaml
@@ -102,18 +102,6 @@ items:
   {{- if $.Values.indexerCluster.readinessInitialDelaySeconds }}
     readinessInitialDelaySeconds: {{ $.Values.indexerCluster.readinessInitialDelaySeconds }}
   {{- end }}
-  {{- if $.Values.indexerCluster.startupProbe }}
-    startupProbe:
-{{ toYaml $.Values.indexerCluster.startupProbe | indent 6 }}
-  {{- end }}
-  {{- if $.Values.indexerCluster.livenessProbe }}
-    livenessProbe:
-{{ toYaml $.Values.indexerCluster.livenessProbe | indent 6 }}
-  {{- end }}
-  {{- if $.Values.indexerCluster.readinessProbe }}
-    readinessProbe:
-{{ toYaml $.Values.indexerCluster.readinessProbe | indent 6 }}
-  {{- end }}
   {{- with $.Values.indexerCluster.etcVolumeStorageConfig }}
     etcVolumeStorageConfig:
 {{ toYaml . | indent 6 }}

diff --git a/helm-chart/splunk-enterprise/templates/enterprise_v4_licensemanager.yaml b/helm-chart/splunk-enterprise/templates/enterprise_v4_licensemanager.yaml
@@ -76,18 +76,6 @@ spec:
 {{- if .Values.licenseManager.readinessInitialDelaySeconds }}
   readinessInitialDelaySeconds: {{ .Values.licenseManager.readinessInitialDelaySeconds }}
 {{- end }}
-{{- if .Values.licenseManager.startupProbe }}
-  startupProbe:
-{{ toYaml .Values.licenseManager.startupProbe | indent 4 }}
-{{- end }}
-{{- if .Values.licenseManager.livenessProbe }}
-  livenessProbe:
-{{ toYaml .Values.licenseManager.livenessProbe | indent 4 }}
-{{- end }}
-{{- if .Values.licenseManager.readinessProbe }}
-  readinessProbe:
-{{ toYaml .Values.licenseManager.readinessProbe | indent 4 }}
-{{- end }}
 {{- with .Values.licenseManager.etcVolumeStorageConfig }}
   etcVolumeStorageConfig:
 {{ toYaml . | indent 4 }}

diff --git a/helm-chart/splunk-enterprise/templates/enterprise_v4_monitoringconsole.yaml b/helm-chart/splunk-enterprise/templates/enterprise_v4_monitoringconsole.yaml
@@ -76,18 +76,6 @@ spec:
 {{- if .Values.monitoringConsole.readinessInitialDelaySeconds }}
   readinessInitialDelaySeconds: {{ .Values.monitoringConsole.readinessInitialDelaySeconds }}
 {{- end }}
-{{- if .Values.monitoringConsole.startupProbe }}
-  startupProbe:
-{{ toYaml .Values.monitoringConsole.startupProbe | indent 4 }}
-{{- end }}
-{{- if .Values.monitoringConsole.livenessProbe }}
-  livenessProbe:
-{{ toYaml .Values.monitoringConsole.livenessProbe | indent 4 }}
-{{- end }}
-{{- if .Values.monitoringConsole.readinessProbe }}
-  readinessProbe:
-{{ toYaml .Values.monitoringConsole.readinessProbe | indent 4 }}
-{{- end }}
 {{- with .Values.monitoringConsole.etcVolumeStorageConfig }}
   etcVolumeStorageConfig:
 {{ toYaml . | indent 4 }}

diff --git a/helm-chart/splunk-enterprise/templates/enterprise_v4_searchheadcluster.yaml b/helm-chart/splunk-enterprise/templates/enterprise_v4_searchheadcluster.yaml
@@ -109,18 +109,6 @@ items:
   {{- if $.Values.searchHeadCluster.readinessInitialDelaySeconds }}
     readinessInitialDelaySeconds: {{ $.Values.searchHeadCluster.readinessInitialDelaySeconds }}
   {{- end }}
-  {{- if $.Values.searchHeadCluster.startupProbe }}
-    startupProbe:
-{{ toYaml $.Values.searchHeadCluster.startupProbe | indent 6 }}
-  {{- end }}
-  {{- if $.Values.searchHeadCluster.livenessProbe }}
-    livenessProbe:
-{{ toYaml $.Values.searchHeadCluster.livenessProbe | indent 6 }}
-  {{- end }}
-  {{- if $.Values.searchHeadCluster.readinessProbe }}
-    readinessProbe:
-{{ toYaml $.Values.searchHeadCluster.readinessProbe | indent 6 }}
-  {{- end }}
   {{- with $.Values.searchHeadCluster.etcVolumeStorageConfig }}
     etcVolumeStorageConfig:
 {{ toYaml . | indent 6 }}

diff --git a/helm-chart/splunk-enterprise/templates/enterprise_v4_standalone.yaml b/helm-chart/splunk-enterprise/templates/enterprise_v4_standalone.yaml
@@ -98,18 +98,6 @@ spec:
 {{- if .Values.standalone.readinessInitialDelaySeconds }}
   readinessInitialDelaySeconds: {{ .Values.standalone.readinessInitialDelaySeconds }}
 {{- end }}
-{{- if .Values.standalone.startupProbe }}
-  startupProbe:
-{{ toYaml .Values.standalone.startupProbe | indent 4 }}
-{{- end }}
-{{- if .Values.standalone.livenessProbe }}
-  livenessProbe:
-{{ toYaml .Values.standalone.livenessProbe | indent 4 }}
-{{- end }}
-{{- if .Values.standalone.readinessProbe }}
-  readinessProbe:
-{{ toYaml .Values.standalone.readinessProbe | indent 4 }}
-{{- end }}
 {{- with .Values.standalone.etcVolumeStorageConfig }}
   etcVolumeStorageConfig:
 {{ toYaml . | indent 4 }}

diff --git a/helm-chart/splunk-enterprise/values.yaml b/helm-chart/splunk-enterprise/values.yaml
@@ -177,24 +177,6 @@ clusterManager:
   # https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-a-liveness-command
   readinessInitialDelaySeconds: 10
 
-  # Set Probes for Splunk instance pod containers
-  # reference: https://github.com/splunk/splunk-operator/blob/main/docs/HealthCheck.md
-  startupProbe: {}
-    # initialDelaySeconds: 40
-    # timeoutSeconds: 30
-    # periodSeconds: 30
-    # failureThreshold: 12
-  livenessProbe: {}
-    # initialDelaySeconds: 30
-    # timeoutSeconds: 30
-    # periodSeconds: 30
-    # failureThreshold: 3
-  readinessProbe: {}
-    # initialDelaySeconds: 10
-    # timeoutSeconds: 5
-    # periodSeconds: 5
-    # failureThreshold: 3
-
   # Storage configuration for /opt/splunk/etc volume
   # To use a StorageClass other than your default StorageClass, specify the storageClassName
   # reference: https://github.com/splunk/splunk-operator/blob/develop/docs/StorageClass.md
@@ -273,24 +255,6 @@ indexerCluster:
 
   readinessInitialDelaySeconds: 10
 
-  # Set Probes for Splunk instance pod containers
-  # reference: https://github.com/splunk/splunk-operator/blob/main/docs/HealthCheck.md
-  startupProbe: {}
-    # initialDelaySeconds: 40
-    # timeoutSeconds: 30
-    # periodSeconds: 30
-    # failureThreshold: 12
-  livenessProbe: {}
-    # initialDelaySeconds: 30
-    # timeoutSeconds: 30
-    # periodSeconds: 30
-    # failureThreshold: 3
-  readinessProbe: {}
-    # initialDelaySeconds: 10
-    # timeoutSeconds: 5
-    # periodSeconds: 5
-    # failureThreshold: 3
-
   etcVolumeStorageConfig:
     ephemeralStorage: false
     storageCapacity: 10Gi
@@ -367,24 +331,6 @@ searchHeadCluster:
 
   readinessInitialDelaySeconds: 10
 
-  # Set Probes for Splunk instance pod containers
-  # reference: https://github.com/splunk/splunk-operator/blob/main/docs/HealthCheck.md
-  startupProbe: {}
-    # initialDelaySeconds: 40
-    # timeoutSeconds: 30
-    # periodSeconds: 30
-    # failureThreshold: 12
-  livenessProbe: {}
-    # initialDelaySeconds: 30
-    # timeoutSeconds: 30
-    # periodSeconds: 30
-    # failureThreshold: 3
-  readinessProbe: {}
-    # initialDelaySeconds: 10
-    # timeoutSeconds: 5
-    # periodSeconds: 5
-    # failureThreshold: 3
-
   etcVolumeStorageConfig:
     ephemeralStorage: false
     storageCapacity: 10Gi
@@ -454,24 +400,6 @@ monitoringConsole:
 
   readinessInitialDelaySeconds: 10
 
-  # Set Probes for Splunk instance pod containers
-  # reference: https://github.com/splunk/splunk-operator/blob/main/docs/HealthCheck.md
-  startupProbe: {}
-    # initialDelaySeconds: 40
-    # timeoutSeconds: 30
-    # periodSeconds: 30
-    # failureThreshold: 12
-  livenessProbe: {}
-    # initialDelaySeconds: 30
-    # timeoutSeconds: 30
-    # periodSeconds: 30
-    # failureThreshold: 3
-  readinessProbe: {}
-    # initialDelaySeconds: 10
-    # timeoutSeconds: 5
-    # periodSeconds: 5
-    # failureThreshold: 3
-
   etcVolumeStorageConfig:
     ephemeralStorage: false
     storageCapacity: 10Gi
@@ -552,24 +480,6 @@ licenseManager:
 
   readinessInitialDelaySeconds: 10
 
-  # Set Probes for Splunk instance pod containers
-  # reference: https://github.com/splunk/splunk-operator/blob/main/docs/HealthCheck.md
-  startupProbe: {}
-    # initialDelaySeconds: 40
-    # timeoutSeconds: 30
-    # periodSeconds: 30
-    # failureThreshold: 12
-  livenessProbe: {}
-    # initialDelaySeconds: 30
-    # timeoutSeconds: 30
-    # periodSeconds: 30
-    # failureThreshold: 3
-  readinessProbe: {}
-    # initialDelaySeconds: 10
-    # timeoutSeconds: 5
-    # periodSeconds: 5
-    # failureThreshold: 3
-
   etcVolumeStorageConfig:
     ephemeralStorage: false
     storageCapacity: 10Gi
@@ -653,24 +563,6 @@ standalone:
 
   readinessInitialDelaySeconds: 10
 
-  # Set Probes for Splunk instance pod containers
-  # reference: https://github.com/splunk/splunk-operator/blob/main/docs/HealthCheck.md
-  startupProbe: {}
-    # initialDelaySeconds: 40
-    # timeoutSeconds: 30
-    # periodSeconds: 30
-    # failureThreshold: 12
-  livenessProbe: {}
-    # initialDelaySeconds: 30
-    # timeoutSeconds: 30
-    # periodSeconds: 30
-    # failureThreshold: 3
-  readinessProbe: {}
-    # initialDelaySeconds: 10
-    # timeoutSeconds: 5
-    # periodSeconds: 5
-    # failureThreshold: 3
-
   etcVolumeStorageConfig:
     ephemeralStorage: false
     storageCapacity: 10Gi