add fields to openAPIV3Schema

Author: Erich Shan

Makefile

@@ -3,9 +3,9 @@
 ##################################################
 SHELL           = /bin/bash
 
-IMAGE_REGISTRY 	?= ghcr.io
+IMAGE_REGISTRY 	?= navigation-docker.artifactory.teslamotors.com
 IMAGE_REPO     	?= kedacore
-VERSION 		?= main
+VERSION 		?= header-based-routing
 
 IMAGE_OPERATOR 		?= ${IMAGE_REGISTRY}/${IMAGE_REPO}/http-add-on-operator
 IMAGE_INTERCEPTOR	?= ${IMAGE_REGISTRY}/${IMAGE_REPO}/http-add-on-interceptor

config/crd/bases/http.keda.sh_httpscaledobjects.yaml

@@ -78,6 +78,26 @@ spec:
                 items:
                   type: string
                 type: array
+              headers:
+                description: |-
+                  The custom headers used to route. Once Hosts and PathPrefixes have been matched,
+                  if at least one header in the http request matches at least one header
+                  in .spec.headers, it will be routed to the Service and Port specified in
+                  the scaleTargetRef. First header it matches with, it will be routed to.
+                  If the headers can't be matched, then use first one without .spec.headers supplied
+                  If that doesn't exist then routing will fail.
+                items:
+                  type: object
+                  properties:
+                    name:
+                      type: string
+                    value:
+                      type: string
+                  required:
+                    - name
+                    - value
+                type: array
+                uniqueItems: true
               replicas:
                 description: (optional) Replica information
                 properties:

operator/apis/http/v1alpha1/httpscaledobject_types.go

@@ -76,6 +76,11 @@ type RateMetricSpec struct {
 	Granularity metav1.Duration `json:"granularity" description:"Time granularity for rate calculation"`
 }
 
+type Header struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+}
+
 // HTTPScaledObjectSpec defines the desired state of HTTPScaledObject
 type HTTPScaledObjectSpec struct {
 	// The hosts to route. All requests which the "Host" header
@@ -96,7 +101,7 @@ type HTTPScaledObjectSpec struct {
 	// If the headers can't be matched, then use first one without .spec.headers supplied
 	// If that doesn't exist then routing will fail.
 	// +optional
-	Headers map[string]string `json:"headers,omitempty"`
+	Headers []Header `json:"headers,omitempty"`
 	// The name of the deployment to route HTTP requests to (and to autoscale).
 	// Including validation as a requirement to define either the PortName or the Port
 	// +kubebuilder:validation:XValidation:rule="has(self.portName) != has(self.port)",message="must define either the 'portName' or the 'port'"

pkg/routing/tablememory.go

@@ -106,10 +106,10 @@ func (tm tableMemory) RouteWithHeaders(key Key, httpHeaders map[string][]string)
 	// route to first httpso which has a matching header
 	for _, httpso := range httpsoList.Items {
 		if httpso.Spec.Headers != nil {
-			for k, v1 := range httpso.Spec.Headers {
-				if headerValues, exists := httpHeaders[k]; exists {
-					for _, v2 := range headerValues {
-						if v1 == v2 {
+			for _, header := range httpso.Spec.Headers {
+				if headerValues, exists := httpHeaders[header.Name]; exists {
+					for _, v := range headerValues {
+						if header.Value == v {
 							return httpso
 						}
 					}