Skip to content

Commit 88f1231

Browse files
authored
Merge pull request kubernetes#5403 from ripta/kubelet-disable-shared-pid
Add dockerDisableSharedPID to kubelet config
2 parents 472f404 + 5f2f031 commit 88f1231

10 files changed

+566
-66
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"paths": [
3+
"/apis",
4+
"/apis/kops",
5+
"/apis/kops/v1alpha2",
6+
"/version"
7+
]
8+
}

pkg/apis/kops/componentconfig.go

+2
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ type KubeletConfigSpec struct {
168168
ExperimentalAllowedUnsafeSysctls []string `json:"experimentalAllowedUnsafeSysctls,omitempty" flag:"experimental-allowed-unsafe-sysctls"`
169169
// StreamingConnectionIdleTimeout is the maximum time a streaming connection can be idle before the connection is automatically closed
170170
StreamingConnectionIdleTimeout *metav1.Duration `json:"streamingConnectionIdleTimeout,omitempty" flag:"streaming-connection-idle-timeout"`
171+
// DockerDisableSharedPID uses a shared PID namespace for containers in a pod.
172+
DockerDisableSharedPID *bool `json:"dockerDisableSharedPID,omitempty" flag:"docker-disable-shared-pid"`
171173
}
172174

173175
// KubeProxyConfig defines the configuration for a proxy

pkg/apis/kops/v1alpha1/componentconfig.go

+2
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ type KubeletConfigSpec struct {
168168
ExperimentalAllowedUnsafeSysctls []string `json:"experimental_allowed_unsafe_sysctls,omitempty" flag:"experimental-allowed-unsafe-sysctls"`
169169
// StreamingConnectionIdleTimeout is the maximum time a streaming connection can be idle before the connection is automatically closed
170170
StreamingConnectionIdleTimeout *metav1.Duration `json:"streamingConnectionIdleTimeout,omitempty" flag:"streaming-connection-idle-timeout"`
171+
// DockerDisableSharedPID uses a shared PID namespace for containers in a pod.
172+
DockerDisableSharedPID *bool `json:"dockerDisableSharedPID,omitempty" flag:"docker-disable-shared-pid"`
171173
}
172174

173175
// KubeProxyConfig defines the configuration for a proxy

pkg/apis/kops/v1alpha1/zz_generated.conversion.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/kops/v1alpha2/componentconfig.go

+2
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ type KubeletConfigSpec struct {
168168
ExperimentalAllowedUnsafeSysctls []string `json:"experimental_allowed_unsafe_sysctls,omitempty" flag:"experimental-allowed-unsafe-sysctls"`
169169
// StreamingConnectionIdleTimeout is the maximum time a streaming connection can be idle before the connection is automatically closed
170170
StreamingConnectionIdleTimeout *metav1.Duration `json:"streamingConnectionIdleTimeout,omitempty" flag:"streaming-connection-idle-timeout"`
171+
// DockerDisableSharedPID uses a shared PID namespace for containers in a pod.
172+
DockerDisableSharedPID *bool `json:"dockerDisableSharedPID,omitempty" flag:"docker-disable-shared-pid"`
171173
}
172174

173175
// KubeProxyConfig defines the configuration for a proxy

pkg/apis/kops/v1alpha2/zz_generated.conversion.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/kops/zz_generated.deepcopy.go

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)