Skip to content

Commit fb24220

Browse files
committed
feat: add commonDeploymentAnnotations for control plane deployments
Signed off by: Gustavo Vera Heredia<[email protected]> Signed-off-by: Gustavo Vera Heredia <[email protected]>
1 parent 3a87588 commit fb24220

File tree

5 files changed

+6
-1
lines changed

5 files changed

+6
-1
lines changed

charts/linkerd-control-plane/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ Kubernetes: `>=1.22.0-0`
144144
| clusterNetworks | string | `"10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16,fd00::/8"` | The cluster networks for which service discovery is performed. This should include the pod and service networks, but need not include the node network. By default, all IPv4 private networks and all accepted IPv6 ULAs are specified so that resolution works in typical Kubernetes environments. |
145145
| cniEnabled | bool | `false` | enabling this omits the NET_ADMIN capability in the PSP and the proxy-init container when injecting the proxy; requires the linkerd-cni plugin to already be installed |
146146
| commonLabels | object | `{}` | Labels to apply to all resources |
147+
| commonDeploymentAnnotations | object | `{}` | Annotations to be appended to control plane deployments |
147148
| controlPlaneTracing | bool | `false` | enables control plane tracing |
148149
| controlPlaneTracingNamespace | string | `"linkerd-jaeger"` | namespace to send control plane traces to |
149150
| controller.podDisruptionBudget | object | `{"maxUnavailable":1}` | sets pod disruption budget parameter for all deployments |

charts/linkerd-control-plane/templates/destination.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ kind: Deployment
136136
metadata:
137137
annotations:
138138
{{ include "partials.annotations.created-by" . }}
139+
{{- with .Values.commonDeploymentAnnotations }}{{ toYaml . | trim | nindent 4 }}{{- end }}
139140
labels:
140141
app.kubernetes.io/name: destination
141142
app.kubernetes.io/part-of: Linkerd

charts/linkerd-control-plane/templates/identity.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ kind: Deployment
110110
metadata:
111111
annotations:
112112
{{ include "partials.annotations.created-by" . }}
113+
{{- with .Values.commonDeploymentAnnotations }}{{ toYaml . | trim | nindent 4 }}{{- end }}
113114
labels:
114115
app.kubernetes.io/name: identity
115116
app.kubernetes.io/part-of: Linkerd

charts/linkerd-control-plane/templates/proxy-injector.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ kind: Deployment
1717
metadata:
1818
annotations:
1919
{{ include "partials.annotations.created-by" . }}
20+
{{- with .Values.commonDeploymentAnnotations }}{{ toYaml . | trim | nindent 4 }}{{- end }}
2021
labels:
2122
app.kubernetes.io/name: proxy-injector
2223
app.kubernetes.io/part-of: Linkerd

charts/linkerd-control-plane/values.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ podAnnotations: {}
7373
podLabels: {}
7474
# -- Labels to apply to all resources
7575
commonLabels: {}
76+
# -- Additional annotations to add to all deployments
77+
commonDeploymentAnnotations: {}
7678
# -- Kubernetes priorityClassName for the Linkerd Pods
7779
priorityClassName: ""
7880
# -- Runtime Class Name for all the pods
@@ -668,4 +670,3 @@ podMonitor:
668670
egress:
669671
# -- The namespace that is used to store egress configuration that affects all client workloads in the cluster
670672
globalEgressNetworkNamespace: linkerd-egress
671-

0 commit comments

Comments
 (0)