Browse Source

add ingress controller svc nodeport param (#11361)

Co-authored-by: mochizuki875 <mzk875@gmail.com>
pull/11546/head
k8s-infra-cherrypick-robot 3 months ago
committed by GitHub
parent
commit
1688e05651
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 0 deletions
  1. 2
      inventory/sample/group_vars/k8s_cluster/addons.yml
  2. 2
      roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml
  3. 6
      roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/svc-ingress-nginx.yml.j2

2
inventory/sample/group_vars/k8s_cluster/addons.yml

@ -100,6 +100,8 @@ rbd_provisioner_enabled: false
ingress_nginx_enabled: false
# ingress_nginx_host_network: false
# ingress_nginx_service_type: LoadBalancer
# ingress_nginx_service_nodeport_http: 30080
# ingress_nginx_service_nodeport_https: 30081
ingress_publish_status_address: ""
# ingress_nginx_nodeselector:
# kubernetes.io/os: "linux"

2
roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml

@ -2,6 +2,8 @@
ingress_nginx_namespace: "ingress-nginx"
ingress_nginx_host_network: false
ingress_nginx_service_type: LoadBalancer
ingress_nginx_service_nodeport_http: ""
ingress_nginx_service_nodeport_https: ""
ingress_publish_status_address: ""
ingress_nginx_nodeselector:
kubernetes.io/os: "linux"

6
roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/svc-ingress-nginx.yml.j2

@ -14,10 +14,16 @@ spec:
port: 80
targetPort: 80
protocol: TCP
{% if (ingress_nginx_service_type == 'NodePort' or ingress_nginx_service_type == 'LoadBalancer') and ingress_nginx_service_nodeport_http %}
nodePort: {{ingress_nginx_service_nodeport_http | int}}
{% endif %}
- name: https
port: 443
targetPort: 443
protocol: TCP
{% if (ingress_nginx_service_type == 'NodePort' or ingress_nginx_service_type == 'LoadBalancer') and ingress_nginx_service_nodeport_https %}
nodePort: {{ingress_nginx_service_nodeport_https | int}}
{% endif %}
selector:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/port-of: ingress-nginx

Loading…
Cancel
Save