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

Jump to bottom

helm: Correct spire labels indentation #28610

Merged
merged 1 commit into from
Oct 18, 2023
Merged

helm: Correct spire labels indentation #28610

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions install/kubernetes/cilium/templates/spire/agent/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ metadata:
{{- end }}
labels:
app: spire-agent
{{- with .Values.authentication.mutual.spire.install.server.labels }}
{{- toYaml . | nindent 8 }}
{{- with .Values.authentication.mutual.spire.install.agent.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
selector:
Expand All @@ -27,6 +27,9 @@ spec:
namespace: {{ .Values.authentication.mutual.spire.install.namespace }}
labels:
app: spire-agent
{{- with .Values.authentication.mutual.spire.install.agent.labels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
hostPID: true
hostNetwork: true
Expand Down
5 changes: 4 additions & 1 deletion install/kubernetes/cilium/templates/spire/server/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ metadata:
labels:
app: spire-server
{{- with .Values.authentication.mutual.spire.install.server.labels }}
{{- toYaml . | nindent 8 }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
replicas: 1
Expand All @@ -28,6 +28,9 @@ spec:
metadata:
labels:
app: spire-server
{{- with .Values.authentication.mutual.spire.install.server.labels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
serviceAccountName: {{ .Values.authentication.mutual.spire.install.server.serviceAccount.name }}
shareProcessNamespace: true
Expand Down
4 changes: 2 additions & 2 deletions install/kubernetes/cilium/values.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions install/kubernetes/cilium/values.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3255,9 +3255,9 @@ authentication:
create: true
name: spire-agent
# -- SPIRE agent annotations
annotations: { }
annotations: {}
# -- SPIRE agent labels
labels: { }
labels: {}
# -- SPIRE Workload Attestor kubelet verification.
skipKubeletVerification: true
# -- SPIRE agent tolerations configuration
Expand Down