From 3133f07edbfac1be74b1438f0389abbeb3137d7f Mon Sep 17 00:00:00 2001 From: Carsten Schafer Date: Wed, 10 Apr 2024 09:48:35 -0400 Subject: [PATCH] WIFI-13130 - add support for qa03 and dev03 env on another cluster Signed-off-by: Carsten Schafer --- chart/environment-values/.gitignore | 3 ++ chart/environment-values/deploy.sh | 7 ++-- .../values.openwifi-dev03.yaml | 22 +++++++++++++ ...alues.openwifi-qa.disable-radiusproxy.yaml | 7 ++++ .../values.openwifi-qa.owls-external.yaml | 32 +++++++++---------- .../values.openwifi-qa03.yaml | 29 +++++++++++++++++ 6 files changed, 80 insertions(+), 20 deletions(-) create mode 100644 chart/environment-values/.gitignore create mode 100644 chart/environment-values/values.openwifi-dev03.yaml create mode 100644 chart/environment-values/values.openwifi-qa.disable-radiusproxy.yaml create mode 100644 chart/environment-values/values.openwifi-qa03.yaml diff --git a/chart/environment-values/.gitignore b/chart/environment-values/.gitignore new file mode 100644 index 0000000..9e919eb --- /dev/null +++ b/chart/environment-values/.gitignore @@ -0,0 +1,3 @@ +_values.custom_*.yaml +certs/ +env_* diff --git a/chart/environment-values/deploy.sh b/chart/environment-values/deploy.sh index 88ba013..b031866 100755 --- a/chart/environment-values/deploy.sh +++ b/chart/environment-values/deploy.sh @@ -108,7 +108,7 @@ export OWRRM_VERSION_TAG=$(echo ${OWRRM_VERSION} | tr '/' '-') # Check deployment method that's required for this environment helm plugin install https://github.com/databus23/helm-diff || true if [[ "$DEPLOY_METHOD" == "git" ]] ; then - helm plugin install https://github.com/aslafy-z/helm-git --version 0.10.0 || true + helm plugin list | grep "^helm-git" || helm plugin install https://github.com/aslafy-z/helm-git || true rm -rf wlan-cloud-ucentral-deploy || true git clone https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy.git cd wlan-cloud-ucentral-deploy @@ -162,14 +162,13 @@ else export OWGW_SERVICE_DNS_RECORDS="" fi -envsubst < values.custom.tpl.yaml > values.custom-${NAMESPACE}.yaml +envsubst < values.custom.tpl.yaml > _values.custom-${NAMESPACE}.yaml -set -x helm upgrade --install --create-namespace --wait --timeout 60m \ --namespace openwifi-${NAMESPACE} \ ${VALUES_FILES_FLAGS[*]} \ ${EXTRA_VALUES_FLAGS[*]} \ - -f values.custom-${NAMESPACE}.yaml \ + -f _values.custom-${NAMESPACE}.yaml \ --set-file owgw.certs."restapi-cert\.pem"=$CERT_LOCATION \ --set-file owgw.certs."restapi-key\.pem"=$KEY_LOCATION \ --set-file owgw.certs."websocket-cert\.pem"=$CERT_LOCATION \ diff --git a/chart/environment-values/values.openwifi-dev03.yaml b/chart/environment-values/values.openwifi-dev03.yaml new file mode 100644 index 0000000..7f6fef2 --- /dev/null +++ b/chart/environment-values/values.openwifi-dev03.yaml @@ -0,0 +1,22 @@ +owgwui: + ingresses: + default: + annotations: + alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be + +owprovui: + ingresses: + default: + annotations: + alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be + +owrrm: + services: + owrrm: + annotations: + service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be + +haproxy: + service: + annotations: + service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be diff --git a/chart/environment-values/values.openwifi-qa.disable-radiusproxy.yaml b/chart/environment-values/values.openwifi-qa.disable-radiusproxy.yaml new file mode 100644 index 0000000..75f1c8e --- /dev/null +++ b/chart/environment-values/values.openwifi-qa.disable-radiusproxy.yaml @@ -0,0 +1,7 @@ +owgw: + configProperties: + radius.proxy.enable: "false" + radius.proxy.accounting.port: 1813 + radius.proxy.authentication.port: 1812 + radius.proxy.coa.port: 3799 + radsec.keepalive: 120 diff --git a/chart/environment-values/values.openwifi-qa.owls-external.yaml b/chart/environment-values/values.openwifi-qa.owls-external.yaml index aa61f16..6ae0f5d 100644 --- a/chart/environment-values/values.openwifi-qa.owls-external.yaml +++ b/chart/environment-values/values.openwifi-qa.owls-external.yaml @@ -11,26 +11,26 @@ owgw: service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:ap-south-1:289708231103:certificate/2cc8c764-11fd-411d-bf7d-a93f488f3f6c service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "16002,16003,17002" - configProperties: - simulatorid: 53494D020202 - storage.type: postgresql - storage.type.postgresql.host: owgw-pgsql - storage.type.postgresql.database: owgw - storage.type.postgresql.username: owgw - storage.type.postgresql.password: owgw - openwifi.certificates.allowmismatch: "true" + #configProperties: + #simulatorid: 53494D020202 + #storage.type: postgresql + #storage.type.postgresql.host: owgw-pgsql + #storage.type.postgresql.database: owgw + #storage.type.postgresql.username: owgw + #storage.type.postgresql.password: owgw + #openwifi.certificates.allowmismatch: "true" resources: requests: cpu: 2000m - memory: 3000Mi + memory: 3Gi limits: cpu: 2000m - memory: 3000Mi + memory: 8Gi - postgresql: - enabled: true - fullnameOverride: owgw-pgsql - postgresqlDatabase: owgw - postgresqlUsername: owgw - postgresqlPassword: owgw + #postgresql: + # enabled: true + # fullnameOverride: owgw-pgsql + # postgresqlDatabase: owgw + # postgresqlUsername: owgw + # postgresqlPassword: owgw diff --git a/chart/environment-values/values.openwifi-qa03.yaml b/chart/environment-values/values.openwifi-qa03.yaml new file mode 100644 index 0000000..51c217b --- /dev/null +++ b/chart/environment-values/values.openwifi-qa03.yaml @@ -0,0 +1,29 @@ + +owgw: + services: + owgw: + annotations: + service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be + +owgwui: + ingresses: + default: + annotations: + alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be + +owprovui: + ingresses: + default: + annotations: + alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be + +owrrm: + services: + owrrm: + annotations: + service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be + +haproxy: + service: + annotations: + service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be