From 511c9a30e5decd05b461b8df201ef47e4eaddedd Mon Sep 17 00:00:00 2001
From: Dmitry Dunaev <dmitry@opsfleet.com>
Date: Fri, 28 Jan 2022 16:29:09 +0300
Subject: [PATCH] [WIFI-6837] Del: helm values that are moved to deploy chart

Signed-off-by: Dmitry Dunaev <dmitry@opsfleet.com>
---
 helm/ucentral/values.ucentral-qa.yaml | 57 ++++-----------------------
 1 file changed, 8 insertions(+), 49 deletions(-)

diff --git a/helm/ucentral/values.ucentral-qa.yaml b/helm/ucentral/values.ucentral-qa.yaml
index 360d377e8..38889c141 100644
--- a/helm/ucentral/values.ucentral-qa.yaml
+++ b/helm/ucentral/values.ucentral-qa.yaml
@@ -6,13 +6,6 @@ owgw:
         exec:
           command: ["true"]
 
-  services:
-    owgw:
-      type: ClusterIP
-
-  configProperties:
-    rtty.enabled: "true"
-
   resources:
     requests:
       cpu: 100m
@@ -63,6 +56,7 @@ owgw:
 
   public_env_variables:
     SELFSIGNED_CERTS: "true"
+
   configProperties:
     openwifi.internal.restapi.host.0.rootca: $OWGW_ROOT/certs/restapi-certs/ca.crt
     openwifi.internal.restapi.host.0.cert: $OWGW_ROOT/certs/restapi-certs/tls.crt
@@ -70,6 +64,7 @@ owgw:
     openwifi.restapi.host.0.rootca: $OWGW_ROOT/certs/restapi-certs/ca.crt
     openwifi.restapi.host.0.cert: $OWGW_ROOT/certs/restapi-certs/tls.crt
     openwifi.restapi.host.0.key: $OWGW_ROOT/certs/restapi-certs/tls.key
+
   volumes:
     owgw:
       - name: config
@@ -115,10 +110,6 @@ owsec:
         exec:
           command: ["true"]
 
-  services:
-    owsec:
-      type: ClusterIP
-
   resources:
     requests:
       cpu: 10m
@@ -157,6 +148,7 @@ owsec:
 
   public_env_variables:
     SELFSIGNED_CERTS: "true"
+
   configProperties:
     openwifi.internal.restapi.host.0.rootca: $OWSEC_ROOT/certs/restapi-certs/ca.crt
     openwifi.internal.restapi.host.0.cert: $OWSEC_ROOT/certs/restapi-certs/tls.crt
@@ -164,6 +156,7 @@ owsec:
     openwifi.restapi.host.0.rootca: $OWSEC_ROOT/certs/restapi-certs/ca.crt
     openwifi.restapi.host.0.cert: $OWSEC_ROOT/certs/restapi-certs/tls.crt
     openwifi.restapi.host.0.key: $OWSEC_ROOT/certs/restapi-certs/tls.key
+
   volumes:
     owsec:
       - name: config
@@ -197,12 +190,6 @@ owsec:
             secretName: {{ include "owsec.fullname" . }}-owsec-restapi-tls
 
 rttys:
-  enabled: true
-
-  services:
-    rttys:
-      type: ClusterIP
-
   resources:
     requests:
       cpu: 10m
@@ -215,10 +202,6 @@ rttys:
     cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
 
 owgwui:
-  services:
-    owgwui:
-      type: NodePort
-
   ingresses:
     default:
       enabled: true
@@ -234,9 +217,6 @@ owgwui:
         serviceName: owgwui
         servicePort: http
 
-  public_env_variables:
-    ALLOW_UCENTRALSEC_CHANGE: false
-
   resources:
     requests:
       cpu: 10m
@@ -256,10 +236,6 @@ owfms:
         exec:
           command: ["true"]
 
-  services:
-    owfms:
-      type: ClusterIP
-
   resources:
     requests:
       cpu: 10m
@@ -298,6 +274,7 @@ owfms:
 
   public_env_variables:
     SELFSIGNED_CERTS: "true"
+
   configProperties:
     openwifi.internal.restapi.host.0.rootca: $OWFMS_ROOT/certs/restapi-certs/ca.crt
     openwifi.internal.restapi.host.0.cert: $OWFMS_ROOT/certs/restapi-certs/tls.crt
@@ -305,6 +282,7 @@ owfms:
     openwifi.restapi.host.0.rootca: $OWFMS_ROOT/certs/restapi-certs/ca.crt
     openwifi.restapi.host.0.cert: $OWFMS_ROOT/certs/restapi-certs/tls.crt
     openwifi.restapi.host.0.key: $OWFMS_ROOT/certs/restapi-certs/tls.key
+
   volumes:
     owfms:
       - name: config
@@ -344,10 +322,6 @@ owprov:
         exec:
           command: ["true"]
  
-  services:
-    owprov:
-      type: ClusterIP
-
   resources:
     requests:
       cpu: 10m
@@ -386,6 +360,7 @@ owprov:
 
   public_env_variables:
     SELFSIGNED_CERTS: "true"
+
   configProperties:
     openwifi.internal.restapi.host.0.rootca: $OWPROV_ROOT/certs/restapi-certs/ca.crt
     openwifi.internal.restapi.host.0.cert: $OWPROV_ROOT/certs/restapi-certs/tls.crt
@@ -393,6 +368,7 @@ owprov:
     openwifi.restapi.host.0.rootca: $OWPROV_ROOT/certs/restapi-certs/ca.crt
     openwifi.restapi.host.0.cert: $OWPROV_ROOT/certs/restapi-certs/tls.crt
     openwifi.restapi.host.0.key: $OWPROV_ROOT/certs/restapi-certs/tls.key
+
   volumes:
     owprov:
       - name: config
@@ -426,10 +402,6 @@ owprov:
             secretName: {{ include "owprov.fullname" . }}-owprov-restapi-tls
 
 owprovui:
-  services:
-    owprovui:
-      type: NodePort
-
   ingresses:
     default:
       enabled: true
@@ -445,17 +417,6 @@ owprovui:
         serviceName: owprovui
         servicePort: http
 
-  public_env_variables:
-    ALLOW_UCENTRALSEC_CHANGE: false
-
-#  resources:
-#    requests:
-#      cpu: 10m
-#      memory: 30m
-#    limits:
-#      cpu: 100m
-#      memory: 100m
-
   podAnnotations:
     cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
 
@@ -491,9 +452,7 @@ clustersysteminfo:
   delay: 60 # delaying to wait for AWS Route53 DNS propagation
 
 haproxy:
-  enabled: true
   service:
-    type: LoadBalancer
     annotations:
       service.beta.kubernetes.io/aws-load-balancer-backend-protocol: ssl
       service.beta.kubernetes.io/aws-load-balancer-healthcheck-port: "8080"