noironetworks · abhayycs · May 6, 2022
diff --git a/provision/acc_provision/acc_provision.py b/provision/acc_provision/acc_provision.py
@@ -198,7 +198,6 @@ def config_default():
             "snat_operator": {
                 "name": "snat-operator",
                 "watch_namespace": "",
-                "globalinfo_name": "snatglobalinfo",
                 "rdconfig_name": "routingdomain-config",
                 "port_range": {
                     "start": 5000,

diff --git a/provision/acc_provision/templates/aci-containers.yaml b/provision/acc_provision/templates/aci-containers.yaml
@@ -329,8 +329,11 @@ spec:
                     type: object
                   type: array
                 type: object
+              nodeName:
+                type: string
             required:
             - globalInfos
+            - nodeName
             type: object
           status:
             description: SnatGlobalInfoStatus defines the observed state of SnatGlobalInfo
@@ -2500,8 +2503,6 @@ spec:
             {% endif %}
             - name: ACI_SNAT_NAMESPACE
               value: "{{ config.kube_config.snat_operator.snat_namespace }}"
-            - name: ACI_SNAGLOBALINFO_NAME
-              value: "{{ config.kube_config.snat_operator.globalinfo_name }}"
             - name: ACI_RDCONFIG_NAME
               value: "{{ config.kube_config.snat_operator.rdconfig_name }}"
             - name: SYSTEM_NAMESPACE

diff --git a/provision/testdata/base_case.kube.yaml b/provision/testdata/base_case.kube.yaml
diff --git a/provision/testdata/base_case_ipv6.kube.yaml b/provision/testdata/base_case_ipv6.kube.yaml
diff --git a/provision/testdata/base_case_operator_cr.kube.yaml b/provision/testdata/base_case_operator_cr.kube.yaml
diff --git a/provision/testdata/base_case_operator_mode.kube.yaml b/provision/testdata/base_case_operator_mode.kube.yaml
diff --git a/provision/testdata/base_case_snat.inp.yaml b/provision/testdata/base_case_snat.inp.yaml
@@ -42,7 +42,6 @@ kube_config:
   use_ds_rolling_update: true
   snat_operator: 
     name: test_snat-operator
-    globalinfo_name: test_snatglobalinfo
     port_range:
       start: 6000
       end: 62000

diff --git a/provision/testdata/base_case_snat.kube.yaml b/provision/testdata/base_case_snat.kube.yaml
diff --git a/...a/base_case_tar/cluster-network-07-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml b/...a/base_case_tar/cluster-network-07-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml
@@ -58,8 +58,11 @@ spec:
                     type: object
                   type: array
                 type: object
+              nodeName:
+                type: string
             required:
             - globalInfos
+            - nodeName
             type: object
           status:
             description: SnatGlobalInfoStatus defines the observed state of SnatGlobalInfo

diff --git a/provision/testdata/base_case_tar/cluster-network-20-ConfigMap-aci-operator-config.yaml b/provision/testdata/base_case_tar/cluster-network-20-ConfigMap-aci-operator-config.yaml
diff --git a/...ision/testdata/base_case_tar/cluster-network-33-Deployment-aci-containers-controller.yaml b/...ision/testdata/base_case_tar/cluster-network-33-Deployment-aci-containers-controller.yaml
@@ -31,8 +31,6 @@ spec:
           value: ''
         - name: ACI_SNAT_NAMESPACE
           value: aci-containers-system
-        - name: ACI_SNAGLOBALINFO_NAME
-          value: snatglobalinfo
         - name: ACI_RDCONFIG_NAME
           value: routingdomain-config
         - name: SYSTEM_NAMESPACE

diff --git a/provision/testdata/base_case_upgrade.kube.yaml b/provision/testdata/base_case_upgrade.kube.yaml
diff --git a/...tdata/cloud_tar/cluster-network-09-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml b/...tdata/cloud_tar/cluster-network-09-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml
@@ -58,8 +58,11 @@ spec:
                     type: object
                   type: array
                 type: object
+              nodeName:
+                type: string
             required:
             - globalInfos
+            - nodeName
             type: object
           status:
             description: SnatGlobalInfoStatus defines the observed state of SnatGlobalInfo

diff --git a/provision/testdata/cloud_tar/cluster-network-22-ConfigMap-aci-operator-config.yaml b/provision/testdata/cloud_tar/cluster-network-22-ConfigMap-aci-operator-config.yaml
diff --git a/provision/testdata/cloud_tar/cluster-network-36-Deployment-aci-containers-controller.yaml b/provision/testdata/cloud_tar/cluster-network-36-Deployment-aci-containers-controller.yaml
@@ -44,8 +44,6 @@ spec:
           value: ''
         - name: ACI_SNAT_NAMESPACE
           value: aci-containers-system
-        - name: ACI_SNAGLOBALINFO_NAME
-          value: snatglobalinfo
         - name: ACI_RDCONFIG_NAME
           value: routingdomain-config
         - name: SYSTEM_NAMESPACE

diff --git a/provision/testdata/flavor_aks.kube.yaml b/provision/testdata/flavor_aks.kube.yaml
diff --git a/provision/testdata/flavor_cloud.kube.yaml b/provision/testdata/flavor_cloud.kube.yaml
diff --git a/provision/testdata/flavor_dockerucp.kube.yaml b/provision/testdata/flavor_dockerucp.kube.yaml
diff --git a/provision/testdata/flavor_eks.kube.yaml b/provision/testdata/flavor_eks.kube.yaml
diff --git a/provision/testdata/flavor_localhost.kube.yaml b/provision/testdata/flavor_localhost.kube.yaml
@@ -298,8 +298,11 @@ spec:
                     type: object
                   type: array
                 type: object
+              nodeName:
+                type: string
             required:
             - globalInfos
+            - nodeName
             type: object
           status:
             description: SnatGlobalInfoStatus defines the observed state of SnatGlobalInfo
@@ -2046,8 +2049,6 @@ spec:
           env:
             - name: ACI_SNAT_NAMESPACE
               value: "kube-system"
-            - name: ACI_SNAGLOBALINFO_NAME
-              value: "snatglobalinfo"
             - name: ACI_RDCONFIG_NAME
               value: "routingdomain-config"
             - name: SYSTEM_NAMESPACE

diff --git a/provision/testdata/flavor_openshift_310.kube.yaml b/provision/testdata/flavor_openshift_310.kube.yaml
diff --git a/provision/testdata/flavor_openshift_311.kube.yaml b/provision/testdata/flavor_openshift_311.kube.yaml
diff --git a/provision/testdata/flavor_openshift_43.kube.yaml b/provision/testdata/flavor_openshift_43.kube.yaml
diff --git a/...penshift_43_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml b/...penshift_43_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml
@@ -58,8 +58,11 @@ spec:
                     type: object
                   type: array
                 type: object
+              nodeName:
+                type: string
             required:
             - globalInfos
+            - nodeName
             type: object
           status:
             description: SnatGlobalInfoStatus defines the observed state of SnatGlobalInfo

diff --git a/...on/testdata/flavor_openshift_43_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml b/...on/testdata/flavor_openshift_43_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml
diff --git a/...data/flavor_openshift_43_tar/cluster-network-34-Deployment-aci-containers-controller.yaml b/...data/flavor_openshift_43_tar/cluster-network-34-Deployment-aci-containers-controller.yaml
@@ -31,8 +31,6 @@ spec:
           value: ''
         - name: ACI_SNAT_NAMESPACE
           value: aci-containers-system
-        - name: ACI_SNAGLOBALINFO_NAME
-          value: snatglobalinfo
         - name: ACI_RDCONFIG_NAME
           value: routingdomain-config
         - name: SYSTEM_NAMESPACE

diff --git a/provision/testdata/flavor_openshift_44_esx.kube.yaml b/provision/testdata/flavor_openshift_44_esx.kube.yaml
diff --git a/...hift_44_esx_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml b/...hift_44_esx_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml
@@ -58,8 +58,11 @@ spec:
                     type: object
                   type: array
                 type: object
+              nodeName:
+                type: string
             required:
             - globalInfos
+            - nodeName
             type: object
           status:
             description: SnatGlobalInfoStatus defines the observed state of SnatGlobalInfo

diff --git a/...estdata/flavor_openshift_44_esx_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml b/...estdata/flavor_openshift_44_esx_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml
diff --git a/.../flavor_openshift_44_esx_tar/cluster-network-34-Deployment-aci-containers-controller.yaml b/.../flavor_openshift_44_esx_tar/cluster-network-34-Deployment-aci-containers-controller.yaml
@@ -31,8 +31,6 @@ spec:
           value: ''
         - name: ACI_SNAT_NAMESPACE
           value: aci-containers-system
-        - name: ACI_SNAGLOBALINFO_NAME
-          value: snatglobalinfo
         - name: ACI_RDCONFIG_NAME
           value: routingdomain-config
         - name: SYSTEM_NAMESPACE

diff --git a/provision/testdata/flavor_openshift_44_openstack.kube.yaml b/provision/testdata/flavor_openshift_44_openstack.kube.yaml
diff --git a/...4_openstack_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml b/...4_openstack_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml
@@ -58,8 +58,11 @@ spec:
                     type: object
                   type: array
                 type: object
+              nodeName:
+                type: string
             required:
             - globalInfos
+            - nodeName
             type: object
           status:
             description: SnatGlobalInfoStatus defines the observed state of SnatGlobalInfo

diff --git a/...a/flavor_openshift_44_openstack_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml b/...a/flavor_openshift_44_openstack_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml
diff --git a/...r_openshift_44_openstack_tar/cluster-network-34-Deployment-aci-containers-controller.yaml b/...r_openshift_44_openstack_tar/cluster-network-34-Deployment-aci-containers-controller.yaml
@@ -31,8 +31,6 @@ spec:
           value: ''
         - name: ACI_SNAT_NAMESPACE
           value: aci-containers-system
-        - name: ACI_SNAGLOBALINFO_NAME
-          value: snatglobalinfo
         - name: ACI_RDCONFIG_NAME
           value: routingdomain-config
         - name: SYSTEM_NAMESPACE

diff --git a/provision/testdata/flavor_openshift_45_esx.kube.yaml b/provision/testdata/flavor_openshift_45_esx.kube.yaml
diff --git a/...hift_45_esx_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml b/...hift_45_esx_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml
@@ -58,8 +58,11 @@ spec:
                     type: object
                   type: array
                 type: object
+              nodeName:
+                type: string
             required:
             - globalInfos
+            - nodeName
             type: object
           status:
             description: SnatGlobalInfoStatus defines the observed state of SnatGlobalInfo

diff --git a/...estdata/flavor_openshift_45_esx_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml b/...estdata/flavor_openshift_45_esx_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml
diff --git a/.../flavor_openshift_45_esx_tar/cluster-network-34-Deployment-aci-containers-controller.yaml b/.../flavor_openshift_45_esx_tar/cluster-network-34-Deployment-aci-containers-controller.yaml
@@ -31,8 +31,6 @@ spec:
           value: ''
         - name: ACI_SNAT_NAMESPACE
           value: aci-containers-system
-        - name: ACI_SNAGLOBALINFO_NAME
-          value: snatglobalinfo
         - name: ACI_RDCONFIG_NAME
           value: routingdomain-config
         - name: SYSTEM_NAMESPACE

diff --git a/provision/testdata/flavor_openshift_45_openstack.kube.yaml b/provision/testdata/flavor_openshift_45_openstack.kube.yaml
diff --git a/...5_openstack_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml b/...5_openstack_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml
@@ -58,8 +58,11 @@ spec:
                     type: object
                   type: array
                 type: object
+              nodeName:
+                type: string
             required:
             - globalInfos
+            - nodeName
             type: object
           status:
             description: SnatGlobalInfoStatus defines the observed state of SnatGlobalInfo

diff --git a/...a/flavor_openshift_45_openstack_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml b/...a/flavor_openshift_45_openstack_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml
diff --git a/...r_openshift_45_openstack_tar/cluster-network-34-Deployment-aci-containers-controller.yaml b/...r_openshift_45_openstack_tar/cluster-network-34-Deployment-aci-containers-controller.yaml
@@ -31,8 +31,6 @@ spec:
           value: ''
         - name: ACI_SNAT_NAMESPACE
           value: aci-containers-system
-        - name: ACI_SNAGLOBALINFO_NAME
-          value: snatglobalinfo
         - name: ACI_RDCONFIG_NAME
           value: routingdomain-config
         - name: SYSTEM_NAMESPACE

diff --git a/provision/testdata/flavor_openshift_46_baremetal.kube.yaml b/provision/testdata/flavor_openshift_46_baremetal.kube.yaml
diff --git a/...6_baremetal_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml b/...6_baremetal_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml
@@ -58,8 +58,11 @@ spec:
                     type: object
                   type: array
                 type: object
+              nodeName:
+                type: string
             required:
             - globalInfos
+            - nodeName
             type: object
           status:
             description: SnatGlobalInfoStatus defines the observed state of SnatGlobalInfo

diff --git a/...a/flavor_openshift_46_baremetal_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml b/...a/flavor_openshift_46_baremetal_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml
diff --git a/...r_openshift_46_baremetal_tar/cluster-network-34-Deployment-aci-containers-controller.yaml b/...r_openshift_46_baremetal_tar/cluster-network-34-Deployment-aci-containers-controller.yaml
@@ -31,8 +31,6 @@ spec:
           value: ''
         - name: ACI_SNAT_NAMESPACE
           value: aci-containers-system
-        - name: ACI_SNAGLOBALINFO_NAME
-          value: snatglobalinfo
         - name: ACI_RDCONFIG_NAME
           value: routingdomain-config
         - name: SYSTEM_NAMESPACE

diff --git a/provision/testdata/flavor_openshift_46_esx.kube.yaml b/provision/testdata/flavor_openshift_46_esx.kube.yaml
diff --git a/...hift_46_esx_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml b/...hift_46_esx_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml
@@ -58,8 +58,11 @@ spec:
                     type: object
                   type: array
                 type: object
+              nodeName:
+                type: string
             required:
             - globalInfos
+            - nodeName
             type: object
           status:
             description: SnatGlobalInfoStatus defines the observed state of SnatGlobalInfo

diff --git a/...estdata/flavor_openshift_46_esx_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml b/...estdata/flavor_openshift_46_esx_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml
diff --git a/.../flavor_openshift_46_esx_tar/cluster-network-34-Deployment-aci-containers-controller.yaml b/.../flavor_openshift_46_esx_tar/cluster-network-34-Deployment-aci-containers-controller.yaml
@@ -31,8 +31,6 @@ spec:
           value: ''
         - name: ACI_SNAT_NAMESPACE
           value: aci-containers-system
-        - name: ACI_SNAGLOBALINFO_NAME
-          value: snatglobalinfo
         - name: ACI_RDCONFIG_NAME
           value: routingdomain-config
         - name: SYSTEM_NAMESPACE

diff --git a/provision/testdata/flavor_openshift_46_openstack.kube.yaml b/provision/testdata/flavor_openshift_46_openstack.kube.yaml
diff --git a/...6_openstack_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml b/...6_openstack_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml
@@ -58,8 +58,11 @@ spec:
                     type: object
                   type: array
                 type: object
+              nodeName:
+                type: string
             required:
             - globalInfos
+            - nodeName
             type: object
           status:
             description: SnatGlobalInfoStatus defines the observed state of SnatGlobalInfo

diff --git a/...a/flavor_openshift_46_openstack_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml b/...a/flavor_openshift_46_openstack_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml
diff --git a/...r_openshift_46_openstack_tar/cluster-network-34-Deployment-aci-containers-controller.yaml b/...r_openshift_46_openstack_tar/cluster-network-34-Deployment-aci-containers-controller.yaml
@@ -31,8 +31,6 @@ spec:
           value: ''
         - name: ACI_SNAT_NAMESPACE
           value: aci-containers-system
-        - name: ACI_SNAGLOBALINFO_NAME
-          value: snatglobalinfo
         - name: ACI_RDCONFIG_NAME
           value: routingdomain-config
         - name: SYSTEM_NAMESPACE

diff --git a/provision/testdata/flavor_openshift_47_esx.kube.yaml b/provision/testdata/flavor_openshift_47_esx.kube.yaml
diff --git a/...hift_47_esx_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml b/...hift_47_esx_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml
@@ -58,8 +58,11 @@ spec:
                     type: object
                   type: array
                 type: object
+              nodeName:
+                type: string
             required:
             - globalInfos
+            - nodeName
             type: object
           status:
             description: SnatGlobalInfoStatus defines the observed state of SnatGlobalInfo

diff --git a/...estdata/flavor_openshift_47_esx_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml b/...estdata/flavor_openshift_47_esx_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml
diff --git a/.../flavor_openshift_47_esx_tar/cluster-network-34-Deployment-aci-containers-controller.yaml b/.../flavor_openshift_47_esx_tar/cluster-network-34-Deployment-aci-containers-controller.yaml
@@ -31,8 +31,6 @@ spec:
           value: ''
         - name: ACI_SNAT_NAMESPACE
           value: aci-containers-system
-        - name: ACI_SNAGLOBALINFO_NAME
-          value: snatglobalinfo
         - name: ACI_RDCONFIG_NAME
           value: routingdomain-config
         - name: SYSTEM_NAMESPACE

diff --git a/provision/testdata/flavor_openshift_47_openstack.kube.yaml b/provision/testdata/flavor_openshift_47_openstack.kube.yaml
diff --git a/...7_openstack_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml b/...7_openstack_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml
@@ -58,8 +58,11 @@ spec:
                     type: object
                   type: array
                 type: object
+              nodeName:
+                type: string
             required:
             - globalInfos
+            - nodeName
             type: object
           status:
             description: SnatGlobalInfoStatus defines the observed state of SnatGlobalInfo

diff --git a/...a/flavor_openshift_47_openstack_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml b/...a/flavor_openshift_47_openstack_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml
diff --git a/...r_openshift_47_openstack_tar/cluster-network-34-Deployment-aci-containers-controller.yaml b/...r_openshift_47_openstack_tar/cluster-network-34-Deployment-aci-containers-controller.yaml
@@ -31,8 +31,6 @@ spec:
           value: ''
         - name: ACI_SNAT_NAMESPACE
           value: aci-containers-system
-        - name: ACI_SNAGLOBALINFO_NAME
-          value: snatglobalinfo
         - name: ACI_RDCONFIG_NAME
           value: routingdomain-config
         - name: SYSTEM_NAMESPACE

diff --git a/provision/testdata/flavor_openshift_48_esx.kube.yaml b/provision/testdata/flavor_openshift_48_esx.kube.yaml
diff --git a/...hift_48_esx_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml b/...hift_48_esx_tar/cluster-network-08-CustomResourceDefinition-snatglobalinfos.aci.snat.yaml
@@ -58,8 +58,11 @@ spec:
                     type: object
                   type: array
                 type: object
+              nodeName:
+                type: string
             required:
             - globalInfos
+            - nodeName
             type: object
           status:
             description: SnatGlobalInfoStatus defines the observed state of SnatGlobalInfo

diff --git a/...estdata/flavor_openshift_48_esx_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml b/...estdata/flavor_openshift_48_esx_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml
diff --git a/.../flavor_openshift_48_esx_tar/cluster-network-34-Deployment-aci-containers-controller.yaml b/.../flavor_openshift_48_esx_tar/cluster-network-34-Deployment-aci-containers-controller.yaml
@@ -31,8 +31,6 @@ spec:
           value: ''
         - name: ACI_SNAT_NAMESPACE
           value: aci-containers-system
-        - name: ACI_SNAGLOBALINFO_NAME
-          value: snatglobalinfo
         - name: ACI_RDCONFIG_NAME
           value: routingdomain-config
         - name: SYSTEM_NAMESPACE

diff --git a/provision/testdata/flavor_openshift_48_openstack.kube.yaml b/provision/testdata/flavor_openshift_48_openstack.kube.yaml
diff --git a/provision/testdata/flavor_openshift_49_esx.kube.yaml b/provision/testdata/flavor_openshift_49_esx.kube.yaml
diff --git a/provision/testdata/nested-elag.kube.yaml b/provision/testdata/nested-elag.kube.yaml
diff --git a/provision/testdata/nested-portgroup.kube.yaml b/provision/testdata/nested-portgroup.kube.yaml
diff --git a/provision/testdata/nested-vlan.kube.yaml b/provision/testdata/nested-vlan.kube.yaml
diff --git a/provision/testdata/nested-vxlan.kube.yaml b/provision/testdata/nested-vxlan.kube.yaml
diff --git a/provision/testdata/pod_ext_access.kube.yaml b/provision/testdata/pod_ext_access.kube.yaml
diff --git a/provision/testdata/sample.kube.yaml b/provision/testdata/sample.kube.yaml
diff --git a/provision/testdata/test_new_naming_convention_openshift.yaml b/provision/testdata/test_new_naming_convention_openshift.yaml
@@ -880,8 +880,6 @@ spec:
               value: ""
             - name: ACI_SNAT_NAMESPACE
               value: "aci-containers-system"
-            - name: ACI_SNAGLOBALINFO_NAME
-              value: "snatglobalinfo"
             - name: ACI_RDCONFIG_NAME
               value: "routingdomain-config"
           volumeMounts:

diff --git a/provision/testdata/test_with_no_istio.yaml b/provision/testdata/test_with_no_istio.yaml
@@ -766,8 +766,6 @@ spec:
               value: ""
             - name: ACI_SNAT_NAMESPACE
               value: "aci-containers-system"
-            - name: ACI_SNAGLOBALINFO_NAME
-              value: "snatglobalinfo"
             - name: ACI_RDCONFIG_NAME
               value: "routingdomain-config"
           volumeMounts:

diff --git a/provision/testdata/vlan_case.kube.yaml b/provision/testdata/vlan_case.kube.yaml
diff --git a/provision/testdata/with_comments.kube.yaml b/provision/testdata/with_comments.kube.yaml
diff --git a/provision/testdata/with_interface_mtu.kube.yaml b/provision/testdata/with_interface_mtu.kube.yaml
diff --git a/provision/testdata/with_interface_mtu_headroom.kube.yaml b/provision/testdata/with_interface_mtu_headroom.kube.yaml
diff --git a/provision/testdata/with_istio_default_profile.kube.yaml b/provision/testdata/with_istio_default_profile.kube.yaml
diff --git a/provision/testdata/with_new_naming_convention.kube.yaml b/provision/testdata/with_new_naming_convention.kube.yaml
diff --git a/provision/testdata/with_new_naming_convention_dockerucp.kube.yaml b/provision/testdata/with_new_naming_convention_dockerucp.kube.yaml
diff --git a/provision/testdata/with_new_naming_convention_openshift.kube.yaml b/provision/testdata/with_new_naming_convention_openshift.kube.yaml
diff --git a/provision/testdata/with_new_naming_convention_operator_cr.kube.yaml b/provision/testdata/with_new_naming_convention_operator_cr.kube.yaml
diff --git a/provision/testdata/with_no_drop_log.kube.yaml b/provision/testdata/with_no_drop_log.kube.yaml
diff --git a/provision/testdata/with_no_install_istio.kube.yaml b/provision/testdata/with_no_install_istio.kube.yaml
diff --git a/provision/testdata/with_no_sriov_config_kube.yaml b/provision/testdata/with_no_sriov_config_kube.yaml
diff --git a/provision/testdata/with_overrides.kube.yaml b/provision/testdata/with_overrides.kube.yaml
diff --git a/provision/testdata/with_pbr_non_snat.kube.yaml b/provision/testdata/with_pbr_non_snat.kube.yaml
diff --git a/provision/testdata/with_preexisting_tenant.kube.yaml b/provision/testdata/with_preexisting_tenant.kube.yaml
diff --git a/provision/testdata/with_refreshtime.kube.yaml b/provision/testdata/with_refreshtime.kube.yaml
diff --git a/provision/testdata/with_sriov_config_kube.yaml b/provision/testdata/with_sriov_config_kube.yaml
diff --git a/provision/testdata/with_sriov_config_no_deviceinfo_kube.yaml b/provision/testdata/with_sriov_config_no_deviceinfo_kube.yaml
diff --git a/provision/testdata/with_tenant_l3out.kube.yaml b/provision/testdata/with_tenant_l3out.kube.yaml
diff --git a/provision/testdata/with_wait_for_network.kube.yaml b/provision/testdata/with_wait_for_network.kube.yaml