github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Promote EphemeralContainers feature to beta

Browse Source
This commit is contained in:
Lee Verberne 2021-10-01 17:22:23 +02:00
parent 83a4ec90ae
commit 6f4b8da9a3
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/apis/core/types.go
View File

@ -2749,7 +2749,7 @@ type PodSpec struct {
// pod to perform user-initiated actions such as debugging. This list cannot be specified when // pod to perform user-initiated actions such as debugging. This list cannot be specified when
// creating a pod, and it cannot be modified by updating the pod spec. In order to add an // creating a pod, and it cannot be modified by updating the pod spec. In order to add an
// ephemeral container to an existing pod, use the pod's ephemeralcontainers subresource. // ephemeral container to an existing pod, use the pod's ephemeralcontainers subresource.
// This field is alpha-level and is only honored by servers that enable the EphemeralContainers feature. // This field is beta-level and available on clusters that haven't disabled the EphemeralContainers feature gate.
// +optional // +optional
EphemeralContainers []EphemeralContainer EphemeralContainers []EphemeralContainer
// +optional // +optional
@ -3188,7 +3188,7 @@ var _ = Container(EphemeralContainerCommon{})
// Ephemeral containers may not be added by directly updating the pod spec. They must be added // Ephemeral containers may not be added by directly updating the pod spec. They must be added
// via the pod's ephemeralcontainers subresource, and they will appear in the pod spec // via the pod's ephemeralcontainers subresource, and they will appear in the pod spec
// once added. // once added.
// This is an alpha feature enabled by the EphemeralContainers feature flag. // This is a beta feature available on clusters that haven't disabled the EphemeralContainers feature gate.
type EphemeralContainer struct { type EphemeralContainer struct {
// Ephemeral containers have all of the fields of Container, plus additional fields // Ephemeral containers have all of the fields of Container, plus additional fields
// specific to ephemeral containers. Fields in common with Container are in the // specific to ephemeral containers. Fields in common with Container are in the
@ -3253,7 +3253,7 @@ type PodStatus struct {
ContainerStatuses []ContainerStatus ContainerStatuses []ContainerStatus
// Status for any ephemeral containers that have run in this pod. // Status for any ephemeral containers that have run in this pod.
// This field is alpha-level and is only honored by servers that enable the EphemeralContainers feature. // This field is beta-level and available on clusters that haven't disabled the EphemeralContainers feature gate.
// +optional // +optional
EphemeralContainerStatuses []ContainerStatus EphemeralContainerStatuses []ContainerStatus
} }

3
pkg/features/kube_features.go
View File

@ -94,6 +94,7 @@ const (
// owner: @verb // owner: @verb
// alpha: v1.16 // alpha: v1.16
// beta: v1.23
// //
// Allows running an ephemeral container in pod namespaces to troubleshoot a running pod. // Allows running an ephemeral container in pod namespaces to troubleshoot a running pod.
EphemeralContainers featuregate.Feature = "EphemeralContainers" EphemeralContainers featuregate.Feature = "EphemeralContainers"
@ -791,7 +792,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
DevicePlugins: {Default: true, PreRelease: featuregate.Beta}, DevicePlugins: {Default: true, PreRelease: featuregate.Beta},
RotateKubeletServerCertificate: {Default: true, PreRelease: featuregate.Beta}, RotateKubeletServerCertificate: {Default: true, PreRelease: featuregate.Beta},
LocalStorageCapacityIsolation: {Default: true, PreRelease: featuregate.Beta}, LocalStorageCapacityIsolation: {Default: true, PreRelease: featuregate.Beta},
EphemeralContainers: {Default: false, PreRelease: featuregate.Alpha}, EphemeralContainers: {Default: true, PreRelease: featuregate.Beta},
QOSReserved: {Default: false, PreRelease: featuregate.Alpha}, QOSReserved: {Default: false, PreRelease: featuregate.Alpha},
ExpandPersistentVolumes: {Default: true, PreRelease: featuregate.Beta}, ExpandPersistentVolumes: {Default: true, PreRelease: featuregate.Beta},
ExpandInUsePersistentVolumes: {Default: true, PreRelease: featuregate.Beta}, ExpandInUsePersistentVolumes: {Default: true, PreRelease: featuregate.Beta},

6
staging/src/k8s.io/api/core/v1/types.go
View File

@ -2995,7 +2995,7 @@ type PodSpec struct {
// pod to perform user-initiated actions such as debugging. This list cannot be specified when // pod to perform user-initiated actions such as debugging. This list cannot be specified when
// creating a pod, and it cannot be modified by updating the pod spec. In order to add an // creating a pod, and it cannot be modified by updating the pod spec. In order to add an
// ephemeral container to an existing pod, use the pod's ephemeralcontainers subresource. // ephemeral container to an existing pod, use the pod's ephemeralcontainers subresource.
// This field is alpha-level and is only honored by servers that enable the EphemeralContainers feature. // This field is beta-level and available on clusters that haven't disabled the EphemeralContainers feature gate.
// +optional // +optional
// +patchMergeKey=name // +patchMergeKey=name
// +patchStrategy=merge // +patchStrategy=merge
@ -3582,7 +3582,7 @@ var _ = Container(EphemeralContainerCommon{})
// Ephemeral containers may not be added by directly updating the pod spec. They must be added // Ephemeral containers may not be added by directly updating the pod spec. They must be added
// via the pod's ephemeralcontainers subresource, and they will appear in the pod spec // via the pod's ephemeralcontainers subresource, and they will appear in the pod spec
// once added. // once added.
// This is an alpha feature enabled by the EphemeralContainers feature flag. // This is a beta feature available on clusters that haven't disabled the EphemeralContainers feature gate.
type EphemeralContainer struct { type EphemeralContainer struct {
// Ephemeral containers have all of the fields of Container, plus additional fields // Ephemeral containers have all of the fields of Container, plus additional fields
// specific to ephemeral containers. Fields in common with Container are in the // specific to ephemeral containers. Fields in common with Container are in the
@ -3683,7 +3683,7 @@ type PodStatus struct {
// +optional // +optional
QOSClass PodQOSClass `json:"qosClass,omitempty" protobuf:"bytes,9,rep,name=qosClass"` QOSClass PodQOSClass `json:"qosClass,omitempty" protobuf:"bytes,9,rep,name=qosClass"`
// Status for any ephemeral containers that have run in this pod. // Status for any ephemeral containers that have run in this pod.
// This field is alpha-level and is only populated by servers that enable the EphemeralContainers feature. // This field is beta-level and available on clusters that haven't disabled the EphemeralContainers feature gate.
// +optional // +optional
EphemeralContainerStatuses []ContainerStatus `json:"ephemeralContainerStatuses,omitempty" protobuf:"bytes,13,rep,name=ephemeralContainerStatuses"` EphemeralContainerStatuses []ContainerStatus `json:"ephemeralContainerStatuses,omitempty" protobuf:"bytes,13,rep,name=ephemeralContainerStatuses"`
} }

2
test/e2e_node/ephemeral_containers_test.go
View File

@ -27,7 +27,7 @@ import (
"github.com/onsi/ginkgo" "github.com/onsi/ginkgo"
) )
var _ = SIGDescribe("Ephemeral Containers [Feature:EphemeralContainers][NodeAlphaFeature:EphemeralContainers]", func() { var _ = SIGDescribe("Ephemeral Containers", func() {
f := framework.NewDefaultFramework("ephemeral-containers-test") f := framework.NewDefaultFramework("ephemeral-containers-test")
var podClient *framework.PodClient var podClient *framework.PodClient
ginkgo.BeforeEach(func() { ginkgo.BeforeEach(func() {