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

Add optional annotations to secrets #1599

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −0
Open

Add optional annotations to secrets #1599

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
4 changes: 4 additions & 0 deletions helm-charts/splunk-otel-collector/templates/secret-etcd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ metadata:
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- if .Values.agent.controlPlaneMetrics.etcd.secret.annotations }}
annotations:
{{- toYaml .Values.agent.controlPlaneMetrics.etcd.secret.annotations | nindent 4 }}
{{- end }}
type: Opaque
data:
{{- with .Values.agent.controlPlaneMetrics.etcd.secret.clientCert }}
Expand Down
4 changes: 4 additions & 0 deletions helm-charts/splunk-otel-collector/templates/secret-splunk.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ metadata:
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- if .Values.secret.annotations }}
annotations:
{{- toYaml .Values.secret.annotations | nindent 4 }}
{{- end }}
type: Opaque
data:
{{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }}
Expand Down
6 changes: 6 additions & 0 deletions helm-charts/splunk-otel-collector/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,9 @@
},
"caFile": {
"type": "string"
},
"annotations": {
"type": "object"
}
}
},
Expand Down Expand Up @@ -1188,6 +1191,9 @@
},
"validateSecret": {
"type": "boolean"
},
"annotations": {
"type": "object"
}
}
},
Expand Down
4 changes: 4 additions & 0 deletions helm-charts/splunk-otel-collector/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,8 @@ agent:
# NOTE: The content of the file itself should be used here, not the file path.
# The file will be stored as a secret in kubernetes.
caFile: ""
# Secret annotations
annotations: {}
# Specifies whether the etcd's TLS cert will be verified. If set to false, a CA certificate must be made
# available as part of the etcd secret to verify the TLS cert with.
skipVerify: true
Expand Down Expand Up @@ -1010,6 +1012,8 @@ secret:
name: ""
# Specifies whether secret provided by user should be validated.
validateSecret: true
# Secret annotations
annotations: {}

# The tolerations for deploying the agent collector daemonset. By default, it targets control-plane, worker,
# and k8s distribution-specific nodes (infrastructure or system) to ensure logs and metrics collection from nodes.
Expand Down
Loading