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 missing label "linkerd.io/extension" #10821

Merged
merged 1 commit into from
May 1, 2023
Merged

Add missing label "linkerd.io/extension" #10821

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
24 changes: 12 additions & 12 deletions jaeger/charts/linkerd-jaeger/templates/namespace-metadata-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
kind: ServiceAccount
apiVersion: v1
metadata:
{{- with .Values.commonLabels }}
labels: {{ toYaml . | trim | nindent 4 }}
{{- end }}
labels:
linkerd.io/extension: jaeger
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
annotations:
{{ include "partials.annotations.created-by" . }}
"helm.sh/hook": post-install
Expand All @@ -16,9 +16,9 @@ metadata:
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
{{- with .Values.commonLabels }}
labels: {{ toYaml . | trim | nindent 4 }}
{{- end }}
labels:
linkerd.io/extension: jaeger
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
annotations:
{{ include "partials.annotations.created-by" . }}
"helm.sh/hook": post-install
Expand All @@ -35,9 +35,9 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
{{- with .Values.commonLabels }}
labels: {{ toYaml . | trim | nindent 4 }}
{{- end }}
labels:
linkerd.io/extension: jaeger
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
annotations:
{{ include "partials.annotations.created-by" . }}
"helm.sh/hook": post-install
Expand All @@ -58,9 +58,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
namespace: {{ .Values.linkerdNamespace }}
{{- with .Values.commonLabels }}
labels: {{ toYaml . | trim | nindent 4 }}
{{- end }}
labels:
linkerd.io/extension: jaeger
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
annotations:
{{ include "partials.annotations.created-by" . }}
"helm.sh/hook": post-install
Expand Down
2 changes: 2 additions & 0 deletions jaeger/charts/linkerd-jaeger/templates/namespace-metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ metadata:
"helm.sh/hook-weight": "1"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
labels:
linkerd.io/extension: jaeger
app.kubernetes.io/name: namespace-metadata
app.kubernetes.io/part-of: Linkerd
app.kubernetes.io/version: {{default .Values.linkerdVersion .Values.cliVersion}}
Expand All @@ -21,6 +22,7 @@ spec:
{{ include "partials.annotations.created-by" . }}
linkerd.io/inject: disabled
labels:
linkerd.io/extension: jaeger
app.kubernetes.io/name: namespace-metadata
app.kubernetes.io/part-of: Linkerd
app.kubernetes.io/version: {{default .Values.linkerdVersion .Values.cliVersion}}
Expand Down
23 changes: 11 additions & 12 deletions jaeger/charts/linkerd-jaeger/templates/rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ apiVersion: v1
metadata:
name: collector
namespace: {{ .Release.Namespace }}
{{- with .Values.commonLabels }}
labels: {{ toYaml . | trim | nindent 4 }}
{{- end }}
labels:
linkerd.io/extension: jaeger
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
{{- include "partials.image-pull-secrets" .Values.imagePullSecrets }}
{{ end -}}
---
Expand Down Expand Up @@ -51,10 +51,9 @@ apiVersion: v1
metadata:
name: jaeger-injector
namespace: {{ .Release.Namespace }}
{{- with .Values.commonLabels }}
labels:
{{ toYaml . | trim | indent 4 }}
{{- end }}
linkerd.io/extension: jaeger
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
{{- include "partials.image-pull-secrets" .Values.imagePullSecrets }}
---
{{- $host := printf "jaeger-injector.%s.svc" .Release.Namespace }}
Expand All @@ -65,9 +64,9 @@ apiVersion: v1
metadata:
name: jaeger-injector-k8s-tls
namespace: {{ .Release.Namespace }}
{{- with .Values.commonLabels }}
labels: {{ toYaml . | trim | nindent 4 }}
{{- end }}
labels:
linkerd.io/extension: jaeger
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
type: kubernetes.io/tls
data:
tls.crt: {{ ternary (b64enc (trim $ca.Cert)) (b64enc (trim .Values.webhook.crtPEM)) (empty .Values.webhook.crtPEM) }}
Expand Down Expand Up @@ -128,8 +127,8 @@ apiVersion: v1
metadata:
name: jaeger
namespace: {{ .Release.Namespace }}
{{- with .Values.commonLabels }}
labels: {{ toYaml . | trim | nindent 4 }}
{{- end }}
labels:
linkerd.io/extension: jaeger
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
{{- include "partials.image-pull-secrets" .Values.imagePullSecrets }}
{{ end -}}
6 changes: 5 additions & 1 deletion jaeger/cmd/testdata/install_collector_disabled.golden
View file
Open in desktop

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

8 changes: 7 additions & 1 deletion jaeger/cmd/testdata/install_default.golden
View file
Open in desktop

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

6 changes: 5 additions & 1 deletion jaeger/cmd/testdata/install_jaeger_disabled.golden
View file
Open in desktop

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

