From 067648a4a21eda7f97fb6bdb4fb5b46b4e5d86e8 Mon Sep 17 00:00:00 2001
From: Peter Hunt <pehunt@redhat.com>
Date: Mon, 25 Mar 2024 13:05:37 -0400
Subject: [PATCH] bump ImageMaximumGCAge KEP to beta

Signed-off-by: Peter Hunt <pehunt@redhat.com>
---
 .../en/docs/concepts/architecture/garbage-collection.md  | 9 ++++++++-
 .../feature-gates/image-maximum-gc-age.md                | 6 +++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/content/en/docs/concepts/architecture/garbage-collection.md b/content/en/docs/concepts/architecture/garbage-collection.md
index 4c61c968ba054..ffc648014e47a 100644
--- a/content/en/docs/concepts/architecture/garbage-collection.md
+++ b/content/en/docs/concepts/architecture/garbage-collection.md
@@ -141,7 +141,7 @@ until disk usage reaches the `LowThresholdPercent` value.
 
 {{< feature-state feature_gate_name="ImageMaximumGCAge" >}}
 
-As an alpha feature, you can specify the maximum time a local image can be unused for,
+As a beta feature, you can specify the maximum time a local image can be unused for,
 regardless of disk usage. This is a kubelet setting that you configure for each node.
 
 To configure the setting, enable the `ImageMaximumGCAge`
@@ -151,6 +151,13 @@ and also set a value for the `ImageMaximumGCAge` field in the kubelet configurat
 The value is specified as a Kubernetes _duration_; for example, you can set the configuration
 field to `3d12h`, which means 3 days and 12 hours.
 
+{{< note >}}
+This feature does not track image usage across kubelet restarts. If the kubelet
+is restarted, the tracked image age is reset, causing the kubelet to wait the full
+`ImageMaximumGCAge` duration before qualifying images for garbage collection
+based on image age.
+{{< /note>}}
+
 ### Container garbage collection {#container-image-garbage-collection}
 
 The kubelet garbage collects unused containers based on the following variables,
diff --git a/content/en/docs/reference/command-line-tools-reference/feature-gates/image-maximum-gc-age.md b/content/en/docs/reference/command-line-tools-reference/feature-gates/image-maximum-gc-age.md
index 5860765283dbd..10a6b2334e9a8 100644
--- a/content/en/docs/reference/command-line-tools-reference/feature-gates/image-maximum-gc-age.md
+++ b/content/en/docs/reference/command-line-tools-reference/feature-gates/image-maximum-gc-age.md
@@ -8,6 +8,10 @@ _build:
 stages:
   - stage: alpha 
     defaultValue: false
-    fromVersion: "1.29"   
+    fromVersion: "1.29"
+    toVersion: "1.29"
+  - stage: beta
+    defaultValue: true
+    fromVersion: "1.30"
 ---
 Enables the kubelet configuration field `imageMaximumGCAge`, allowing an administrator to specify the age after which an image will be garbage collected.