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.

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

Feat/adding deployment annotations #1

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions charts/linkerd-control-plane/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ Kubernetes: `>=1.22.0-0`
| 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. |
| 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 |
| commonLabels | object | `{}` | Labels to apply to all resources |
| commonDeploymentAnnotations | object | `{}` | Annotations to be appended to control plane deployments |
| controlPlaneTracing | bool | `false` | enables control plane tracing |
| controlPlaneTracingNamespace | string | `"linkerd-jaeger"` | namespace to send control plane traces to |
| controller.podDisruptionBudget | object | `{"maxUnavailable":1}` | sets pod disruption budget parameter for all deployments |
Expand Down
1 change: 1 addition & 0 deletions charts/linkerd-control-plane/templates/destination.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ kind: Deployment
metadata:
annotations:
{{ include "partials.annotations.created-by" . }}
{{- with .Values.commonDeploymentAnnotations }}{{ toYaml . | trim | nindent 4 }}{{- end }}
labels:
app.kubernetes.io/name: destination
app.kubernetes.io/part-of: Linkerd
Expand Down
1 change: 1 addition & 0 deletions charts/linkerd-control-plane/templates/identity.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ kind: Deployment
metadata:
annotations:
{{ include "partials.annotations.created-by" . }}
{{- with .Values.commonDeploymentAnnotations }}{{ toYaml . | trim | nindent 4 }}{{- end }}
labels:
app.kubernetes.io/name: identity
app.kubernetes.io/part-of: Linkerd
Expand Down
1 change: 1 addition & 0 deletions charts/linkerd-control-plane/templates/proxy-injector.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ kind: Deployment
metadata:
annotations:
{{ include "partials.annotations.created-by" . }}
{{- with .Values.commonDeploymentAnnotations }}{{ toYaml . | trim | nindent 4 }}{{- end }}
labels:
app.kubernetes.io/name: proxy-injector
app.kubernetes.io/part-of: Linkerd
Expand Down
3 changes: 2 additions & 1 deletion charts/linkerd-control-plane/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ podAnnotations: {}
podLabels: {}
# -- Labels to apply to all resources
commonLabels: {}
# -- Additional annotations to add to all deployments
commonDeploymentAnnotations: {}
# -- Kubernetes priorityClassName for the Linkerd Pods
priorityClassName: ""
# -- Runtime Class Name for all the pods
Expand Down Expand Up @@ -668,4 +670,3 @@ podMonitor:
egress:
# -- The namespace that is used to store egress configuration that affects all client workloads in the cluster
globalEgressNetworkNamespace: linkerd-egress

Loading