Merge pull request #7764 from fosterseth/add-kubernetes_web_svc_type

Add kubernetes_web_svc_type variable to installer/inventory

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

installer/inventory

@@ -20,6 +20,7 @@ dockerhub_base=ansible
 # Kubernetes Install
 # kubernetes_context=test-cluster
 # kubernetes_namespace=awx
+# kubernetes_web_svc_type=NodePort
 # Optional Kubernetes Variables
 # pg_image_registry=docker.io
 # pg_serviceaccount=awx

installer/roles/kubernetes/defaults/main.yml

@@ -10,6 +10,7 @@ kubernetes_base_path: "{{ local_base_config_path|default('/tmp') }}/{{ kubernete
 
 kubernetes_awx_version: "{{ dockerhub_version }}"
 kubernetes_awx_image: "ansible/awx"
+kubernetes_web_svc_type: "NodePort"
 
 awx_psp_create: false
 awx_psp_name: 'awx'

installer/roles/kubernetes/templates/deployment.yml.j2

@@ -487,9 +487,13 @@ metadata:
   labels:
     name: {{ kubernetes_deployment_name }}-web-svc
 spec:
+  type: {{ kubernetes_web_svc_type }}
   ports:
     - name: http
       port: 80
+{% if kubernetes_web_svc_type == "ClusterIP" %}
+      nodePort: null
+{% endif %}
       targetPort: 8052
   selector:
     name: {{ kubernetes_deployment_name }}-web-deploy