Skip to content

Commit 6603f41

Browse files
committed
Promote StartupProbe to beta for 1.18
1 parent ded2ff3 commit 6603f41

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

api/openapi-spec/swagger.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/features/kube_features.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,7 @@ const (
525525

526526
// owner: @matthyx
527527
// alpha: v1.16
528+
// beta: v1.18
528529
//
529530
// Enables the startupProbe in kubelet worker.
530531
StartupProbe featuregate.Feature = "StartupProbe"
@@ -629,7 +630,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
629630
IPv6DualStack: {Default: false, PreRelease: featuregate.Alpha},
630631
EndpointSlice: {Default: false, PreRelease: featuregate.Beta},
631632
EvenPodsSpread: {Default: false, PreRelease: featuregate.Alpha},
632-
StartupProbe: {Default: false, PreRelease: featuregate.Alpha},
633+
StartupProbe: {Default: true, PreRelease: featuregate.Beta},
633634
AllowInsecureBackendProxy: {Default: true, PreRelease: featuregate.Beta},
634635
PodDisruptionBudget: {Default: true, PreRelease: featuregate.Beta},
635636
ServiceTopology: {Default: false, PreRelease: featuregate.Alpha},

staging/src/k8s.io/api/core/v1/generated.proto

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/api/core/v1/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2203,7 +2203,7 @@ type Container struct {
22032203
// This can be used to provide different probe parameters at the beginning of a Pod's lifecycle,
22042204
// when it might take a long time to load data or warm a cache, than during steady-state operation.
22052205
// This cannot be updated.
2206-
// This is an alpha feature enabled by the StartupProbe feature flag.
2206+
// This is a beta feature enabled by the StartupProbe feature flag.
22072207
// More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
22082208
// +optional
22092209
StartupProbe *Probe `json:"startupProbe,omitempty" protobuf:"bytes,22,opt,name=startupProbe"`

staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/e2e_node/startup_probe_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const (
3737
defaultObservationTimeout = time.Minute * 4
3838
)
3939

40-
var _ = framework.KubeDescribe("StartupProbe [Serial] [Disruptive] [NodeAlphaFeature:StartupProbe]", func() {
40+
var _ = framework.KubeDescribe("StartupProbe [Serial] [Disruptive]", func() {
4141
f := framework.NewDefaultFramework("startup-probe-test")
4242
var podClient *framework.PodClient
4343
ginkgo.BeforeEach(func() {
@@ -61,7 +61,7 @@ var _ = framework.KubeDescribe("StartupProbe [Serial] [Disruptive] [NodeAlphaFea
6161
Testname: Pod startup probe restart
6262
Description: A Pod is created with a failing startup probe. The Pod MUST be killed and restarted incrementing restart count to 1, even if liveness would succeed.
6363
*/
64-
framework.ConformanceIt("should be restarted startup probe fails [NodeConformance]", func() {
64+
ginkgo.It("should be restarted startup probe fails", func() {
6565
cmd := []string{"/bin/sh", "-c", "sleep 600"}
6666
livenessProbe := &v1.Probe{
6767
Handler: v1.Handler{
@@ -90,7 +90,7 @@ var _ = framework.KubeDescribe("StartupProbe [Serial] [Disruptive] [NodeAlphaFea
9090
Testname: Pod liveness probe delayed (long) by startup probe
9191
Description: A Pod is created with failing liveness and startup probes. Liveness probe MUST NOT fail until startup probe expires.
9292
*/
93-
framework.ConformanceIt("should *not* be restarted by liveness probe because startup probe delays it [NodeConformance]", func() {
93+
ginkgo.It("should *not* be restarted by liveness probe because startup probe delays it", func() {
9494
cmd := []string{"/bin/sh", "-c", "sleep 600"}
9595
livenessProbe := &v1.Probe{
9696
Handler: v1.Handler{
@@ -119,7 +119,7 @@ var _ = framework.KubeDescribe("StartupProbe [Serial] [Disruptive] [NodeAlphaFea
119119
Testname: Pod liveness probe fails after startup success
120120
Description: A Pod is created with failing liveness probe and delayed startup probe that uses ‘exec’ command to cat /temp/health file. The Container is started by creating /tmp/startup after 10 seconds, triggering liveness probe to fail. The Pod MUST now be killed and restarted incrementing restart count to 1.
121121
*/
122-
framework.ConformanceIt("should be restarted by liveness probe after startup probe enables it [NodeConformance]", func() {
122+
ginkgo.It("should be restarted by liveness probe after startup probe enables it", func() {
123123
cmd := []string{"/bin/sh", "-c", "sleep 10; echo ok >/tmp/startup; sleep 600"}
124124
livenessProbe := &v1.Probe{
125125
Handler: v1.Handler{
@@ -148,7 +148,7 @@ var _ = framework.KubeDescribe("StartupProbe [Serial] [Disruptive] [NodeAlphaFea
148148
Testname: Pod readiness probe, delayed by startup probe
149149
Description: A Pod is created with startup and readiness probes. The Container is started by creating /tmp/startup after 45 seconds, delaying the ready state by this amount of time. This is similar to the "Pod readiness probe, with initial delay" test.
150150
*/
151-
framework.ConformanceIt("should not be ready until startupProbe succeeds [NodeConformance]", func() {
151+
ginkgo.It("should not be ready until startupProbe succeeds", func() {
152152
cmd := []string{"/bin/sh", "-c", "echo ok >/tmp/health; sleep 45; echo ok >/tmp/startup; sleep 600"}
153153
readinessProbe := &v1.Probe{
154154
Handler: v1.Handler{

0 commit comments

Comments
 (0)