1 change: 1 addition & 0 deletions multicluster/charts/linkerd-multicluster-link/templates/gateway-mirror.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
name: probe-gateway-{{.Values.targetClusterName}}
namespace: {{ .Release.Namespace }}
labels:
linkerd.io/extension: multicluster
mirror.linkerd.io/mirrored-gateway: "true"
mirror.linkerd.io/cluster-name: {{.Values.targetClusterName}}
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
Expand Down
1 change: 1 addition & 0 deletions multicluster/charts/linkerd-multicluster-link/templates/service-mirror.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ spec:
config.alpha.linkerd.io/proxy-wait-before-exit-seconds: "0"
{{- with .Values.podAnnotations }}{{ toYaml . | trim | nindent 8 }}{{- end }}
labels:
linkerd.io/extension: multicluster
component: linkerd-service-mirror
mirror.linkerd.io/cluster-name: {{.Values.targetClusterName}}
{{- with .Values.podLabels }}{{ toYaml . | trim | nindent 8 }}{{- end }}
Expand Down
2 changes: 2 additions & 0 deletions multicluster/charts/linkerd-multicluster/templates/gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ spec:
{{- with .Values.gateway.deploymentAnnotations }}{{ toYaml . | trim | nindent 8 }}{{- end }}
labels:
app: {{.Values.gateway.name}}
linkerd.io/extension: multicluster
{{- with .Values.podLabels }}{{ toYaml . | trim | nindent 8 }}{{- end }}
spec:
{{- $_ := set $tree "component" .Values.gateway.name -}}
Expand Down Expand Up @@ -77,6 +78,7 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
app: {{.Values.gateway.name}}
linkerd.io/extension: multicluster
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
annotations:
{{ include "partials.annotations.created-by" . }}
Expand Down
24 changes: 12 additions & 12 deletions multicluster/charts/linkerd-multicluster/templates/namespace-metadata-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
kind: ServiceAccount
apiVersion: v1
metadata:
{{- with .Values.commonLabels }}
labels: {{ toYaml . | trim | nindent 4 }}
{{- end }}
labels:
linkerd.io/extension: multicluster
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
annotations:
{{ include "partials.annotations.created-by" . }}
"helm.sh/hook": post-install
Expand All @@ -15,9 +15,9 @@ metadata:
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
{{- with .Values.commonLabels }}
labels: {{ toYaml . | trim | nindent 4 }}
{{- end }}
labels:
linkerd.io/extension: multicluster
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
annotations:
{{ include "partials.annotations.created-by" . }}
"helm.sh/hook": post-install
Expand All @@ -34,9 +34,9 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
{{- with .Values.commonLabels }}
labels: {{ toYaml . | trim | nindent 4 }}
{{- end }}
labels:
linkerd.io/extension: multicluster
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
annotations:
{{ include "partials.annotations.created-by" . }}
"helm.sh/hook": post-install
Expand All @@ -57,9 +57,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
namespace: {{ .Values.linkerdNamespace }}
{{- with .Values.commonLabels }}
labels: {{ toYaml . | trim | nindent 4 }}
{{- end }}
labels:
linkerd.io/extension: multicluster
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
annotations:
{{ include "partials.annotations.created-by" . }}
"helm.sh/hook": post-install
Expand Down
2 changes: 2 additions & 0 deletions multicluster/charts/linkerd-multicluster/templates/namespace-metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ metadata:
"helm.sh/hook-weight": "1"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
labels:
linkerd.io/extension: multicluster
app.kubernetes.io/name: namespace-metadata
app.kubernetes.io/part-of: Linkerd
app.kubernetes.io/version: {{default .Values.linkerdVersion .Values.cliVersion}}
Expand All @@ -20,6 +21,7 @@ spec:
{{ include "partials.annotations.created-by" . }}
linkerd.io/inject: disabled
labels:
linkerd.io/extension: multicluster
app.kubernetes.io/name: namespace-metadata
app.kubernetes.io/part-of: Linkerd
app.kubernetes.io/version: {{default .Values.linkerdVersion .Values.cliVersion}}
Expand Down
2 changes: 2 additions & 0 deletions multicluster/charts/linkerd-multicluster/templates/service-mirror-policy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
namespace: {{ .Release.Namespace }}
name: service-mirror
labels:
linkerd.io/extension: multicluster
component: linkerd-service-mirror
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
spec:
Expand All @@ -20,6 +21,7 @@ metadata:
namespace: {{ .Release.Namespace }}
name: service-mirror
labels:
linkerd.io/extension: multicluster
component: linkerd-service-mirror
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
spec:
Expand Down
3 changes: 3 additions & 0 deletions multicluster/cmd/testdata/install_default.golden
View file
Open in desktop

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

4 changes: 4 additions & 0 deletions multicluster/cmd/testdata/install_ha.golden
View file
Open in desktop

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

Loading