Disable stats port for haproxy

Issue-ID: AAI-2395
Change-Id: Id25a4f0a0770a62a8d1e78d0affcf210c93fbdd0
Signed-off-by: Harish Venkata Kajur <vk250x@att.com>

diff --git a/resources/config/haproxy/haproxy.cfg b/resources/config/haproxy/haproxy.cfg
index 8beae0e..3ffaa0f 100644 (file)
--- a/resources/config/haproxy/haproxy.cfg
+++ b/resources/config/haproxy/haproxy.cfg
@@ -125,14 +125,3 @@ backend IST_AAI_8446
         http-response set-header Strict-Transport-Security max-age=16000000;\ includeSubDomains;\ preload;
         server aai-traversal.{{.Release.Namespace}} aai-traversal.{{.Release.Namespace}}.svc.cluster.local:8446 resolvers kubernetes check check-ssl port 8446 ssl verify none
 
-listen IST_AAI_STATS
-        mode http
-        bind *:8080
-        stats uri /stats
-        stats enable
-        stats refresh 30s
-        stats hide-version
-        stats auth admin:admin
-        stats show-legends
-        stats show-desc IST AAI APPLICATION NODES
-        stats admin if TRUE

diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index 8c10730..d32f952 100644 (file)
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -75,20 +75,19 @@ spec:
           subPath: aai.pem
         ports:
         - containerPort: {{ .Values.service.internalPort }}
-        - containerPort: {{ .Values.service.internalPort2 }}
         # disable liveness probe when breakpoints set in debugger
         # so K8s doesn't restart unresponsive container
         {{- if eq .Values.liveness.enabled true }}
         livenessProbe:
           tcpSocket:
-            port: {{ .Values.service.internalPort2 }}
+            port: {{ .Values.service.internalPort }}
           initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
         {{ end -}}
         readinessProbe:
           httpGet:
             path: /aai/util/echo
-            port: {{ .Values.service.internalPort2 }}
+            port: {{ .Values.service.internalPort }}
             scheme: HTTPS
             httpHeaders:
             - name: X-FromAppId

diff --git a/templates/service.yaml b/templates/service.yaml
index 91bdb2e..28df229 100644 (file)
--- a/templates/service.yaml
+++ b/templates/service.yaml
@@ -29,17 +29,10 @@ spec:
     port: {{ .Values.service.externalPort }}
     targetPort: {{ .Values.service.internalPort }}
     nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-  - name: {{ .Values.service.portName2 }}
-    port: {{ .Values.service.externalPort2 }}
-    targetPort: {{ .Values.service.internalPort2 }}
-    nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
   {{- else -}}
   - port: {{ .Values.service.externalPort }}
     targetPort: {{ .Values.service.internalPort }}
     name: {{ .Values.service.portName }}
-  - port: {{ .Values.service.externalPort2 }}
-    targetPort: {{ .Values.service.internalPort2 }}
-    name: {{ .Values.service.portName2 }}
   {{- end}}
   type: {{ .Values.service.type }}
   selector:

diff --git a/values.yaml b/values.yaml
index b2e17af..75f372e 100644 (file)
--- a/values.yaml
+++ b/values.yaml
@@ -343,14 +343,10 @@ readiness:
 
 service:
   type: NodePort
-  portName: aai
-  externalPort: 8080
-  internalPort: 8080
-  nodePort: 32
-  portName2: aai-ssl
-  externalPort2: 8443
-  internalPort2: 8443
-  nodePort2: 33
+  portName: aai-ssl
+  externalPort: 8443
+  internalPort: 8443
+  nodePort: 33
   # POLICY hotfix - Note this must be temporary
   # See https://jira.onap.org/browse/POLICY-510
   aaiServiceClusterIp: