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.

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

Fixed certificate is ignored when using own secret #810

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fixed certificate is ignored when using own secret #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...t/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/configMap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,13 +390,13 @@ data:
hec_token "#{ENV['SPLUNK_HEC_TOKEN']}"
index_key splunk_index
insecure_ssl {{ or .Values.splunk.hec.insecureSSL .Values.global.splunk.hec.insecureSSL | default false }}
{{- if or .Values.splunk.hec.clientCert .Values.global.splunk.hec.clientCert }}
{{- if or (and (eq .Values.secret.create true) (or .Values.splunk.hec.clientCert .Values.global.splunk.hec.clientCert)) (and (ne .Values.secret.create true) .Values.secret.has_client_cert) }}
client_cert /fluentd/etc/splunk/hec_client_cert
{{- end }}
{{- if or .Values.splunk.hec.clientKey .Values.global.splunk.hec.clientKey }}
{{- if or (and (eq .Values.secret.create true) (or .Values.splunk.hec.clientKey .Values.global.splunk.hec.clientKey)) (and (ne .Values.secret.create true) .Values.secret.has_client_key) }}
client_key /fluentd/etc/splunk/hec_client_key
{{- end }}
{{- if or .Values.splunk.hec.caFile .Values.global.splunk.hec.caFile }}
{{- if or (and (eq .Values.secret.create true) (or .Values.splunk.hec.caFile .Values.global.splunk.hec.caFile)) (and (ne .Values.secret.create true) .Values.secret.has_ca_file) }}
ca_file /fluentd/etc/splunk/hec_ca_file
{{- end }}
{{- else }}
Expand Down
7 changes: 7 additions & 0 deletions helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,13 @@ podSecurityPolicy:
secret:
create: true
name:
# Ignore follwoing config if create is false
# Enable it if secret has hec_client_key
has_client_key: false
# Enable it if secret has hec_client_cert
has_client_cert: false
# Enable it if secret has hec_ca_file
has_ca_file: false

# Set to true, to change the encoding of all strings to utf-8.
#
Expand Down
12 changes: 6 additions & 6 deletions ...t/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/configMap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,13 @@ data:
source ${tag}
sourcetype kube:metrics
insecure_ssl {{ or .Values.splunk.hec.insecureSSL .Values.global.splunk.hec.insecureSSL | default false }}
{{- if or .Values.splunk.hec.clientCert .Values.global.splunk.hec.clientCert }}
{{- if or (and (eq .Values.secret.create true) (or .Values.splunk.hec.clientCert .Values.global.splunk.hec.clientCert)) (and (ne .Values.secret.create true) .Values.secret.has_client_cert) }}
client_cert /fluentd/etc/splunk/hec_client_cert
{{- end }}
{{- if or .Values.splunk.hec.clientKey .Values.global.splunk.hec.clientKey }}
{{- if or (and (eq .Values.secret.create true) (or .Values.splunk.hec.clientKey .Values.global.splunk.hec.clientKey)) (and (ne .Values.secret.create true) .Values.secret.has_client_key) }}
client_key /fluentd/etc/splunk/hec_client_key
{{- end }}
{{- if or .Values.splunk.hec.caFile .Values.global.splunk.hec.caFile }}
{{- if or (and (eq .Values.secret.create true) (or .Values.splunk.hec.caFile .Values.global.splunk.hec.caFile)) (and (ne .Values.secret.create true) .Values.secret.has_ca_file) }}
ca_file /fluentd/etc/splunk/hec_ca_file
{{- end }}
app_name {{ .Chart.Name }}
Expand Down Expand Up @@ -199,13 +199,13 @@ data:
{{- end }}
</fields>
insecure_ssl {{ or .Values.splunk.hec.insecureSSL .Values.global.splunk.hec.insecureSSL | default false }}
{{- if or .Values.splunk.hec.clientCert .Values.global.splunk.hec.clientCert }}
{{- if or (and (eq .Values.secret.create true) (or .Values.splunk.hec.clientCert .Values.global.splunk.hec.clientCert)) (and (ne .Values.secret.create true) .Values.secret.has_client_cert) }}
client_cert /fluentd/etc/splunk/hec_client_cert
{{- end }}
{{- if or .Values.splunk.hec.clientKey .Values.global.splunk.hec.clientKey }}
{{- if or (and (eq .Values.secret.create true) (or .Values.splunk.hec.clientKey .Values.global.splunk.hec.clientKey)) (and (ne .Values.secret.create true) .Values.secret.has_client_key) }}
client_key /fluentd/etc/splunk/hec_client_key
{{- end }}
{{- if or .Values.splunk.hec.caFile .Values.global.splunk.hec.caFile }}
{{- if or (and (eq .Values.secret.create true) (or .Values.splunk.hec.caFile .Values.global.splunk.hec.caFile)) (and (ne .Values.secret.create true) .Values.secret.has_ca_file) }}
ca_file /fluentd/etc/splunk/hec_ca_file
{{- end }}
app_name {{ .Chart.Name }}
Expand Down
12 changes: 6 additions & 6 deletions ...for-kubernetes/charts/splunk-kubernetes-metrics/templates/configMapMetricsAggregator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,13 @@ data:
source ${tag}
sourcetype kube:metrics:agg
insecure_ssl {{ or .Values.splunk.hec.insecureSSL .Values.global.splunk.hec.insecureSSL | default false }}
{{- if or .Values.splunk.hec.clientCert .Values.global.splunk.hec.clientCert }}
{{- if or (and (eq .Values.secret.create true) (or .Values.splunk.hec.clientCert .Values.global.splunk.hec.clientCert)) (and (ne .Values.secret.create true) .Values.secret.has_client_cert) }}
client_cert /fluentd/etc/splunk/hec_client_cert
{{- end }}
{{- if or .Values.splunk.hec.clientKey .Values.global.splunk.hec.clientKey }}
{{- if or (and (eq .Values.secret.create true) (or .Values.splunk.hec.clientKey .Values.global.splunk.hec.clientKey)) (and (ne .Values.secret.create true) .Values.secret.has_client_key) }}
client_key /fluentd/etc/splunk/hec_client_key
{{- end }}
{{- if or .Values.splunk.hec.caFile .Values.global.splunk.hec.caFile }}
{{- if or (and (eq .Values.secret.create true) (or .Values.splunk.hec.caFile .Values.global.splunk.hec.caFile)) (and (ne .Values.secret.create true) .Values.secret.has_ca_file) }}
ca_file /fluentd/etc/splunk/hec_ca_file
{{- end }}
app_name {{ .Chart.Name }}
Expand Down Expand Up @@ -191,13 +191,13 @@ data:
{{- end }}
</fields>
insecure_ssl {{ or .Values.splunk.hec.insecureSSL .Values.global.splunk.hec.insecureSSL | default false }}
{{- if or .Values.splunk.hec.clientCert .Values.global.splunk.hec.clientCert }}
{{- if or (and (eq .Values.secret.create true) (or .Values.splunk.hec.clientCert .Values.global.splunk.hec.clientCert)) (and (ne .Values.secret.create true) .Values.secret.has_client_cert) }}
client_cert /fluentd/etc/splunk/hec_client_cert
{{- end }}
{{- if or .Values.splunk.hec.clientKey .Values.global.splunk.hec.clientKey }}
{{- if or (and (eq .Values.secret.create true) (or .Values.splunk.hec.clientKey .Values.global.splunk.hec.clientKey)) (and (ne .Values.secret.create true) .Values.secret.has_client_key) }}
client_key /fluentd/etc/splunk/hec_client_key
{{- end }}
{{- if or .Values.splunk.hec.caFile .Values.global.splunk.hec.caFile }}
{{- if or (and (eq .Values.secret.create true) (or .Values.splunk.hec.caFile .Values.global.splunk.hec.caFile)) (and (ne .Values.secret.create true) .Values.secret.has_ca_file) }}
ca_file /fluentd/etc/splunk/hec_ca_file
{{- end }}
app_name {{ .Chart.Name }}
Expand Down
7 changes: 7 additions & 0 deletions helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,13 @@ splunk:
secret:
create: true
name:
# Ignore follwoing config if create is false
# Enable it if secret has hec_client_key
has_client_key: false
# Enable it if secret has hec_client_cert
has_client_cert: false
# Enable it if secret has hec_ca_file
has_ca_file: false

