Merge pull request #1764 from Tharsanan1/template-vhosts

Template vhosts
wso2 · Sep 26, 2023 · f686e87 · f686e87
2 parents 699299a + 730d17c
commit f686e87
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/helm-charts/README.md b/helm-charts/README.md
@@ -78,6 +78,7 @@ A Helm chart for APK components
 | wso2.apk.dp.configdeployer.deployment.configs.tls.secretName | string | `""` | TLS secret name for runtime public certificate. |
 | wso2.apk.dp.configdeployer.deployment.configs.tls.certKeyFilename | string | `""` | TLS certificate file name. |
 | wso2.apk.dp.configdeployer.deployment.configs.tls.certFilename | string | `""` | TLS certificate file name. |
+| wso2.apk.dp.configdeployer.vhosts | list | `[{"hosts":["gw.wso2.com"],"name":"default","type":"production"},{"hosts":["sandbox.gw.wso2.com"],"name":"default","type":"sandbox"}]` | List of vhost |
 | wso2.apk.dp.adapter.deployment.resources.requests.memory | string | `"128Mi"` | CPU request for the container |
 | wso2.apk.dp.adapter.deployment.resources.requests.cpu | string | `"100m"` | Memory request for the container |
 | wso2.apk.dp.adapter.deployment.resources.limits.memory | string | `"1028Mi"` | CPU limit for the container |

diff --git a/helm-charts/templates/_helpers.tpl b/helm-charts/templates/_helpers.tpl
@@ -83,4 +83,22 @@ env:
 {{- $list = append $list (printf "\"%s\"" .) }}
 {{- end }}
 {{- join ", " $list }}
-{{- end }}
+{{- end }}
+
+{{- define "generateVhosts" -}}
+{{- if . -}}
+{{- $vhosts := . -}}
+{{- range $vhost := $vhosts }}
+{{- printf "[[vhosts]]\n" -}}
+{{- printf "  name = \"%s\"\n" $vhost.name -}}
+{{- print "  hosts = [" -}}
+{{- $len := len $vhost.hosts -}}
+{{- range  $i, $host := $vhost.hosts }}
+{{- printf "\"%s\"" $host -}}
+{{- if lt $i (sub $len 1) }},{{ end }}
+{{- end }}
+{{- print "]\n" -}}
+{{- printf "  type = \"%s\"\n" $vhost.type -}}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/helm-charts/templates/data-plane/config-deployer/config-ds-configmap.yaml b/helm-charts/templates/data-plane/config-deployer/config-ds-configmap.yaml
@@ -32,6 +32,7 @@ data:
     [wso2.config_deployer_service.gatewayConfiguration]
     name = "default"
     listenerName = "httpslistener"
+{{ include "generateVhosts" .Values.wso2.apk.dp.configdeployer.vhosts | indent 4 }}
 {{if and .Values.wso2.apk.dp.partitionServer .Values.wso2.apk.dp.partitionServer.enabled}}
     [wso2.config_deployer_service.partitionServiceConfiguration]
     enabled = true

diff --git a/helm-charts/values.yaml.template b/helm-charts/values.yaml.template
@@ -164,6 +164,14 @@ wso2:
               certKeyFilename: ""
               # -- TLS certificate file name.
               certFilename: ""
+        # -- List of vhost
+        vhosts: 
+          - name: "default"
+            hosts: ["gw.wso2.com"]
+            type: "production"
+          - name: "default"
+            hosts: ["sandbox.gw.wso2.com"]
+            type: "sandbox"
       adapter:
         deployment:
           resources: