add support for KEDA HTTPScaledObjects via HTTPScaledObjectReconciler

Signed-off-by: kahirokunn <[email protected]>
fluxcd · Nov 8, 2024 · 212b865 · 212b865
1 parent a159421
commit 212b865
Show file tree

Hide file tree

Showing 53 changed files with 4,673 additions and 47 deletions.
diff --git a/artifacts/flagger/account.yaml b/artifacts/flagger/account.yaml
@@ -239,6 +239,19 @@ rules:
       - update
       - patch
       - delete
+  - apiGroups:
+      - http.keda.sh
+    resources:
+      - httpscaledobjects
+      - httpscaledobjects/finalizers
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete
   - apiGroups:
       - apisix.apache.org
     resources:

diff --git a/artifacts/flagger/crd.yaml b/artifacts/flagger/crd.yaml
@@ -119,6 +119,7 @@ spec:
                       enum:
                         - HorizontalPodAutoscaler
                         - ScaledObject
+                        - HTTPScaledObject
                     name:
                       type: string
                     primaryScalerQueries:
@@ -132,6 +133,38 @@ spec:
                           type: number
                         maxReplicas:
                           type: number
+                    canaryInterceptorProxyService:
+                      type: object
+                      description: Specify this service if you want to change the Canary interceptor proxy service from its default value.
+                      properties:
+                        name:
+                          default: keda-http-add-on-interceptor-proxy
+                          maxLength: 253
+                          minLength: 1
+                          type: string
+                        namespace:
+                          default: keda
+                          maxLength: 63
+                          minLength: 1
+                          type: string
+                    primaryScalingSet:
+                      type: object
+                      description: |-
+                        PrimaryScalingSet to be used for primary HTTPScaledObject, if empty, default interceptor and scaler will be used.
+                      properties:
+                        kind:
+                          description: Kind of the resource being referred to. Defaults to HTTPScalingSet.
+                          enum:
+                            - HTTPScalingSet
+                            - ClusterHTTPScalingSet
+                          type: string
+                        name:
+                          description: Name of the scaling set
+                          type: string
+                        namespace:
+                          maxLength: 63
+                          minLength: 1
+                          type: string
                 ingressRef:
                   description: Ingress selector
                   type: object

diff --git a/charts/flagger/Chart.yaml b/charts/flagger/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: flagger
-version: 1.38.0
-appVersion: 1.38.0
+version: 1.39.0
+appVersion: 1.39.0
 kubeVersion: ">=1.19.0-0"
 engine: gotpl
 description: Flagger is a progressive delivery operator for Kubernetes

diff --git a/charts/flagger/crds/crd.yaml b/charts/flagger/crds/crd.yaml
@@ -119,6 +119,7 @@ spec:
                       enum:
                         - HorizontalPodAutoscaler
                         - ScaledObject
+                        - HTTPScaledObject
                     name:
                       type: string
                     primaryScalerQueries:
@@ -132,6 +133,38 @@ spec:
                           type: number
                         maxReplicas:
                           type: number
+                    canaryInterceptorProxyService:
+                      type: object
+                      description: Specify this service if you want to change the Canary interceptor proxy service from its default value.
+                      properties:
+                        name:
+                          default: keda-http-add-on-interceptor-proxy
+                          maxLength: 253
+                          minLength: 1
+                          type: string
+                        namespace:
+                          default: keda
+                          maxLength: 63
+                          minLength: 1
+                          type: string
+                    primaryScalingSet:
+                      type: object
+                      description: |-
+                        PrimaryScalingSet to be used for primary HTTPScaledObject, if empty, default interceptor and scaler will be used.
+                      properties:
+                        kind:
+                          description: Kind of the resource being referred to. Defaults to HTTPScalingSet.
+                          enum:
+                            - HTTPScalingSet
+                            - ClusterHTTPScalingSet
+                          type: string
+                        name:
+                          description: Name of the scaling set
+                          type: string
+                        namespace:
+                          maxLength: 63
+                          minLength: 1
+                          type: string
                 ingressRef:
                   description: Ingress selector
                   type: object

diff --git a/charts/flagger/templates/rbac.yaml b/charts/flagger/templates/rbac.yaml
@@ -247,6 +247,19 @@ rules:
       - update
       - patch
       - delete
+  - apiGroups:
+      - http.keda.sh
+    resources:
+      - httpscaledobjects
+      - httpscaledobjects/finalizers
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete
   - apiGroups:
       - apisix.apache.org
     resources:

diff --git a/docs/diagrams/flagger-keda-http-add-on.png b/docs/diagrams/flagger-keda-http-add-on.png
diff --git a/docs/gitbook/SUMMARY.md b/docs/gitbook/SUMMARY.md
@@ -38,6 +38,7 @@
 * [Blue/Green Deployments](tutorials/kubernetes-blue-green.md)
 * [Canary analysis with Prometheus Operator](tutorials/prometheus-operator.md)
 * [Canary analysis with KEDA ScaledObjects](tutorials/keda-scaledobject.md)
+* [Canary analysis with KEDA HTTPScaledObjects](tutorials/keda-httpscaledobject.md)
 * [Zero downtime deployments](tutorials/zero-downtime-deployments.md)
 
 ## Dev