fix(http-add-on): add missing changes for v0.5.0

.github/workflows/ci-http-add-on.yml

@@ -76,13 +76,6 @@ jobs:
       run: kubectl create ns keda
 
     - name: Install KEDA chart
-      if: matrix.kubernetesVersion == 'v1.23'
-      run: |
-        helm repo add kedacore https://kedacore.github.io/charts
-        helm install keda kedacore/keda --namespace keda --version ~2.8.4
-
-    - name: Install KEDA chart
-      if: matrix.kubernetesVersion != 'v1.23'
       run: helm install keda ./keda/ --namespace keda
 
     - name: Template Helm chart

README.md

@@ -22,7 +22,7 @@ $ helm search repo kedacore
 NAME                                            CHART VERSION   APP VERSION     DESCRIPTION
 kedacore/external-scaler-azure-cosmos-db        0.1.0           0.1.0           Event-based autoscaler for Azure Cosmos DB chan...
 kedacore/keda                                   2.10.2          2.10.1          Event-based autoscaler for workloads on Kubernetes
-kedacore/keda-add-ons-http                      0.5.1           0.5.0           Event-based autoscaler for HTTP workloads on Ku...
+kedacore/keda-add-ons-http                      0.5.2           0.5.0           Event-based autoscaler for HTTP workloads on Ku...
 ```
 
 ## Releases

http-add-on/Chart.yaml

@@ -11,7 +11,7 @@ kubeVersion: ">=v1.24.0-0"
 # to the chart and its templates, including the app version. This is incremented at chart release time and does not need
 # to be included in any PRs to main.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.1
+version: 0.5.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

http-add-on/README.md

@@ -121,6 +121,10 @@ their default values.
 | `scaler.nodeSelector` | object | `{}` | Node selector for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/)) |
 | `scaler.pendingRequestsInterceptor` | int | `200` | The number of "target requests" that the external scaler will report to KEDA for the interceptor's scaling metrics. See the [KEDA external scaler documentation](https://keda.sh/docs/2.4/concepts/external-scalers/) for details on target requests. |
 | `scaler.pullPolicy` | string | `"Always"` | The image pull policy for the scaler component |
+| `scaler.resources.limits.cpu` | float | `0.5` |  |
+| `scaler.resources.limits.memory` | string | `"64Mi"` |  |
+| `scaler.resources.requests.cpu` | string | `"250m"` |  |
+| `scaler.resources.requests.memory` | string | `"20Mi"` |  |
 | `scaler.service` | string | `"external-scaler"` | The name of the Kubernetes `Service` for the scaler component |
 | `scaler.tolerations` | list | `[]` | Tolerations for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/)) |
 
@@ -148,7 +152,6 @@ their default values.
 | `interceptor.resources.limits` | object | `{"cpu":0.5,"memory":"64Mi"}` | The CPU/memory resource limit for the operator component |
 | `interceptor.resources.requests` | object | `{"cpu":"250m","memory":"20Mi"}` | The CPU/memory resource request for the operator component |
 | `interceptor.responseHeaderTimeout` | string | `"500ms"` | How long the interceptor will wait between forwarding a request to a backend and receiving response headers back before failing the request |
-| `interceptor.routingTableUpdateDurationMS` | int | `500` | How often (in milliseconds) each interceptor replica should update its in-memory routing table from the central routing table copy. The interceptor will also use Kubernetes events to stay up-to-date with routing table changes. This duration is the maximum time it will take to get a routing table update |
 | `interceptor.scaledObject.pollingInterval` | int | `1` | The interval (in milliseconds) that KEDA should poll the external scaler to fetch scaling metrics about the interceptor |
 | `interceptor.tcpConnectTimeout` | string | `"500ms"` | How long the interceptor waits to establish TCP connections with backends before failing a request. |
 | `interceptor.tlsHandshakeTimeout` | string | `"10s"` | The maximum amount of time the interceptor will wait for a TLS handshake. Set to zero to indicate no timeout. |

http-add-on/templates/deployment-interceptor.yaml

@@ -48,8 +48,6 @@ spec:
         imagePullPolicy: '{{ .Values.interceptor.pullPolicy | default "Always" }}'
         name: "{{ .Chart.Name }}-interceptor"
         env:
-        - name: KEDA_HTTP_ROUTING_TABLE_UPDATE_DURATION_MS
-          value: "{{ .Values.interceptor.routingTableUpdateDurationMS }}"
         - name: KEDA_HTTP_CURRENT_NAMESPACE
           value: "{{ .Release.Namespace }}"
         - name: KEDA_HTTP_PROXY_PORT

http-add-on/templates/deployment-operator.yaml

@@ -48,8 +48,8 @@ spec:
               memory: 20Mi
         name: kube-rbac-proxy
       - args:
-        - --metrics-addr=127.0.0.1:8080
-        - --enable-leader-election
+        - --metrics-bind-address=127.0.0.1:8080
+        - --leader-elect
         - --admin-port={{ .Values.operator.adminPort }}
         image: "{{ .Values.images.operator }}:{{ .Values.images.tag | default .Chart.AppVersion }}"
         imagePullPolicy: '{{ .Values.operator.pullPolicy | default "Always" }}'

http-add-on/templates/rbac-interceptor.yml

@@ -1,6 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
+kind: ClusterRole
 metadata:
+  creationTimestamp: null
   labels:
     httpscaledobjects.http.keda.sh/version: {{ .Values.images.tag | default .Chart.AppVersion }}
     keda.sh/addon: {{ .Chart.Name }}
@@ -9,61 +10,25 @@ metadata:
     app.kubernetes.io/name: {{ .Chart.Name }}-interceptor
     {{- include "keda-addons-http.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-interceptor
-  namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups:
-  - ""
+  - apps
   resources:
-  - configmaps
+  - deployments
   verbs:
   - get
   - list
   - watch
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  creationTimestamp: null
-  labels:
-    httpscaledobjects.http.keda.sh/version: {{ .Values.images.tag | default .Chart.AppVersion }}
-    keda.sh/addon: {{ .Chart.Name }}
-    app: {{ .Chart.Name }}
-    name: {{ .Chart.Name }}-interceptor
-    app.kubernetes.io/name: {{ .Chart.Name }}-interceptor
-    {{- include "keda-addons-http.labels" . | indent 4 }}
-  name: {{ .Chart.Name }}-interceptor
-rules:
 - apiGroups:
-  - apps
+  - http.keda.sh
   resources:
-  - deployments
+  - httpscaledobjects
   verbs:
   - get
   - list
   - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  labels:
-    httpscaledobjects.http.keda.sh/version: {{ .Values.images.tag | default .Chart.AppVersion }}
-    keda.sh/addon: {{ .Chart.Name }}
-    app: {{ .Chart.Name }}
-    name: {{ .Chart.Name }}-interceptor
-    app.kubernetes.io/name: {{ .Chart.Name }}-interceptor
-    {{- include "keda-addons-http.labels" . | indent 4 }}
-  name: {{ .Chart.Name }}-interceptor
-  namespace: {{ .Release.Namespace }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ .Chart.Name }}-interceptor
-subjects:
-- kind: ServiceAccount
-  name: {{ .Chart.Name }}-interceptor
-  namespace: {{ .Release.Namespace }}
----
-apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:

http-add-on/templates/rbac-operator.yml

@@ -11,18 +11,6 @@ metadata:
   name: {{ .Chart.Name }}-role
   namespace: {{ .Release.Namespace }}
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
 - apiGroups:
   - ""
   resources:

http-add-on/templates/rbac-scaler.yml

@@ -1,6 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
+kind: ClusterRole
 metadata:
+  creationTimestamp: null
   labels:
     httpscaledobjects.http.keda.sh/version: {{ .Values.images.tag | default .Chart.AppVersion }}
     keda.sh/addon: {{ .Chart.Name }}
@@ -9,69 +10,33 @@ metadata:
     app.kubernetes.io/name: {{ .Chart.Name }}-external-scaler
     {{- include "keda-addons-http.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-external-scaler
-  namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups:
   - ""
   resources:
-  - configmaps
+  - endpoints
   verbs:
   - get
   - list
   - watch
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  creationTimestamp: null
-  labels:
-    httpscaledobjects.http.keda.sh/version: {{ .Values.images.tag | default .Chart.AppVersion }}
-    keda.sh/addon: {{ .Chart.Name }}
-    app: {{ .Chart.Name }}
-    name: {{ .Chart.Name }}-external-scaler
-    app.kubernetes.io/name: {{ .Chart.Name }}-external-scaler
-    {{- include "keda-addons-http.labels" . | indent 4 }}
-  name: {{ .Chart.Name }}-external-scaler
-rules:
 - apiGroups:
-  - ""
+  - apps
   resources:
-  - endpoints
+  - deployments
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - apps
+  - http.keda.sh
   resources:
-  - deployments
+  - httpscaledobjects
   verbs:
   - get
   - list
   - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  labels:
-    httpscaledobjects.http.keda.sh/version: {{ .Values.images.tag | default .Chart.AppVersion }}
-    keda.sh/addon: {{ .Chart.Name }}
-    app: {{ .Chart.Name }}
-    name: {{ .Chart.Name }}-external-scaler
-    app.kubernetes.io/name: {{ .Chart.Name }}-external-scaler
-    {{- include "keda-addons-http.labels" . | indent 4 }}
-  name: {{ .Chart.Name }}-external-scaler
-  namespace: {{ .Release.Namespace }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ .Chart.Name }}-external-scaler
-subjects:
-- kind: ServiceAccount
-  name: {{ .Chart.Name }}-external-scaler
-  namespace: {{ .Release.Namespace }}
----
-apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:

http-add-on/values.yaml

@@ -98,8 +98,6 @@ interceptor:
     # -- The interval (in milliseconds) that KEDA should poll the external scaler to fetch scaling metrics about the interceptor
     pollingInterval: 1
 
-  # -- How often (in milliseconds) each interceptor replica should update its in-memory routing table from the central routing table copy. The interceptor will also use Kubernetes events to stay up-to-date with routing table changes. This duration is the maximum time it will take to get a routing table update
-  routingTableUpdateDurationMS: 500
   # -- How long the interceptor waits to establish TCP connections with backends before failing a request.
   tcpConnectTimeout: 500ms
   # -- The interceptor's connection keep alive timeout