From 3929a3da5d2ae858b2f1ee35987dd6437776bbd7 Mon Sep 17 00:00:00 2001
From: Vadim Rutkovsky <vrutkovs@redhat.com>
Date: Tue, 30 Jul 2024 13:07:16 +0200
Subject: [PATCH] features: add ShortCertRotation

---
 features.md                                               | 1 +
 features/features.go                                      | 8 ++++++++
 .../featuregates/featureGate-Hypershift-Default.yaml      | 3 +++
 .../featureGate-Hypershift-DevPreviewNoUpgrade.yaml       | 3 +++
 .../featureGate-Hypershift-TechPreviewNoUpgrade.yaml      | 3 +++
 .../featuregates/featureGate-SelfManagedHA-Default.yaml   | 3 +++
 .../featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml    | 3 +++
 .../featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml   | 3 +++
 8 files changed, 27 insertions(+)

diff --git a/features.md b/features.md
index 99112082504..c487397a7c6 100644
--- a/features.md
+++ b/features.md
@@ -7,6 +7,7 @@
 | MachineAPIOperatorDisableMachineHealthCheckController| | | | | |  |
 | MultiArchInstallAzure| | | | | |  |
 | GatewayAPI| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
+| ShortCertRotation| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | AWSClusterHostedDNS| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | AdditionalRoutingCapabilities| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | AutomatedEtcdBackup| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
diff --git a/features/features.go b/features/features.go
index e55ec593d71..58a4ca1d0a9 100644
--- a/features/features.go
+++ b/features/features.go
@@ -670,4 +670,12 @@ var (
 						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 						enhancementPR("https://github.com/openshift/enhancements/pull/1697").
 						mustRegister()
+
+	FeatureShortCertRotation = newFeatureGate("ShortCertRotation").
+					reportProblemsToJiraComponent("kube-apiserver").
+					contactPerson("vrutkovs").
+					productScope(ocpSpecific).
+					enableIn(configv1.DevPreviewNoUpgrade).
+					enhancementPR("https://github.com/openshift/enhancements/pull/1670").
+					mustRegister()
 )
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
index a2130d6f0b7..7c7d2f89332 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -139,6 +139,9 @@
                     {
                         "name": "ServiceAccountTokenNodeBinding"
                     },
+                    {
+                        "name": "ShortCertRotation"
+                    },
                     {
                         "name": "SignatureStores"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
index c9d021261e3..13bc6a20128 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -215,6 +215,9 @@
                     {
                         "name": "SetEIPForNLBIngressController"
                     },
+                    {
+                        "name": "ShortCertRotation"
+                    },
                     {
                         "name": "SignatureStores"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
index 693027446a6..0e8ff9490c6 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -35,6 +35,9 @@
                     },
                     {
                         "name": "MultiArchInstallAzure"
+                    },
+                    {
+                        "name": "ShortCertRotation"
                     }
                 ],
                 "enabled": [
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
index ad2106d3976..2e870978888 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -142,6 +142,9 @@
                     {
                         "name": "ServiceAccountTokenNodeBinding"
                     },
+                    {
+                        "name": "ShortCertRotation"
+                    },
                     {
                         "name": "SignatureStores"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
index 52e01ba3868..f5f64356626 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -215,6 +215,9 @@
                     {
                         "name": "SetEIPForNLBIngressController"
                     },
+                    {
+                        "name": "ShortCertRotation"
+                    },
                     {
                         "name": "SignatureStores"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
index 152ba3cbcb0..2fd8f05c0ee 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -35,6 +35,9 @@
                     },
                     {
                         "name": "MultiArchInstallAzure"
+                    },
+                    {
+                        "name": "ShortCertRotation"
                     }
                 ],
                 "enabled": [