[WIFI-3162] Chg: adapt deployment script to support systeminfo readiness check

This commit is contained in:
Dmitry Dunaev
2021-10-22 18:15:42 +03:00
parent 0494d2a811
commit e1fd3e208b
3 changed files with 27 additions and 0 deletions

View File

@@ -105,6 +105,7 @@ helm upgrade --install --create-namespace --wait --timeout 20m \
--set owgw.configProperties."openwifi\.system\.uri\.public"=https://gw-${NAMESPACE}.cicd.lab.wlan.tip.build:16002 \
--set owgw.configProperties."openwifi\.system\.uri\.private"=https://gw-${NAMESPACE}.cicd.lab.wlan.tip.build:17002 \
--set owgw.configProperties."openwifi\.system\.uri\.ui"=https://webui-${NAMESPACE}.cicd.lab.wlan.tip.build \
--set owgw.public_env_variables.OWSEC=sec-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \
--set owsec.services.owsec.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=sec-${NAMESPACE}.cicd.lab.wlan.tip.build \
--set owsec.configProperties."openwifi\.system\.uri\.public"=https://sec-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \
--set owsec.configProperties."openwifi\.system\.uri\.private"=https://sec-${NAMESPACE}.cicd.lab.wlan.tip.build:17001 \
@@ -117,10 +118,12 @@ helm upgrade --install --create-namespace --wait --timeout 20m \
--set owfms.configProperties."openwifi\.system\.uri\.public"=https://fms-${NAMESPACE}.cicd.lab.wlan.tip.build:16004 \
--set owfms.configProperties."openwifi\.system\.uri\.private"=https://fms-${NAMESPACE}.cicd.lab.wlan.tip.build:17004 \
--set owfms.configProperties."openwifi\.system\.uri\.ui"=https://webui-${NAMESPACE}.cicd.lab.wlan.tip.build \
--set owfms.public_env_variables.OWSEC=sec-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \
--set owprov.services.owprov.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=prov-${NAMESPACE}.cicd.lab.wlan.tip.build \
--set owprov.configProperties."openwifi\.system\.uri\.public"=https://prov-${NAMESPACE}.cicd.lab.wlan.tip.build:16005 \
--set owprov.configProperties."openwifi\.system\.uri\.private"=https://prov-${NAMESPACE}.cicd.lab.wlan.tip.build:17005 \
--set owprov.configProperties."openwifi\.system\.uri\.ui"=https://webui-${NAMESPACE}.cicd.lab.wlan.tip.build \
--set owprov.public_env_variables.OWSEC=sec-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \
--set owprovui.ingresses.default.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=provui-${NAMESPACE}.cicd.lab.wlan.tip.build \
--set owprovui.ingresses.default.hosts={provui-${NAMESPACE}.cicd.lab.wlan.tip.build} \
--set owprovui.public_env_variables.DEFAULT_UCENTRALSEC_URL=https://sec-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \

View File

@@ -19,6 +19,9 @@ owgw:
storage.type.postgresql.host: owgw-pgsql
storage.type.postgresql.database: owgw
public_env_variables:
READINESS_METHOD: systeminfo
certs:
restapi-ca.pem: |
-----BEGIN CERTIFICATE-----
@@ -66,6 +69,9 @@ owsec:
service.beta.kubernetes.io/aws-load-balancer-ssl-cert: "arn:aws:acm:us-east-2:289708231103:certificate/bfa89c7a-5b64-4a8a-bcfe-ffec655b5285"
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "16001,17001"
public_env_variables:
READINESS_METHOD: systeminfo
certs:
restapi-ca.pem: |
-----BEGIN CERTIFICATE-----
@@ -140,6 +146,9 @@ owfms:
service.beta.kubernetes.io/aws-load-balancer-ssl-cert: "arn:aws:acm:us-east-2:289708231103:certificate/bfa89c7a-5b64-4a8a-bcfe-ffec655b5285"
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "16004,17004"
public_env_variables:
READINESS_METHOD: systeminfo
certs:
restapi-ca.pem: |
-----BEGIN CERTIFICATE-----
@@ -177,6 +186,9 @@ owprov:
service.beta.kubernetes.io/aws-load-balancer-ssl-cert: "arn:aws:acm:us-east-2:289708231103:certificate/bfa89c7a-5b64-4a8a-bcfe-ffec655b5285"
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "16005,17005"
public_env_variables:
READINESS_METHOD: systeminfo
certs:
restapi-ca.pem: |
-----BEGIN CERTIFICATE-----

View File

@@ -16,6 +16,9 @@ owgw:
# rtty
rtty.enabled: "true"
public_env_variables:
READINESS_METHOD: systeminfo
certs:
restapi-ca.pem: |
-----BEGIN CERTIFICATE-----
@@ -53,6 +56,9 @@ owsec:
service.beta.kubernetes.io/aws-load-balancer-ssl-cert: "arn:aws:acm:us-east-2:289708231103:certificate/bfa89c7a-5b64-4a8a-bcfe-ffec655b5285"
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "16001,17001"
public_env_variables:
READINESS_METHOD: systeminfo
certs:
restapi-ca.pem: |
-----BEGIN CERTIFICATE-----
@@ -127,6 +133,9 @@ owfms:
service.beta.kubernetes.io/aws-load-balancer-ssl-cert: "arn:aws:acm:us-east-2:289708231103:certificate/bfa89c7a-5b64-4a8a-bcfe-ffec655b5285"
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "16004,17004"
public_env_variables:
READINESS_METHOD: systeminfo
certs:
restapi-ca.pem: |
-----BEGIN CERTIFICATE-----
@@ -164,6 +173,9 @@ owprov:
service.beta.kubernetes.io/aws-load-balancer-ssl-cert: "arn:aws:acm:us-east-2:289708231103:certificate/bfa89c7a-5b64-4a8a-bcfe-ffec655b5285"
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "16005,17005"
public_env_variables:
READINESS_METHOD: systeminfo
certs:
restapi-ca.pem: |
-----BEGIN CERTIFICATE-----