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.

Sign up for GitHub

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

Add kubelet cgroup driver property #9879

Merged
merged 1 commit into from
Sep 7, 2020
Merged

Add kubelet cgroup driver property #9879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions k8s/crds/kops.k8s.io_clusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1552,6 +1552,9 @@ spec:
bootstrapKubeconfig:
description: BootstrapKubeconfig is the path to a kubeconfig file that will be used to get client certificate for kubelet
type: string
cgroupDriver:
description: CgroupDriver allows the explicit setting of the kubelet cgroup driver. If omitted, defaults to cgroupfs.
type: string
cgroupRoot:
description: cgroupRoot is the root cgroup to use for pods. This is handled by the container runtime on a best effort basis.
type: string
Expand Down Expand Up @@ -1827,6 +1830,9 @@ spec:
bootstrapKubeconfig:
description: BootstrapKubeconfig is the path to a kubeconfig file that will be used to get client certificate for kubelet
type: string
cgroupDriver:
description: CgroupDriver allows the explicit setting of the kubelet cgroup driver. If omitted, defaults to cgroupfs.
type: string
cgroupRoot:
description: cgroupRoot is the root cgroup to use for pods. This is handled by the container runtime on a best effort basis.
type: string
Expand Down
3 changes: 3 additions & 0 deletions k8s/crds/kops.k8s.io_instancegroups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,9 @@ spec:
bootstrapKubeconfig:
description: BootstrapKubeconfig is the path to a kubeconfig file that will be used to get client certificate for kubelet
type: string
cgroupDriver:
description: CgroupDriver allows the explicit setting of the kubelet cgroup driver. If omitted, defaults to cgroupfs.
type: string
cgroupRoot:
description: cgroupRoot is the root cgroup to use for pods. This is handled by the container runtime on a best effort basis.
type: string
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/kops/componentconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,13 @@ type KubeletConfigSpec struct {
RegistryBurst *int32 `json:"registryBurst,omitempty" flag:"registry-burst"`
//TopologyManagerPolicy determines the allocation policy for the topology manager.
TopologyManagerPolicy string `json:"topologyManagerPolicy,omitempty" flag:"topology-manager-policy"`

// rotateCertificates enables client certificate rotation.
RotateCertificates *bool `json:"rotateCertificates,omitempty" flag:"rotate-certificates"`

// Default kubelet behaviour for kernel tuning. If set, kubelet errors if any of kernel tunables is different than kubelet defaults.
// (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag.
ProtectKernelDefaults *bool `json:"protectKernelDefaults,omitempty" flag:"protect-kernel-defaults"`
// CgroupDriver allows the explicit setting of the kubelet cgroup driver. If omitted, defaults to cgroupfs.
CgroupDriver string `json:"cgroupDriver,omitempty" flag:"cgroup-driver"`
}

// KubeProxyConfig defines the configuration for a proxy
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/kops/v1alpha2/componentconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,13 @@ type KubeletConfigSpec struct {
RegistryBurst *int32 `json:"registryBurst,omitempty" flag:"registry-burst"`
//TopologyManagerPolicy determines the allocation policy for the topology manager.
TopologyManagerPolicy string `json:"topologyManagerPolicy,omitempty" flag:"topology-manager-policy"`

// rotateCertificates enables client certificate rotation.
RotateCertificates *bool `json:"rotateCertificates,omitempty" flag:"rotate-certificates"`

// Default kubelet behaviour for kernel tuning. If set, kubelet errors if any of kernel tunables is different than kubelet defaults.
// (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag.
ProtectKernelDefaults *bool `json:"protectKernelDefaults,omitempty" flag:"protect-kernel-defaults"`
// CgroupDriver allows the explicit setting of the kubelet cgroup driver. If omitted, defaults to cgroupfs.
CgroupDriver string `json:"cgroupDriver,omitempty" flag:"cgroup-driver"`
}

// KubeProxyConfig defines the configuration for a proxy
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View file
Open in desktop

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