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

Skip webhook on kube-system by default for tap-injector/jaeger-injector #11649

Merged
merged 5 commits into from
Nov 30, 2023
Merged
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
2 changes: 1 addition & 1 deletion jaeger/charts/linkerd-jaeger/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ Kubernetes: `>=1.21.0-0`
| webhook.injectCaFromSecret | string | `""` | Inject the CA bundle from a Secret. If set, the `cert-manager.io/inject-ca-from-secret` annotation will be added to the webhook. The Secret must have the CA Bundle stored in the `ca.crt` key and have the `cert-manager.io/allow-direct-injection` annotation set to `true`. See the cert-manager [CA Injector Docs](https://cert-manager.io/docs/concepts/ca-injector/#injecting-ca-data-from-a-secret-resource) for more information. |
| webhook.keyPEM | string | `""` | Certificate key for the webhook. If not provided and not using an external secret then Helm will generate one. |
| webhook.logLevel | string | `"info"` | |
| webhook.namespaceSelector | string | `nil` | |
| webhook.namespaceSelector | object | `{"matchExpressions":[{"key":"kubernetes.io/metadata.name","operator":"NotIn","values":["kube-system"]}]}` | Namespace selector used by admission webhook. |
| webhook.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | NodeSelector section, See the [K8S documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector) for more information |
| webhook.objectSelector | string | `nil` | |
| webhook.replicas | int | `1` | Number of replicas of the jaeger-injector component |
Expand Down
10 changes: 6 additions & 4 deletions jaeger/charts/linkerd-jaeger/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -284,11 +284,13 @@ webhook:
pullPolicy: ""
logLevel: info

# -- Namespace selector used by admission webhook.
namespaceSelector:
#matchExpressions:
#- key: runlevel
# operator: NotIn
# values: ["0","1"]
matchExpressions:
- key: kubernetes.io/metadata.name
operator: NotIn
values:
- kube-system
Comment on lines 288 to +293
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think adding a doc comment just above namespaceSelector (like in the linkerd-control-plane chart) will avoid bin/helm-doc generating undesired entries for each one of these entries.

objectSelector:
#matchLabels:
# foo: bar
Expand Down
10 changes: 9 additions & 1 deletion jaeger/cmd/testdata/install_collector_disabled.golden

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

11 changes: 10 additions & 1 deletion jaeger/cmd/testdata/install_default.golden

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

10 changes: 9 additions & 1 deletion jaeger/cmd/testdata/install_jaeger_disabled.golden

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

2 changes: 1 addition & 1 deletion viz/charts/linkerd-viz/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ Kubernetes: `>=1.21.0-0`
| tapInjector.keyPEM | string | `""` | Certificate key for the tapInjector. If not provided and not using an external secret then Helm will generate one. |
| tapInjector.logFormat | string | defaultLogFormat | log format of the tapInjector component |
| tapInjector.logLevel | string | defaultLogLevel | log level of the tapInjector |
| tapInjector.namespaceSelector | string | `nil` | |
| tapInjector.namespaceSelector | object | `{"matchExpressions":[{"key":"kubernetes.io/metadata.name","operator":"NotIn","values":["kube-system"]}]}` | Namespace selector used by admission webhook. |
| tapInjector.objectSelector | string | `nil` | |
| tapInjector.proxy | string | `nil` | |
| tapInjector.replicas | int | `1` | Number of replicas of tapInjector |
Expand Down
10 changes: 6 additions & 4 deletions viz/charts/linkerd-viz/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,13 @@ tapInjector:
# @default -- defaultImagePullPolicy
pullPolicy: ""

# -- Namespace selector used by admission webhook.
namespaceSelector:
# matchExpressions:
# - key: runlevel
# operator: NotIn
# values: ["0","1"]
matchExpressions:
- key: kubernetes.io/metadata.name
operator: NotIn
values:
- kube-system
objectSelector:
# matchLabels:
# foo: bar
Expand Down
9 changes: 8 additions & 1 deletion viz/cmd/testdata/install_default.golden

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

9 changes: 8 additions & 1 deletion viz/cmd/testdata/install_default_overrides.golden

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

9 changes: 8 additions & 1 deletion viz/cmd/testdata/install_prometheus_disabled.golden

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

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

9 changes: 8 additions & 1 deletion viz/cmd/testdata/install_proxy_resources.golden

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

Loading