Merge "[STRIMZI] Add kafka admin user"

diff --git a/kubernetes/contrib/components/awx/templates/service.yaml b/kubernetes/contrib/components/awx/templates/service.yaml
index 10f031d..85ec8c8 100755 (executable)
--- a/kubernetes/contrib/components/awx/templates/service.yaml
+++ b/kubernetes/contrib/components/awx/templates/service.yaml
@@ -49,7 +49,6 @@ spec:
   ports:
     - port: {{ .Values.service.web.externalPort }}
       targetPort: {{ .Values.service.web.internalPort }}
-      nodePort: {{ .Values.global.nodePortPrefixExt | default .Values.nodePortPrefixExt }}{{ .Values.service.web.nodePort }}
       name: {{ .Values.service.web.portName }}
   selector:
     app: {{ include "common.fullname" . }}

diff --git a/kubernetes/contrib/components/awx/values.yaml b/kubernetes/contrib/components/awx/values.yaml
index 0a247c5..44c5741 100755 (executable)
--- a/kubernetes/contrib/components/awx/values.yaml
+++ b/kubernetes/contrib/components/awx/values.yaml
@@ -92,11 +92,10 @@ service:
     internalPort: 15672
     externalPort: 15672
   web:
-    type: NodePort
+    type: ClusterIP
     portName: web
     internalPort: 8052
     externalPort: 8052
-    nodePort: 78
   rabbitmq:
     type: ClusterIP
     http: