From 29b5b45db233e5eaf7dcdb704fb4d36ab469c5e2 Mon Sep 17 00:00:00 2001
From: Reto Lehmann <retocode@icloud.com>
Date: Mon, 2 Oct 2023 11:22:28 +0200
Subject: [PATCH 1/2] Drop gateway HPA

---
 config/300-gateway.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/300-gateway.yaml b/config/300-gateway.yaml
index 25fbd5827..12ca672f1 100644
--- a/config/300-gateway.yaml
+++ b/config/300-gateway.yaml
@@ -202,7 +202,7 @@ metadata:
     app.kubernetes.io/version: devel
     app.kubernetes.io/name: knative-serving
 spec:
-  minAvailable: 1
+  minAvailable: 80%
   selector:
     matchLabels:
       app: 3scale-kourier-gateway

From 1f5ec127adae59e562c028ec1861576d8080dc96 Mon Sep 17 00:00:00 2001
From: Reto Lehmann <retocode@icloud.com>
Date: Mon, 2 Oct 2023 11:25:48 +0200
Subject: [PATCH 2/2] Drop 3scale-kourier-gateway HPA for 1.10

---
 config/300-gateway.yaml                      | 28 +-----------
 openshift/patches/002-pdb-and-hpa.patch      | 45 ++++++++++++++++++++
 openshift/patches/002-pdb-minavailable.patch | 13 ------
 openshift/release/artifacts/net-kourier.yaml | 26 -----------
 4 files changed, 46 insertions(+), 66 deletions(-)
 create mode 100644 openshift/patches/002-pdb-and-hpa.patch
 delete mode 100644 openshift/patches/002-pdb-minavailable.patch

diff --git a/config/300-gateway.yaml b/config/300-gateway.yaml
index 12ca672f1..3f82e8e8b 100644
--- a/config/300-gateway.yaml
+++ b/config/300-gateway.yaml
@@ -165,32 +165,6 @@ spec:
     app: 3scale-kourier-gateway
   type: ClusterIP
 ---
-apiVersion: autoscaling/v2
-kind: HorizontalPodAutoscaler
-metadata:
-  name: 3scale-kourier-gateway
-  namespace: kourier-system
-  labels:
-    networking.knative.dev/ingress-provider: kourier
-    app.kubernetes.io/component: net-kourier
-    app.kubernetes.io/version: devel
-    app.kubernetes.io/name: knative-serving
-spec:
-  minReplicas: 1
-  maxReplicas: 10
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: 3scale-kourier-gateway
-  metrics:
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          type: Utilization
-          # Percentage of the requested CPU
-          averageUtilization: 100
----
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
@@ -202,7 +176,7 @@ metadata:
     app.kubernetes.io/version: devel
     app.kubernetes.io/name: knative-serving
 spec:
-  minAvailable: 80%
+  minAvailable: 1
   selector:
     matchLabels:
       app: 3scale-kourier-gateway
diff --git a/openshift/patches/002-pdb-and-hpa.patch b/openshift/patches/002-pdb-and-hpa.patch
new file mode 100644
index 000000000..e088116ff
--- /dev/null
+++ b/openshift/patches/002-pdb-and-hpa.patch
@@ -0,0 +1,45 @@
+diff --git a/config/300-gateway.yaml b/config/300-gateway.yaml
+--- a/config/300-gateway.yaml	(revision 29b5b45db233e5eaf7dcdb704fb4d36ab469c5e2)
++++ b/config/300-gateway.yaml	(date 1696238557691)
+@@ -165,32 +165,6 @@
+     app: 3scale-kourier-gateway
+   type: ClusterIP
+ ---
+-apiVersion: autoscaling/v2
+-kind: HorizontalPodAutoscaler
+-metadata:
+-  name: 3scale-kourier-gateway
+-  namespace: kourier-system
+-  labels:
+-    networking.knative.dev/ingress-provider: kourier
+-    app.kubernetes.io/component: net-kourier
+-    app.kubernetes.io/version: devel
+-    app.kubernetes.io/name: knative-serving
+-spec:
+-  minReplicas: 1
+-  maxReplicas: 10
+-  scaleTargetRef:
+-    apiVersion: apps/v1
+-    kind: Deployment
+-    name: 3scale-kourier-gateway
+-  metrics:
+-    - type: Resource
+-      resource:
+-        name: cpu
+-        target:
+-          type: Utilization
+-          # Percentage of the requested CPU
+-          averageUtilization: 100
+----
+ apiVersion: policy/v1
+ kind: PodDisruptionBudget
+ metadata:
+@@ -202,7 +176,7 @@
+     app.kubernetes.io/version: devel
+     app.kubernetes.io/name: knative-serving
+ spec:
+-  minAvailable: 80%
++  minAvailable: 1
+   selector:
+     matchLabels:
+       app: 3scale-kourier-gateway
diff --git a/openshift/patches/002-pdb-minavailable.patch b/openshift/patches/002-pdb-minavailable.patch
deleted file mode 100644
index 7bcd7487d..000000000
--- a/openshift/patches/002-pdb-minavailable.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/config/300-gateway.yaml b/config/300-gateway.yaml
-index 00cbc5d4..dc280b9c 100644
---- a/config/300-gateway.yaml
-+++ b/config/300-gateway.yaml
-@@ -194,7 +194,7 @@ metadata:
-     app.kubernetes.io/version: devel
-     app.kubernetes.io/name: knative-serving
- spec:
--  minAvailable: 80%
-+  minAvailable: 1
-   selector:
-     matchLabels:
-       app: 3scale-kourier-gateway
diff --git a/openshift/release/artifacts/net-kourier.yaml b/openshift/release/artifacts/net-kourier.yaml
index c44d1a625..08832bb22 100644
--- a/openshift/release/artifacts/net-kourier.yaml
+++ b/openshift/release/artifacts/net-kourier.yaml
@@ -593,32 +593,6 @@ spec:
     app: 3scale-kourier-gateway
   type: ClusterIP
 ---
-apiVersion: autoscaling/v2
-kind: HorizontalPodAutoscaler
-metadata:
-  name: 3scale-kourier-gateway
-  namespace: kourier-system
-  labels:
-    networking.knative.dev/ingress-provider: kourier
-    app.kubernetes.io/component: net-kourier
-    app.kubernetes.io/version: "release-v1.10"
-    app.kubernetes.io/name: knative-serving
-spec:
-  minReplicas: 1
-  maxReplicas: 10
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: 3scale-kourier-gateway
-  metrics:
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          type: Utilization
-          # Percentage of the requested CPU
-          averageUtilization: 100
----
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata: