diff --git a/features.md b/features.md
index a1777c7e325..43e72cd6cdc 100644
--- a/features.md
+++ b/features.md
@@ -84,6 +84,7 @@
| OLMLifecycleAndCompatibility| | 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 428d48e1ab8..d8b29a0f96c 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 8f58a610a58..bb32a5c186a 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
@@ -260,6 +260,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 870d6c20a94..e662ffef863 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
@@ -342,6 +342,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 bdadade414f..489633606f3 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
@@ -262,6 +262,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 de7954d1d43..2fbdc94048f 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
@@ -345,6 +345,9 @@
{
"name": "OpenShiftPodSecurityAdmission"
},
+ {
+ "name": "PodAndContainerStatsFromCRI"
+ },
{
"name": "SELinuxMount"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
index 14a34489294..b531316b537 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
@@ -245,6 +245,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 a1050ca6736..0f2c5c987a8 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -342,6 +342,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 ddb612857c2..8379632d40e 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
@@ -247,6 +247,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 7e40f034e57..f0a595817c3 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -345,6 +345,9 @@
{
"name": "OpenShiftPodSecurityAdmission"
},
+ {
+ "name": "PodAndContainerStatsFromCRI"
+ },
{
"name": "SELinuxMount"
},