Template httpListener and remove unused variables

wso2 · Dec 8, 2023 · 7bebca2 · 7bebca2
1 parent 2833055
commit 7bebca2
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 46 deletions.
diff --git a/adapter/internal/discovery/xds/server.go b/adapter/internal/discovery/xds/server.go
@@ -112,7 +112,7 @@ var (
 	gatewayLabelConfigMap map[string]*EnvoyGatewayConfig // GW-Label -> EnvoyGatewayConfig struct map
 
 	// Listener as map key
-	listenerToRouteArrayMap map[string]envoyRoutesWithSectionName // Listener -> Routes map
+	listenerToRouteArrayMap map[string][]*routev3.Route // Listener -> Routes map
 
 	// Common Enforcer Label as map key
 	// TODO(amali) This doesn't have a usage yet. It will be used to handle multiple enforcer labels in future.
@@ -136,7 +136,6 @@ const (
 
 type envoyRoutesWithSectionName struct {
 	routes []*routev3.Route
-	sectionName string
 }
 
 func maxRandomBigInt() *big.Int {
@@ -167,7 +166,7 @@ func init() {
 	enforcerThrottleDataCache = wso2_cache.NewSnapshotCache(false, IDHash{}, nil)
 	enforcerJwtIssuerCache = wso2_cache.NewSnapshotCache(false, IDHash{}, nil)
 	gatewayLabelConfigMap = make(map[string]*EnvoyGatewayConfig)
-	listenerToRouteArrayMap = make(map[string]envoyRoutesWithSectionName)
+	listenerToRouteArrayMap = make(map[string][]*routev3.Route)
 	orgAPIMap = make(map[string]map[string]*EnvoyInternalAPI)
 	orgIDAPIvHostsMap = make(map[string]map[string][]string) // organizationID -> UUID-prod/sand -> Envoy Vhost Array map
 	orgIDvHostBasepathMap = make(map[string]map[string]string)
@@ -880,21 +879,14 @@ func UpdateAPICache(vHosts []string, newLabels []string, listener string, sectio
 			enforcerAPI:        oasParser.GetEnforcerAPI(adapterInternalAPI, vHost),
 		}
 		if _, ok := listenerToRouteArrayMap[listener]; ok {
-			routesList := listenerToRouteArrayMap[listener].routes
+			routesList := listenerToRouteArrayMap[listener]
 			if (routesList == nil) {
 				routesList = make([]*routev3.Route, 0)
 			}
-			routesList = append(listenerToRouteArrayMap[listener].routes, routes...)
-
-			listenerToRouteArrayMap[listener] = envoyRoutesWithSectionName{
-				routes: routesList,
-				sectionName: sectionName,
-			}
+			routesList = append(routesList, routes...)
+			listenerToRouteArrayMap[listener] = routesList
 		} else {
-			listenerToRouteArrayMap[listener] = envoyRoutesWithSectionName{
-				routes: routes,
-				sectionName: sectionName,
-			}
+			listenerToRouteArrayMap[listener] = routes
 		}
 
 		revisionStatus := updateXdsCacheOnAPIChange(oldLabels, newLabels)

diff --git a/adapter/internal/operator/controllers/dp/gateway_controller.go b/adapter/internal/operator/controllers/dp/gateway_controller.go
@@ -191,7 +191,6 @@ func (gatewayReconciler *GatewayReconciler) Reconcile(ctx context.Context, req c
 		*gatewayReconciler.ch <- synchronizer.GatewayEvent{EventType: constants.Update, Event: cachedGateway}
 		gatewayReconciler.handleGatewayStatus(req.NamespacedName, constants.Update, events)
 	}
-	//Update the ods data in xds data holder
 	setReadiness.Do(gatewayReconciler.setGatewayReadiness)
 	return ctrl.Result{}, nil
 }

diff --git a/adapter/internal/operator/synchronizer/synchronizer.go b/adapter/internal/operator/synchronizer/synchronizer.go
@@ -195,7 +195,7 @@ func GenerateAdapterInternalAPI(apiState APIState, httpRoute *HTTPRouteState, en
 	listeners, relativeSectionNames := getListenersForAPI(httpRoute.HTTPRouteCombined, adapterInternalAPI.UUID)
 	// We dont have a use case where a perticular API's two different http routes refer to two different gateway. Hence get the first listener name for the list for processing.
 	if len(listeners) == 0 || len(relativeSectionNames) == 0 {
-		loggers.LoggerAPKOperator.ErrorC(logging.PrintError(logging.Error2633, logging.MAJOR, "Failed to find a matching listener for http route: %v. ",
+		loggers.LoggerAPKOperator.ErrorC(logging.PrintError(logging.Error2633, logging.MINOR, "Failed to find a matching listener for http route: %v. ",
 			httpRoute.HTTPRouteCombined.Name))
 		return nil, errors.New("failed to find matching listener name for the provided http route")
 	}

diff --git a/helm-charts/README.md b/helm-charts/README.md
@@ -41,6 +41,9 @@ A Helm chart for APK components
 | wso2.apk.idp.signing.fileName | string | `""` | IDP jwt signing certificate file name |
 | wso2.apk.dp.enabled | bool | `true` | Enable the deployment of the Data Plane |
 | wso2.apk.dp.environment.name | string | `Default` | Environment of the Data Plane |
+| wso2.apk.dp.gateway.httpListener.enabled | bool | `false` | HTTP listener enabled or not |
+| wso2.apk.dp.gateway.httpListener.hostname | string | `"api.am.wso2.com"` | HTTP listener hostname |
+| wso2.apk.dp.gateway.httpListener.port | int | `9080` | HTTP listener port |
 | wso2.apk.dp.gateway.listener.hostname | string | `"gw.wso2.com"` | Gateway Listener Hostname |
 | wso2.apk.dp.gateway.listener.secretName | string | `""` | Gateway Listener Certificate Secret Name |
 | wso2.apk.dp.gateway.listener.dns | list | `["*.gw.wso2.com","*.sandbox.gw.wso2.com","prod.gw.wso2.com"]` | DNS entries for gateway listener certificate |

diff --git a/helm-charts/templates/_helpers.tpl b/helm-charts/templates/_helpers.tpl
@@ -114,22 +114,3 @@ env:
 - "prod.gw.wso2.com"
 {{- end -}}
 {{- end -}}
-
-{{- define "exposeContainerPorts" -}}
-{{- if . -}}
-{{ range $val := . }}
-- containerPort: {{ $val }}
-  protocol: "TCP"
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "exposeServicePorts" -}}
-{{- if . -}}
-{{ range $val := . }}
-- name: "endpoint-{{ $val }}"
-  protocol: TCP
-  port: {{ $val }}
-{{- end -}}
-{{- end -}}
-{{- end -}}
diff --git a/helm-charts/templates/data-plane/gateway-components/adapter/gateway.yaml b/helm-charts/templates/data-plane/gateway-components/adapter/gateway.yaml
@@ -9,13 +9,12 @@ metadata:
 spec:
   gatewayClassName: "default"
   listeners:
-    - allowedRoutes:
-        namespaces:
-          from: Same
-      hostname: "{{ .Values.wso2.apk.listener.hostname | default "api.am.wso2.com"}}"
-      name: httplistener
-      port: 9080
+    {{ if and .Values.wso2.apk.dp.gateway.httpListener .Values.wso2.apk.dp.gateway.httpListener.enabled }}
+    - name: httplistener
+      hostname: "{{ .Values.wso2.apk.dp.gateway.httpListener.hostname | default "api.am.wso2.com"}}"
+      port: {{ .Values.wso2.apk.dp.gateway.httpListener.port | default 9080}}
       protocol: HTTP
+    {{ end }}
     {{ if or .Values.wso2.apk.dp.enabled .Values.wso2.apk.cp.enabled }}
     - name: httpslistener
       hostname: "{{ .Values.wso2.apk.listener.hostname | default "api.am.wso2.com"}}"

diff --git a/...s/templates/data-plane/gateway-components/gateway-runtime/gateway-runtime-deployment.yaml b/...s/templates/data-plane/gateway-components/gateway-runtime/gateway-runtime-deployment.yaml
@@ -250,7 +250,12 @@ spec:
           image: {{ .Values.wso2.apk.dp.gatewayRuntime.deployment.router.image }}
           imagePullPolicy: {{ .Values.wso2.apk.dp.gatewayRuntime.deployment.router.imagePullPolicy }}
           ports:
-{{- include "exposeContainerPorts" .Values.wso2.apk.dp.gateway.listener.ports | indent 12}}
+            {{ if and .Values.wso2.apk.dp.gateway.httpListener .Values.wso2.apk.dp.gateway.httpListener.enabled }}
+            - containerPort: {{ .Values.wso2.apk.dp.gateway.httpListener.port | default 9080}}
+              protocol: "TCP"
+            {{ end }}
+            - containerPort: 9095
+              protocol: "TCP"
             - containerPort: 9090
               protocol: "TCP"
             - containerPort: 9091

diff --git a/helm-charts/templates/data-plane/gateway-components/gateway-runtime/gateway-service.yaml b/helm-charts/templates/data-plane/gateway-components/gateway-runtime/gateway-service.yaml
@@ -30,5 +30,12 @@ spec:
   selector:
 {{ include "apk-helm.pod.selectorLabels" (dict "root" . "app" "gateway" ) | indent 4}}
   ports:
-{{- include "exposeServicePorts" .Values.wso2.apk.dp.gateway.listener.ports | indent 4}}
+{{ if and .Values.wso2.apk.dp.gateway.httpListener .Values.wso2.apk.dp.gateway.httpListener.enabled }}
+  - name: "http-endpoint"
+    protocol: TCP
+    port: {{ .Values.wso2.apk.dp.gateway.httpListener.port | default 9080 }}
+{{ end }}
+  - name: "https-endpoint"
+    protocol: TCP
+    port: 9095
 {{- end -}}
diff --git a/helm-charts/values.yaml b/helm-charts/values.yaml
@@ -153,9 +153,6 @@ wso2:
       gateway:
         listener:
           hostname: "gw.wso2.com"
-          ports: 
-            - 9095
-            - 9080
           # secretName: "idp-tls"
       # partitionServer:
       #   enabled: false

diff --git a/helm-charts/values.yaml.template b/helm-charts/values.yaml.template
@@ -257,6 +257,13 @@ wso2:
             - "*.gw.wso2.com"
             - "*.sandbox.gw.wso2.com"
             - "prod.gw.wso2.com"
+        httpListener: 
+          # -- HTTP listener enabled or not
+          enabled: false
+          # -- HTTP listener hostname
+          hostname: "api.am.wso2.com"
+          # -- HTTP listener port
+          port: 9080
         autoscaling:
           # -- Enable autoscaling for Gateway
           enabled: false