Skip to content

Commit 2552fb4

Browse files
jpayne3506jpayne3506
authored
ci: Populate missing fields in CNS configmap (#3503)
ci: add in missing fields
1 parent 81351cb commit 2552fb4

10 files changed

+76
-59
lines changed

‎test/integration/manifests/cnsconfig/azurecnidualstackoverlaylinuxconfigmap.yaml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@ data:
2121
"NodeID": "",
2222
"NodeSyncIntervalInSeconds": 30
2323
},
24+
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
2425
"ChannelMode": "CRD",
25-
"InitializeFromCNI": true,
26-
"ManageEndpointState": false,
27-
"ProgramSNATIPTables" : false,
28-
"EnableCNIConflistGeneration": true,
2926
"CNIConflistFilepath": "/etc/cni/net.d/15-azure-swift-overlay.conflist",
3027
"CNIConflistScenario": "overlay",
3128
"EnableAsyncPodDelete": false,
32-
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
33-
"EnableIPAMv2": true
29+
"EnableCNIConflistGeneration": true,
30+
"EnableIPAMv2": true,
31+
"EnableStateMigration": false,
32+
"EnableSubnetScarcity": false,
33+
"InitializeFromCNI": true,
34+
"ManageEndpointState": false,
35+
"ProgramSNATIPTables": false
3436
}

‎test/integration/manifests/cnsconfig/azurecnidualstackoverlaywindowsconfigmap.yaml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,17 @@ data:
2121
"NodeID": "",
2222
"NodeSyncIntervalInSeconds": 30
2323
},
24-
"EnableSubnetScarcity": false,
24+
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
2525
"ChannelMode": "CRD",
26-
"InitializeFromCNI": true,
27-
"ManageEndpointState": false,
28-
"ProgramSNATIPTables" : false,
29-
"MetricsBindAddress": ":10092",
30-
"EnableCNIConflistGeneration": false,
3126
"CNIConflistFilepath": "C:\\k\\azurecni\\netconf\\10-azure.conflist",
3227
"CNIConflistScenario": "dualStackOverlay",
3328
"EnableAsyncPodDelete": false,
34-
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
35-
"EnableIPAMv2": true
29+
"EnableCNIConflistGeneration": false,
30+
"EnableIPAMv2": true,
31+
"EnableStateMigration": false,
32+
"EnableSubnetScarcity": false,
33+
"InitializeFromCNI": true,
34+
"ManageEndpointState": false,
35+
"MetricsBindAddress": ":10092",
36+
"ProgramSNATIPTables": false
3637
}

‎test/integration/manifests/cnsconfig/azurecnioverlaylinuxconfigmap.yaml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@ data:
2121
"NodeID": "",
2222
"NodeSyncIntervalInSeconds": 30
2323
},
24+
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
2425
"ChannelMode": "CRD",
25-
"InitializeFromCNI": true,
26-
"ManageEndpointState": false,
27-
"ProgramSNATIPTables" : false,
28-
"EnableCNIConflistGeneration": true,
2926
"CNIConflistFilepath": "/etc/cni/net.d/15-azure-swift-overlay.conflist",
3027
"CNIConflistScenario": "v4overlay",
3128
"EnableAsyncPodDelete": true,
32-
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
33-
"EnableIPAMv2": true
29+
"EnableCNIConflistGeneration": true,
30+
"EnableIPAMv2": true,
31+
"EnableStateMigration": false,
32+
"EnableSubnetScarcity": false,
33+
"InitializeFromCNI": true,
34+
"ManageEndpointState": false,
35+
"ProgramSNATIPTables": false
3436
}

‎test/integration/manifests/cnsconfig/azurecnioverlaywindowsconfigmap.yaml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,17 @@ data:
2121
"NodeID": "",
2222
"NodeSyncIntervalInSeconds": 30
2323
},
24-
"EnableSubnetScarcity": false,
24+
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
2525
"ChannelMode": "CRD",
26-
"InitializeFromCNI": true,
27-
"ManageEndpointState": false,
28-
"ProgramSNATIPTables" : false,
29-
"MetricsBindAddress": ":10092",
30-
"EnableCNIConflistGeneration": false,
3126
"CNIConflistFilepath": "C:\\k\\azurecni\\netconf\\10-azure.conflist",
3227
"CNIConflistScenario": "v4overlay",
3328
"EnableAsyncPodDelete": true,
34-
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
35-
"EnableIPAMv2": true
29+
"EnableCNIConflistGeneration": false,
30+
"EnableIPAMv2": true,
31+
"EnableStateMigration": false,
32+
"EnableSubnetScarcity": false,
33+
"InitializeFromCNI": true,
34+
"ManageEndpointState": false,
35+
"MetricsBindAddress": ":10092",
36+
"ProgramSNATIPTables": false
3637
}

