linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant dashes from identity manifest template (#13022) 

Fixes #13021
This commit is contained in:
Alejandro Pedraza 2024-09-09 11:48:36 -05:00 committed by GitHub
parent d664cbd396
commit 6271350725
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
20 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
charts/linkerd-control-plane/templates/identity.yaml
View File

@ -4,7 +4,6 @@
### Identity Controller Service
###
{{ if and (.Values.identity.issuer) (eq .Values.identity.issuer.scheme "linkerd.io/tls") -}}
---
kind: Secret
apiVersion: v1
metadata:
@ -19,9 +18,9 @@ metadata:
data:
crt.pem: {{b64enc (required "Please provide the identity issuer certificate" .Values.identity.issuer.tls.crtPEM | trim)}}
key.pem: {{b64enc (required "Please provide the identity issue private key" .Values.identity.issuer.tls.keyPEM | trim)}}
---
{{- end}}
{{ if not (.Values.identity.externalCA) -}}
---
kind: ConfigMap
apiVersion: v1
metadata:
@ -35,8 +34,8 @@ metadata:
{{ include "partials.annotations.created-by" . }}
data:
ca-bundle.crt: |-{{.Values.identityTrustAnchorsPEM | trim | nindent 4}}
{{- end}}
---
{{- end}}
kind: Service
apiVersion: v1
metadata:
@ -76,8 +75,8 @@ spec:
- name: grpc
port: 8080
targetPort: 8080
{{- if .Values.enablePodDisruptionBudget }}
---
{{- if .Values.enablePodDisruptionBudget }}
kind: PodDisruptionBudget
apiVersion: policy/v1
metadata:
@ -94,8 +93,8 @@ spec:
selector:
matchLabels:
linkerd.io/control-plane-component: identity
{{- end }}
---
{{- end }}
{{- $tree := deepCopy . }}
{{ $_ := set $tree.Values.proxy "workloadKind" "deployment" -}}
{{ $_ := set $tree.Values.proxy "component" "linkerd-identity" -}}

1
cli/cmd/testdata/install_controlplane_tracing_output.golden generated vendored
View File

@ -805,7 +805,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata:

1
cli/cmd/testdata/install_custom_domain.golden generated vendored
View File

@ -805,7 +805,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata:

1
cli/cmd/testdata/install_custom_registry.golden generated vendored
View File

@ -805,7 +805,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata:

1
cli/cmd/testdata/install_default.golden generated vendored
View File

@ -805,7 +805,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata:

1
cli/cmd/testdata/install_default_override_dst_get_nets.golden generated vendored
View File

@ -805,7 +805,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata:

1
cli/cmd/testdata/install_default_token.golden generated vendored
View File

@ -805,7 +805,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata:

1
cli/cmd/testdata/install_gid_output.golden generated vendored
View File

@ -805,7 +805,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata:

1
cli/cmd/testdata/install_ha_output.golden generated vendored
View File

@ -841,7 +841,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata:

1
cli/cmd/testdata/install_ha_with_overrides_output.golden generated vendored
View File

@ -841,7 +841,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata:

1
cli/cmd/testdata/install_heartbeat_disabled_output.golden generated vendored
View File

@ -736,7 +736,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata:

1
cli/cmd/testdata/install_helm_control_plane_output.golden generated vendored
View File

@ -789,7 +789,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata:

1
cli/cmd/testdata/install_helm_control_plane_output_ha.golden generated vendored
View File

@ -825,7 +825,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata:

1
cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden generated vendored
View File

@ -825,7 +825,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata:

1
cli/cmd/testdata/install_helm_output_ha_labels.golden generated vendored
View File

@ -829,7 +829,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata:

1
cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden generated vendored
View File

@ -815,7 +815,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata:

1
cli/cmd/testdata/install_no_init_container.golden generated vendored
View File

@ -805,7 +805,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata:

1
cli/cmd/testdata/install_output.golden generated vendored
View File

@ -750,7 +750,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata:

1
cli/cmd/testdata/install_proxy_ignores.golden generated vendored
View File

@ -805,7 +805,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata:

1
cli/cmd/testdata/install_values_file.golden generated vendored
View File

@ -805,7 +805,6 @@ rules:
###
### Identity Controller Service
###
---
kind: Secret
apiVersion: v1
metadata: