fixed yaml block so it renders (#17259)

This commit is contained in:
Jim Angel
2019-10-29 16:26:53 -05:00
committed by Kubernetes Prow Robot
parent de84e18d3c
commit 647b4cd39d
@@ -184,21 +184,21 @@ the webhooks. There are three steps to complete the configuration.
(yes, the same schema that's used by kubectl), so the field name is (yes, the same schema that's used by kubectl), so the field name is
`kubeConfigFile`. Here is an example admission control configuration file: `kubeConfigFile`. Here is an example admission control configuration file:
```yaml ```yaml
apiVersion: apiserver.k8s.io/v1alpha1 apiVersion: apiserver.k8s.io/v1alpha1
kind: AdmissionConfiguration kind: AdmissionConfiguration
plugins: plugins:
- name: ValidatingAdmissionWebhook - name: ValidatingAdmissionWebhook
configuration: configuration:
apiVersion: apiserver.config.k8s.io/v1alpha1 apiVersion: apiserver.config.k8s.io/v1alpha1
kind: WebhookAdmission kind: WebhookAdmission
kubeConfigFile: "<path-to-kubeconfig-file>" kubeConfigFile: "<path-to-kubeconfig-file>"
- name: MutatingAdmissionWebhook - name: MutatingAdmissionWebhook
configuration: configuration:
apiVersion: apiserver.config.k8s.io/v1alpha1 apiVersion: apiserver.config.k8s.io/v1alpha1
kind: WebhookAdmission kind: WebhookAdmission
kubeConfigFile: "<path-to-kubeconfig-file>" kubeConfigFile: "<path-to-kubeconfig-file>"
``` ```
The schema of `admissionConfiguration` is defined The schema of `admissionConfiguration` is defined
[here](https://github.com/kubernetes/kubernetes/blob/v1.13.0/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1/types.go#L27). [here](https://github.com/kubernetes/kubernetes/blob/v1.13.0/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1/types.go#L27).
@@ -206,51 +206,51 @@ See the [webhook configuration](#webhook-configuration) section for details abou
* In the kubeConfig file, provide the credentials: * In the kubeConfig file, provide the credentials:
```yaml ```yaml
apiVersion: v1 apiVersion: v1
kind: Config kind: Config
users: users:
# name should be set to the DNS name of the service or the host (including port) of the URL the webhook is configured to speak to. # name should be set to the DNS name of the service or the host (including port) of the URL the webhook is configured to speak to.
# If a non-443 port is used for services, it must be included in the name when configuring 1.16+ API servers. # If a non-443 port is used for services, it must be included in the name when configuring 1.16+ API servers.
# #
# For a webhook configured to speak to a service on the default port (443), specify the DNS name of the service: # For a webhook configured to speak to a service on the default port (443), specify the DNS name of the service:
# - name: webhook1.ns1.svc # - name: webhook1.ns1.svc
# user: ... # user: ...
# #
# For a webhook configured to speak to a service on non-default port (e.g. 8443), specify the DNS name and port of the service in 1.16+: # For a webhook configured to speak to a service on non-default port (e.g. 8443), specify the DNS name and port of the service in 1.16+:
# - name: webhook1.ns1.svc:8443 # - name: webhook1.ns1.svc:8443
# user: ... # user: ...
# and optionally create a second stanza using only the DNS name of the service for compatibility with 1.15 API servers: # and optionally create a second stanza using only the DNS name of the service for compatibility with 1.15 API servers:
# - name: webhook1.ns1.svc # - name: webhook1.ns1.svc
# user: ... # user: ...
# #
# For webhooks configured to speak to a URL, match the host (and port) specified in the webhook's URL. Examples: # For webhooks configured to speak to a URL, match the host (and port) specified in the webhook's URL. Examples:
# A webhook with `url: https://www.example.com`: # A webhook with `url: https://www.example.com`:
# - name: www.example.com # - name: www.example.com
# user: ... # user: ...
# #
# A webhook with `url: https://www.example.com:443`: # A webhook with `url: https://www.example.com:443`:
# - name: www.example.com:443 # - name: www.example.com:443
# user: ... # user: ...
# #
# A webhook with `url: https://www.example.com:8443`: # A webhook with `url: https://www.example.com:8443`:
# - name: www.example.com:8443 # - name: www.example.com:8443
# user: ... # user: ...
# #
- name: 'webhook1.ns1.svc' - name: 'webhook1.ns1.svc'
user: user:
client-certificate-data: "<pem encoded certificate>" client-certificate-data: "<pem encoded certificate>"
client-key-data: "<pem encoded key>" client-key-data: "<pem encoded key>"
# The `name` supports using * to wildcard-match prefixing segments. # The `name` supports using * to wildcard-match prefixing segments.
- name: '*.webhook-company.org' - name: '*.webhook-company.org'
user: user:
password: "<password>" password: "<password>"
username: "<name>" username: "<name>"
# '*' is the default match. # '*' is the default match.
- name: '*' - name: '*'
user: user:
token: "<token>" token: "<token>"
``` ```
Of course you need to set up the webhook server to handle these authentications. Of course you need to set up the webhook server to handle these authentications.