‎test/integration/manifests/cnsconfig/azurestatelesscnioverlaywindowsconfigmap.yaml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,17 @@ data:
2121
"NodeID": "",
2222
"NodeSyncIntervalInSeconds": 30
2323
},
24-
"EnableSubnetScarcity": false,
24+
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
2525
"ChannelMode": "CRD",
26-
"InitializeFromCNI": false,
27-
"ManageEndpointState": true,
28-
"ProgramSNATIPTables" : false,
29-
"MetricsBindAddress": ":10092",
30-
"EnableCNIConflistGeneration": false,
3126
"CNIConflistFilepath": "C:\\k\\azurecni\\netconf\\10-azure.conflist",
3227
"CNIConflistScenario": "v4overlay",
3328
"EnableAsyncPodDelete": true,
34-
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
35-
"EnableIPAMv2": true
29+
"EnableCNIConflistGeneration": false,
30+
"EnableIPAMv2": true,
31+
"EnableStateMigration": false,
32+
"EnableSubnetScarcity": false,
33+
"InitializeFromCNI": false,
34+
"ManageEndpointState": true,
35+
"MetricsBindAddress": ":10092",
36+
"ProgramSNATIPTables": false
3637
}

‎test/integration/manifests/cnsconfig/ciliumconfigmap.yaml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@ data:
2121
"NodeID": "",
2222
"NodeSyncIntervalInSeconds": 30
2323
},
24+
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
2425
"ChannelMode": "CRD",
25-
"InitializeFromCNI": false,
26-
"ManageEndpointState": true,
27-
"ProgramSNATIPTables" : true,
28-
"EnableCNIConflistGeneration": true,
2926
"CNIConflistFilepath": "/etc/cni/net.d/05-cilium.conflist",
3027
"CNIConflistScenario": "cilium",
3128
"EnableAsyncPodDelete": true,
32-
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
33-
"EnableIPAMv2": true
29+
"EnableCNIConflistGeneration": true,
30+
"EnableIPAMv2": true,
31+
"EnableStateMigration": false,
32+
"EnableSubnetScarcity": false,
33+
"InitializeFromCNI": false,
34+
"ManageEndpointState": true,
35+
"ProgramSNATIPTables": true
3436
}

‎test/integration/manifests/cnsconfig/ciliumnodesubnetconfigmap.yaml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@ data:
2121
"NodeID": "",
2222
"NodeSyncIntervalInSeconds": 30
2323
},
24+
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
2425
"ChannelMode": "AzureHost",
25-
"InitializeFromCNI": false,
26-
"ManageEndpointState": true,
27-
"ProgramSNATIPTables" : false,
28-
"EnableCNIConflistGeneration": true,
2926
"CNIConflistFilepath": "/etc/cni/net.d/05-cilium.conflist",
3027
"CNIConflistScenario": "cilium",
3128
"EnableAsyncPodDelete": true,
32-
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
33-
"EnableIPAMv2": true
29+
"EnableCNIConflistGeneration": true,
30+
"EnableIPAMv2": true,
31+
"EnableStateMigration": false,
32+
"EnableSubnetScarcity": false,
33+
"InitializeFromCNI": false,
34+
"ManageEndpointState": true,
35+
"ProgramSNATIPTables": false
3436
}

‎test/integration/manifests/cnsconfig/overlayconfigmap.yaml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@ data:
2121
"NodeID": "",
2222
"NodeSyncIntervalInSeconds": 30
2323
},
24+
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
2425
"ChannelMode": "CRD",
25-
"InitializeFromCNI": false,
26-
"ManageEndpointState": true,
27-
"ProgramSNATIPTables" : false,
28-
"EnableCNIConflistGeneration": true,
2926
"CNIConflistFilepath": "/etc/cni/net.d/05-cilium.conflist",
3027
"CNIConflistScenario": "cilium",
3128
"EnableAsyncPodDelete": true,
32-
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
33-
"EnableIPAMv2": true
29+
"EnableCNIConflistGeneration": true,
30+
"EnableIPAMv2": true,
31+
"EnableStateMigration": false,
32+
"EnableSubnetScarcity": false,
33+
"InitializeFromCNI": false,
34+
"ManageEndpointState": true,
35+
"ProgramSNATIPTables": false
3436
}

‎test/integration/manifests/cnsconfig/swiftlinuxconfigmap.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ data:
2525
"ChannelMode": "CRD",
2626
"EnableAsyncPodDelete": true,
2727
"EnableIPAMv2": true,
28+
"EnableStateMigration": false,
29+
"EnableSubnetScarcity": false,
2830
"InitializeFromCNI": true,
2931
"ManageEndpointState": false,
30-
"ProgramSNATIPTables" : false
32+
"ProgramSNATIPTables": false
3133
}

‎test/integration/manifests/cnsconfig/swiftwindowsconfigmap.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ data:
2121
"NodeID": "",
2222
"NodeSyncIntervalInSeconds": 30
2323
},
24+
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
2425
"ChannelMode": "CRD",
26+
"EnableAsyncPodDelete": true,
27+
"EnableIPAMv2": true,
28+
"EnableStateMigration": false,
29+
"EnableSubnetScarcity": false,
2530
"InitializeFromCNI": true,
2631
"ManageEndpointState": false,
27-
"ProgramSNATIPTables": false,
28-
"EnableAsyncPodDelete": true,
29-
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
30-
"EnableIPAMv2": true
32+
"ProgramSNATIPTables": false
3133
}

0 commit comments

Comments
 (0)