diff --git a/features.md b/features.md
index a334f3209d5..f7f2634ff7d 100644
--- a/features.md
+++ b/features.md
@@ -86,6 +86,7 @@
| NutanixMultiSubnets| | | Enabled | Enabled | | | Enabled | Enabled |
| OVNObservability| | | Enabled | Enabled | | | Enabled | Enabled |
| OnPremDNSRecords| | | Enabled | Enabled | | | Enabled | Enabled |
+| PodAndContainerStatsFromCRI| | | Enabled | Enabled | | | Enabled | Enabled |
| SELinuxMount| | | Enabled | Enabled | | | Enabled | Enabled |
| SELinuxMountGAReadiness| | | Enabled | Enabled | | | Enabled | Enabled |
| SignatureStores| | | Enabled | Enabled | | | Enabled | Enabled |
diff --git a/features/features.go b/features/features.go
index 9b2d7b272d1..815e9571d9f 100644
--- a/features/features.go
+++ b/features/features.go
@@ -138,6 +138,14 @@ var (
enhancementPR("https://github.com/kubernetes/enhancements/issues/3386").
mustRegister()
+ FeatureGatePodAndContainerStatsFromCRI = newFeatureGate("PodAndContainerStatsFromCRI").
+ reportProblemsToJiraComponent("node").
+ contactPerson("dgrisonnet").
+ productScope(kubernetes).
+ enhancementPR("https://github.com/kubernetes/enhancements/issues/2371").
+ enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
+ mustRegister()
+
FeatureGateSigstoreImageVerification = newFeatureGate("SigstoreImageVerification").
reportProblemsToJiraComponent("node").
contactPerson("sgrunert").
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
index ec8522bd04e..d50149bed21 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
@@ -266,6 +266,9 @@
{
"name": "OnPremDNSRecords"
},
+ {
+ "name": "PodAndContainerStatsFromCRI"
+ },
{
"name": "ProvisioningRequestAvailable"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
index a7fd609076d..d6abddb1ba5 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
@@ -339,6 +339,9 @@
{
"name": "OpenShiftPodSecurityAdmission"
},
+ {
+ "name": "PodAndContainerStatsFromCRI"
+ },
{
"name": "ProvisioningRequestAvailable"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
index 70c900d6eeb..bc182aaa5dd 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
@@ -268,6 +268,9 @@
{
"name": "OnPremDNSRecords"
},
+ {
+ "name": "PodAndContainerStatsFromCRI"
+ },
{
"name": "ProvisioningRequestAvailable"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
index 07ade26d250..3b066e3456e 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
@@ -342,6 +342,9 @@
{
"name": "OpenShiftPodSecurityAdmission"
},
+ {
+ "name": "PodAndContainerStatsFromCRI"
+ },
{
"name": "RouteExternalCertificate"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
index 4016cb15783..2c7319116e7 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
@@ -260,6 +260,9 @@
{
"name": "OnPremDNSRecords"
},
+ {
+ "name": "PodAndContainerStatsFromCRI"
+ },
{
"name": "ProvisioningRequestAvailable"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
index 7b061e71319..5f766317ac6 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -339,6 +339,9 @@
{
"name": "OpenShiftPodSecurityAdmission"
},
+ {
+ "name": "PodAndContainerStatsFromCRI"
+ },
{
"name": "ProvisioningRequestAvailable"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
index 94c9ac3c3ac..655afb93459 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
@@ -262,6 +262,9 @@
{
"name": "OnPremDNSRecords"
},
+ {
+ "name": "PodAndContainerStatsFromCRI"
+ },
{
"name": "ProvisioningRequestAvailable"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
index 50eadfb3139..f81301739b5 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -342,6 +342,9 @@
{
"name": "OpenShiftPodSecurityAdmission"
},
+ {
+ "name": "PodAndContainerStatsFromCRI"
+ },
{
"name": "RouteExternalCertificate"
},