diff --git a/pkg/kubelet/apis/config/types.go b/pkg/kubelet/apis/config/types.go index f2af378477f..5b90858d99f 100644 --- a/pkg/kubelet/apis/config/types.go +++ b/pkg/kubelet/apis/config/types.go @@ -340,9 +340,10 @@ type KubeletConfiguration struct { ContainerLogMaxFiles int32 // ConfigMapAndSecretChangeDetectionStrategy is a mode in which config map and secret managers are running. ConfigMapAndSecretChangeDetectionStrategy ResourceChangeDetectionStrategy - // A comma separated allowlist of unsafe sysctls or sysctl patterns (ending in *). - // Unsafe sysctl groups are kernel.shm*, kernel.msg*, kernel.sem, fs.mqueue.*, and net.*. - // These sysctls are namespaced but not allowed by default. For example: "kernel.msg*,net.ipv4.route.min_pmtu" + // A comma separated allowlist of unsafe sysctls or sysctl patterns (ending in `*`). + // Unsafe sysctl groups are `kernel.shm*`, `kernel.msg*`, `kernel.sem`, `fs.mqueue.*`, and `net.*`. + // These sysctls are namespaced but not allowed by default. + // For example: "`kernel.msg*,net.ipv4.route.min_pmtu`" // +optional AllowedUnsafeSysctls []string // kernelMemcgNotification if enabled, the kubelet will integrate with the kernel memcg @@ -554,9 +555,9 @@ type CredentialProvider struct { // // Each entry in matchImages is a pattern which can optionally contain a port and a path. // Globs can be used in the domain, but not in the port or the path. Globs are supported - // as subdomains like '*.k8s.io' or 'k8s.*.io', and top-level-domains such as 'k8s.*'. - // Matching partial subdomains like 'app*.k8s.io' is also supported. Each glob can only match - // a single subdomain segment, so *.io does not match *.k8s.io. + // as subdomains like `*.k8s.io` or `k8s.*.io`, and top-level-domains such as `k8s.*`. + // Matching partial subdomains like `app*.k8s.io` is also supported. Each glob can only match + // a single subdomain segment, so `*.io` does not match *.k8s.io. // // A match exists between an image and a matchImage when all of the below are true: // - Both contain the same number of domain parts and each part matches. @@ -564,11 +565,11 @@ type CredentialProvider struct { // - If the imageMatch contains a port, then the port must match in the image as well. // // Example values of matchImages: - // - 123456789.dkr.ecr.us-east-1.amazonaws.com - // - *.azurecr.io - // - gcr.io - // - *.*.registry.io - // - registry.io:8080/path + // - `123456789.dkr.ecr.us-east-1.amazonaws.com` + // - `*.azurecr.io` + // - `gcr.io` + // - `*.*.registry.io` + // - `registry.io:8080/path` MatchImages []string // defaultCacheDuration is the default duration the plugin will cache credentials in-memory diff --git a/staging/src/k8s.io/kubelet/config/v1alpha1/types.go b/staging/src/k8s.io/kubelet/config/v1alpha1/types.go index e869bc18244..92daa99667e 100644 --- a/staging/src/k8s.io/kubelet/config/v1alpha1/types.go +++ b/staging/src/k8s.io/kubelet/config/v1alpha1/types.go @@ -52,9 +52,9 @@ type CredentialProvider struct { // // Each entry in matchImages is a pattern which can optionally contain a port and a path. // Globs can be used in the domain, but not in the port or the path. Globs are supported - // as subdomains like '*.k8s.io' or 'k8s.*.io', and top-level-domains such as 'k8s.*'. - // Matching partial subdomains like 'app*.k8s.io' is also supported. Each glob can only match - // a single subdomain segment, so *.io does not match *.k8s.io. + // as subdomains like `*.k8s.io` or `k8s.*.io`, and top-level-domains such as `k8s.*`. + // Matching partial subdomains like `app*.k8s.io` is also supported. Each glob can only match + // a single subdomain segment, so `*.io` does not match `*.k8s.io`. // // A match exists between an image and a matchImage when all of the below are true: // - Both contain the same number of domain parts and each part matches. @@ -62,11 +62,11 @@ type CredentialProvider struct { // - If the imageMatch contains a port, then the port must match in the image as well. // // Example values of matchImages: - // - 123456789.dkr.ecr.us-east-1.amazonaws.com - // - *.azurecr.io - // - gcr.io - // - *.*.registry.io - // - registry.io:8080/path + // - `123456789.dkr.ecr.us-east-1.amazonaws.com` + // - `*.azurecr.io` + // - `gcr.io` + // - `*.*.registry.io` + // - `registry.io:8080/path` MatchImages []string `json:"matchImages"` // defaultCacheDuration is the default duration the plugin will cache credentials in-memory