Merge branch 'main' of https://github.com/sassoftware/viya4-deployment into viyaipv6_contour

Author: Abhishek Kumar

examples/ansible-vars-iac.yaml

@@ -20,7 +20,7 @@ V4_CFG_CR_USER: <container_registry_user>
 V4_CFG_CR_PASSWORD: <container_registry_password>
 
 ## Ingress
-V4_CFG_INGRESS_TYPE: ingress
+V4_CFG_INGRESS_TYPE: contour
 V4_CFG_INGRESS_FQDN: <desired_fqdn>
 V4_CFG_TLS_MODE: full-stack # [full-stack|front-door|ingress-only|disabled]
 

examples/ansible-vars.yaml

@@ -31,7 +31,7 @@ V4_CFG_CR_USER: <container_registry_user>
 V4_CFG_CR_PASSWORD: <container_registry_password>
 
 ## Ingress
-V4_CFG_INGRESS_TYPE: ingress
+V4_CFG_INGRESS_TYPE: contour
 V4_CFG_INGRESS_FQDN: <desired_fqdn>
 V4_CFG_TLS_MODE: full-stack # [full-stack|front-door|ingress-only|disabled]
 

roles/baseline/defaults/main.yml

@@ -225,6 +225,20 @@ CONTOUR_AZURE_LB_HEALTH_PROBE_CONFIG:
       annotations:
         service.beta.kubernetes.io/azure-load-balancer-health-probe-request-path: /healthz
 
+# Update default load-balancer for AWS to be NLB for Contour
+CONTOUR_AWS_NLB_CONFIG:
+  envoy:
+    service:
+      annotations:
+        service.beta.kubernetes.io/aws-load-balancer-type: nlb
+
+# Update LB for AWS, specify subnets to allocate internal IPs from for Contour
+CONTOUR_AWS_LB_SUBNETS:
+  envoy:
+    service:
+      annotations:
+        service.beta.kubernetes.io/aws-load-balancer-subnets: "{{ V4_CFG_AWS_LB_SUBNETS }}"
+
 ## Cluster Autoscaler
 CLUSTER_AUTOSCALER_ENABLED: true
 CLUSTER_AUTOSCALER_NAME: cluster-autoscaler
@@ -300,16 +314,29 @@ private_ingress:
         annotations:
           service.beta.kubernetes.io/aws-load-balancer-internal: "true"
           service.beta.kubernetes.io/aws-load-balancer-type: nlb
+    envoy:
+      service:
+        annotations:
+          service.beta.kubernetes.io/aws-load-balancer-internal: "true"
+          service.beta.kubernetes.io/aws-load-balancer-type: nlb
   azure:
     controller:
       service:
         annotations:
           service.beta.kubernetes.io/azure-load-balancer-internal: "true"
+    envoy:
+      service:
+        annotations:
+          service.beta.kubernetes.io/azure-load-balancer-internal: "true"
   gcp:
     controller:
       service:
         annotations:
           networking.gke.io/load-balancer-type: Internal
+    envoy:
+      service:
+        annotations:
+          networking.gke.io/load-balancer-type: Internal
 
 ## NIST Features
 V4_CFG_NIST_FEATURES_ENABLED: false

roles/baseline/tasks/contour.yaml

@@ -13,6 +13,47 @@
 # Chart URL: https://projectcontour.io/
 # Container registry: docker.io
 # Purpose: Alternative ingress controller (if selected).
+# Update CONTOUR_CONFIG with private ingress settings if running in private mode and provider is supported
+- name: Update CONTOUR_CONFIG to add private_ingress
+  set_fact:
+    CONTOUR_CONFIG: "{{ CONTOUR_CONFIG | combine(private_ingress[PROVIDER], recursive=True) }}"
+  when:
+    - V4_CFG_INGRESS_MODE == "private"
+    - PROVIDER in private_ingress
+  tags:
+    - install
+    - update
+
+# Update CONTOUR_CONFIG to use NLB for AWS
+- name: Update CONTOUR_CONFIG to use NLB for AWS
+  set_fact:
+    CONTOUR_CONFIG: "{{ CONTOUR_CONFIG | combine(CONTOUR_AWS_NLB_CONFIG, recursive=True) }}"
+  when:
+    - PROVIDER == "aws"
+  tags:
+    - install
+    - update
+
+# Add AWS load balancer subnets to the configuration if specified
+- name: Update CONTOUR_CONFIG annotations to include CONTOUR_AWS_LB_SUBNETS
+  set_fact:
+    CONTOUR_CONFIG: "{{ CONTOUR_CONFIG | combine(CONTOUR_AWS_LB_SUBNETS, recursive=True) }}"
+  when:
+    - PROVIDER == "aws"
+    - V4_CFG_AWS_LB_SUBNETS|length != 0
+  tags:
+    - install
+    - update
+
+# Add Azure load-balancer health probe request path to the configuration if provider is Azure
+- name: Update CONTOUR_CONFIG to add Azure load-balancer health probe request path
+  set_fact:
+    CONTOUR_CONFIG: "{{ CONTOUR_CONFIG | combine(CONTOUR_AZURE_LB_HEALTH_PROBE_CONFIG, recursive=True) }}"
+  when:
+    - PROVIDER == "azure"
+  tags:
+    - install
+    - update
 
 # Add Azure load-balancer health probe request path to the configuration if provider is Azure
 - name: Update CONTOUR_CONFIG to add Azure load-balancer health probe request path