# Defines which version of image to use, and how it should be pulled.
image:
Expand Down
6 changes: 3 additions & 3 deletions ...t/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/templates/configMap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,13 @@ data:
{{- end }}
{{- end }}
insecure_ssl {{ or .Values.splunk.hec.insecureSSL .Values.global.splunk.hec.insecureSSL }}
{{- if or .Values.splunk.hec.clientCert .Values.global.splunk.hec.clientCert }}
{{- if or (and (eq .Values.secret.create true) (or .Values.splunk.hec.clientCert .Values.global.splunk.hec.clientCert)) (and (ne .Values.secret.create true) .Values.secret.has_client_cert) }}
client_cert /fluentd/etc/splunk/hec_client_cert
{{- end }}
{{- if or .Values.splunk.hec.clientKey .Values.global.splunk.hec.clientKey }}
{{- if or (and (eq .Values.secret.create true) (or .Values.splunk.hec.clientKey .Values.global.splunk.hec.clientKey)) (and (ne .Values.secret.create true) .Values.secret.has_client_key) }}
client_key /fluentd/etc/splunk/hec_client_key
{{- end }}
{{- if or .Values.splunk.hec.caFile .Values.global.splunk.hec.caFile }}
{{- if or (and (eq .Values.secret.create true) (or .Values.splunk.hec.caFile .Values.global.splunk.hec.caFile)) (and (ne .Values.secret.create true) .Values.secret.has_ca_file) }}
ca_file /fluentd/etc/splunk/hec_ca_file
{{- end }}
<fields>
Expand Down
7 changes: 7 additions & 0 deletions helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,13 @@ splunk:
secret:
create: true
name:
# Ignore follwoing config if create is false
# Enable it if secret has hec_client_key
has_client_key: false
# Enable it if secret has hec_client_cert
has_client_cert: false
# Enable it if secret has hec_ca_file
has_ca_file: false

# Defines which version of image to use, and how it should be pulled.
image:
Expand Down
21 changes: 21 additions & 0 deletions helm-chart/splunk-connect-for-kubernetes/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,13 @@ splunk-kubernetes-logging:
secret:
create: true
name:
# Ignore follwoing config if create is false
# Enable it if secret has hec_client_key
has_client_key: false
# Enable it if secret has hec_client_cert
has_client_cert: false
# Enable it if secret has hec_ca_file
has_ca_file: false

# Directory where to read journald logs (docker daemon logs, kubelet logs, and any other specified service logs).
# Journald will use `/var/log/journal` automagically if the directory exists. For example on OpenShift this
Expand Down Expand Up @@ -772,6 +779,13 @@ splunk-kubernetes-objects:
secret:
create: true
name:
# Ignore follwoing config if create is false
# Enable it if secret has hec_client_key
has_client_key: false
# Enable it if secret has hec_client_cert
has_client_cert: false
# Enable it if secret has hec_ca_file
has_ca_file: false

# Defines which version of image to use, and how it should be pulled.
image:
Expand Down Expand Up @@ -983,6 +997,13 @@ splunk-kubernetes-metrics:
secret:
create: true
name:
# Ignore follwoing config if create is false
# Enable it if secret has hec_client_key
has_client_key: false
# Enable it if secret has hec_client_cert
has_client_cert: false
# Enable it if secret has hec_ca_file
has_ca_file: false

# Defines which version of image to use, and how it should be pulled.
image:
Expand Down