Skip to content

Commit f2d2be5

Browse files
rayaisaiahrayaisaiah
authored
[Forwardport] [NPM] fix: Update Iptables to Legacy (#3782) (#3842)
[NPM] fix: Update Iptables to Legacy (#3782) * added legacy * typo * updated tests * updated for all tests
1 parent 10e2c78 commit f2d2be5

File tree

3 files changed

+74
-74
lines changed

3 files changed

+74
-74
lines changed

‎npm/pkg/dataplane/policies/chain-management_linux_test.go‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ func TestDetectIptablesVersion(t *testing.T) {
936936
ExitCode: 1,
937937
},
938938
{
939-
Cmd: []string{"iptables", "-w", "60", "-L", "KUBE-IPTABLES-HINT", "-t", "mangle", "-n"},
939+
Cmd: []string{"iptables-legacy", "-w", "60", "-L", "KUBE-IPTABLES-HINT", "-t", "mangle", "-n"},
940940
ExitCode: 0,
941941
},
942942
},
@@ -954,11 +954,11 @@ func TestDetectIptablesVersion(t *testing.T) {
954954
ExitCode: 1,
955955
},
956956
{
957-
Cmd: []string{"iptables", "-w", "60", "-L", "KUBE-IPTABLES-HINT", "-t", "mangle", "-n"},
957+
Cmd: []string{"iptables-legacy", "-w", "60", "-L", "KUBE-IPTABLES-HINT", "-t", "mangle", "-n"},
958958
ExitCode: 1,
959959
},
960960
{
961-
Cmd: []string{"iptables", "-w", "60", "-L", "KUBE-KUBELET-CANARY", "-t", "mangle", "-n"},
961+
Cmd: []string{"iptables-legacy", "-w", "60", "-L", "KUBE-KUBELET-CANARY", "-t", "mangle", "-n"},
962962
ExitCode: 1,
963963
},
964964
},
@@ -976,11 +976,11 @@ func TestDetectIptablesVersion(t *testing.T) {
976976
ExitCode: 2,
977977
},
978978
{
979-
Cmd: []string{"iptables", "-w", "60", "-L", "KUBE-IPTABLES-HINT", "-t", "mangle", "-n"},
979+
Cmd: []string{"iptables-legacy", "-w", "60", "-L", "KUBE-IPTABLES-HINT", "-t", "mangle", "-n"},
980980
ExitCode: 2,
981981
},
982982
{
983-
Cmd: []string{"iptables", "-w", "60", "-L", "KUBE-KUBELET-CANARY", "-t", "mangle", "-n"},
983+
Cmd: []string{"iptables-legacy", "-w", "60", "-L", "KUBE-KUBELET-CANARY", "-t", "mangle", "-n"},
984984
ExitCode: 2,
985985
},
986986
},
@@ -1027,12 +1027,12 @@ func TestCleanupOtherChains(t *testing.T) {
10271027
name: "cleanup legacy jump no chains",
10281028
startWithNft: true,
10291029
calls: []testutils.TestCmd{
1030-
{Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"}}, // deprecated rule existed
1030+
{Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"}}, // deprecated rule existed
10311031
{
1032-
Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"},
1032+
Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"},
10331033
ExitCode: 1,
10341034
},
1035-
{Cmd: []string{"iptables", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true},
1035+
{Cmd: []string{"iptables-legacy", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true},
10361036
{
10371037
Cmd: []string{"grep", "Chain AZURE-NPM"},
10381038
ExitCode: 1,
@@ -1044,19 +1044,19 @@ func TestCleanupOtherChains(t *testing.T) {
10441044
name: "cleanup legacy jump and chains",
10451045
startWithNft: true,
10461046
calls: []testutils.TestCmd{
1047-
{Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"}}, // deprecated rule existed
1047+
{Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"}}, // deprecated rule existed
10481048
{
1049-
Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"},
1049+
Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"},
10501050
ExitCode: 1,
10511051
},
1052-
{Cmd: []string{"iptables", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true},
1052+
{Cmd: []string{"iptables-legacy", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true},
10531053
{
10541054
Cmd: []string{"grep", "Chain AZURE-NPM"},
10551055
Stdout: grepOutputTwoAzureChains,
10561056
},
1057-
{Cmd: []string{"iptables-restore", "-w", "60", "-T", "filter", "--noflush"}},
1058-
{Cmd: []string{"iptables", "-w", "60", "-X", "AZURE-NPM"}},
1059-
{Cmd: []string{"iptables", "-w", "60", "-X", "AZURE-NPM-INGRESS"}},
1057+
{Cmd: []string{"iptables-legacy-restore", "-w", "60", "-T", "filter", "--noflush"}},
1058+
{Cmd: []string{"iptables-legacy", "-w", "60", "-X", "AZURE-NPM"}},
1059+
{Cmd: []string{"iptables-legacy", "-w", "60", "-X", "AZURE-NPM-INGRESS"}},
10601060
},
10611061
expectedErr: false,
10621062
},
@@ -1065,30 +1065,30 @@ func TestCleanupOtherChains(t *testing.T) {
10651065
startWithNft: true,
10661066
calls: []testutils.TestCmd{
10671067
{
1068-
Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"},
1068+
Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"},
10691069
ExitCode: 1,
10701070
},
10711071
{
1072-
Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"},
1072+
Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"},
10731073
ExitCode: 1,
10741074
},
1075-
{Cmd: []string{"iptables", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true},
1075+
{Cmd: []string{"iptables-legacy", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true},
10761076
{
10771077
Cmd: []string{"grep", "Chain AZURE-NPM"},
10781078
Stdout: grepOutputTwoAzureChains,
10791079
},
10801080
{
1081-
Cmd: []string{"iptables-restore", "-w", "60", "-T", "filter", "--noflush"},
1081+
Cmd: []string{"iptables-legacy-restore", "-w", "60", "-T", "filter", "--noflush"},
10821082
ExitCode: 1,
10831083
},
10841084
{
1085-
Cmd: []string{"iptables-restore", "-w", "60", "-T", "filter", "--noflush"},
1085+
Cmd: []string{"iptables-legacy-restore", "-w", "60", "-T", "filter", "--noflush"},
10861086
ExitCode: 1,
10871087
},
1088-
{Cmd: []string{"iptables", "-w", "60", "-F", "AZURE-NPM"}},
1089-
{Cmd: []string{"iptables", "-w", "60", "-F", "AZURE-NPM-INGRESS"}},
1090-
{Cmd: []string{"iptables", "-w", "60", "-X", "AZURE-NPM"}},
1091-
{Cmd: []string{"iptables", "-w", "60", "-X", "AZURE-NPM-INGRESS"}},
1088+
{Cmd: []string{"iptables-legacy", "-w", "60", "-F", "AZURE-NPM"}},
1089+
{Cmd: []string{"iptables-legacy", "-w", "60", "-F", "AZURE-NPM-INGRESS"}},
1090+
{Cmd: []string{"iptables-legacy", "-w", "60", "-X", "AZURE-NPM"}},
1091+
{Cmd: []string{"iptables-legacy", "-w", "60", "-X", "AZURE-NPM-INGRESS"}},
10921092
},
10931093
expectedErr: false,
10941094
},
@@ -1097,28 +1097,28 @@ func TestCleanupOtherChains(t *testing.T) {
10971097
startWithNft: true,
10981098
calls: []testutils.TestCmd{
10991099
{
1100-
Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"},
1100+
Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"},
11011101
ExitCode: 1,
11021102
},
11031103
{
1104-
Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"},
1104+
Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"},
11051105
ExitCode: 1,
11061106
},
1107-
{Cmd: []string{"iptables", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true},
1107+
{Cmd: []string{"iptables-legacy", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true},
11081108
{
11091109
Cmd: []string{"grep", "Chain AZURE-NPM"},
11101110
Stdout: grepOutputTwoAzureChains,
11111111
},
11121112
{
1113-
Cmd: []string{"iptables-restore", "-w", "60", "-T", "filter", "--noflush"},
1113+
Cmd: []string{"iptables-legacy-restore", "-w", "60", "-T", "filter", "--noflush"},
11141114
ExitCode: 1,
11151115
},
11161116
{
1117-
Cmd: []string{"iptables-restore", "-w", "60", "-T", "filter", "--noflush"},
1117+
Cmd: []string{"iptables-legacy-restore", "-w", "60", "-T", "filter", "--noflush"},
11181118
ExitCode: 1,
11191119
},
11201120
{
1121-
Cmd: []string{"iptables", "-w", "60", "-F", "AZURE-NPM"},
1121+
Cmd: []string{"iptables-legacy", "-w", "60", "-F", "AZURE-NPM"},
11221122
ExitCode: 1,
11231123
},
11241124
},
@@ -1129,28 +1129,28 @@ func TestCleanupOtherChains(t *testing.T) {
11291129
startWithNft: true,
11301130
calls: []testutils.TestCmd{
11311131
{
1132-
Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"},
1132+
Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"},
11331133
ExitCode: 1,
11341134
},
11351135
{
1136-
Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"},
1136+
Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"},
11371137
ExitCode: 1,
11381138
},
1139-
{Cmd: []string{"iptables", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true},
1139+
{Cmd: []string{"iptables-legacy", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true},
11401140
{
11411141
Cmd: []string{"grep", "Chain AZURE-NPM"},
11421142
Stdout: "Chain AZURE-NPM-INGRESS (1 references)\n",
11431143
},
11441144
{
1145-
Cmd: []string{"iptables-restore", "-w", "60", "-T", "filter", "--noflush"},
1145+
Cmd: []string{"iptables-legacy-restore", "-w", "60", "-T", "filter", "--noflush"},
11461146
ExitCode: 1,
11471147
},
11481148
{
1149-
Cmd: []string{"iptables-restore", "-w", "60", "-T", "filter", "--noflush"},
1149+
Cmd: []string{"iptables-legacy-restore", "-w", "60", "-T", "filter", "--noflush"},
11501150
ExitCode: 1,
11511151
},
1152-
{Cmd: []string{"iptables", "-w", "60", "-F", "AZURE-NPM-INGRESS"}},
1153-
{Cmd: []string{"iptables", "-w", "60", "-X", "AZURE-NPM-INGRESS"}},
1152+
{Cmd: []string{"iptables-legacy", "-w", "60", "-F", "AZURE-NPM-INGRESS"}},
1153+
{Cmd: []string{"iptables-legacy", "-w", "60", "-X", "AZURE-NPM-INGRESS"}},
11541154
},
11551155
expectedErr: false,
11561156
},
@@ -1159,37 +1159,37 @@ func TestCleanupOtherChains(t *testing.T) {
11591159
startWithNft: true,
11601160
calls: []testutils.TestCmd{
11611161
{
1162-
Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"},
1162+
Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"},
11631163
ExitCode: 1,
11641164
},
1165-
{Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"}},
1166-
{Cmd: []string{"iptables", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true},
1165+
{Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"}},
1166+
{Cmd: []string{"iptables-legacy", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true},
11671167
{
11681168
Cmd: []string{"grep", "Chain AZURE-NPM"},
11691169
Stdout: grepOutputTwoAzureChains,
11701170
},
11711171
{
1172-
Cmd: []string{"iptables-restore", "-w", "60", "-T", "filter", "--noflush"},
1172+
Cmd: []string{"iptables-legacy-restore", "-w", "60", "-T", "filter", "--noflush"},
11731173
ExitCode: 1,
11741174
},
11751175
{
1176-
Cmd: []string{"iptables-restore", "-w", "60", "-T", "filter", "--noflush"},
1176+
Cmd: []string{"iptables-legacy-restore", "-w", "60", "-T", "filter", "--noflush"},
11771177
ExitCode: 1,
11781178
},
11791179
{
1180-
Cmd: []string{"iptables", "-w", "60", "-F", "AZURE-NPM"},
1180+
Cmd: []string{"iptables-legacy", "-w", "60", "-F", "AZURE-NPM"},
11811181
ExitCode: 1,
11821182
},
11831183
{
1184-
Cmd: []string{"iptables", "-w", "60", "-F", "AZURE-NPM-INGRESS"},
1184+
Cmd: []string{"iptables-legacy", "-w", "60", "-F", "AZURE-NPM-INGRESS"},
11851185
ExitCode: 1,
11861186
},
11871187
{
1188-
Cmd: []string{"iptables", "-w", "60", "-X", "AZURE-NPM"},
1188+
Cmd: []string{"iptables-legacy", "-w", "60", "-X", "AZURE-NPM"},
11891189
ExitCode: 1,
11901190
},
11911191
{
1192-
Cmd: []string{"iptables", "-w", "60", "-X", "AZURE-NPM-INGRESS"},
1192+
Cmd: []string{"iptables-legacy", "-w", "60", "-X", "AZURE-NPM-INGRESS"},
11931193
ExitCode: 1,
11941194
},
11951195
},
@@ -1199,38 +1199,38 @@ func TestCleanupOtherChains(t *testing.T) {
11991199
name: "cleanup legacy errors ok if deleted jump (deprecated)",
12001200
startWithNft: true,
12011201
calls: []testutils.TestCmd{
1202-
{Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"}},
1202+
{Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"}},
12031203
{
1204-
Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"},
1204+
Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"},
12051205
ExitCode: 1,
12061206
},
1207-
{Cmd: []string{"iptables", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true},
1207+
{Cmd: []string{"iptables-legacy", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true},
12081208
{
12091209
Cmd: []string{"grep", "Chain AZURE-NPM"},
12101210
Stdout: grepOutputTwoAzureChains,
12111211
},
12121212
{
1213-
Cmd: []string{"iptables-restore", "-w", "60", "-T", "filter", "--noflush"},
1213+
Cmd: []string{"iptables-legacy-restore", "-w", "60", "-T", "filter", "--noflush"},
12141214
ExitCode: 1,
12151215
},
12161216
{
1217-
Cmd: []string{"iptables-restore", "-w", "60", "-T", "filter", "--noflush"},
1217+
Cmd: []string{"iptables-legacy-restore", "-w", "60", "-T", "filter", "--noflush"},
12181218
ExitCode: 1,
12191219
},
12201220
{
1221-
Cmd: []string{"iptables", "-w", "60", "-F", "AZURE-NPM"},
1221+
Cmd: []string{"iptables-legacy", "-w", "60", "-F", "AZURE-NPM"},
12221222
ExitCode: 2,
12231223
},
12241224
{
1225-
Cmd: []string{"iptables", "-w", "60", "-F", "AZURE-NPM-INGRESS"},
1225+
Cmd: []string{"iptables-legacy", "-w", "60", "-F", "AZURE-NPM-INGRESS"},
12261226
ExitCode: 2,
12271227
},
12281228
{
1229-
Cmd: []string{"iptables", "-w", "60", "-X", "AZURE-NPM"},
1229+
Cmd: []string{"iptables-legacy", "-w", "60", "-X", "AZURE-NPM"},
12301230
ExitCode: 2,
12311231
},
12321232
{
1233-
Cmd: []string{"iptables", "-w", "60", "-X", "AZURE-NPM-INGRESS"},
1233+
Cmd: []string{"iptables-legacy", "-w", "60", "-X", "AZURE-NPM-INGRESS"},
12341234
ExitCode: 2,
12351235
},
12361236
},
@@ -1240,35 +1240,35 @@ func TestCleanupOtherChains(t *testing.T) {
12401240
name: "cleanup legacy other flush errors ok",
12411241
startWithNft: true,
12421242
calls: []testutils.TestCmd{
1243-
{Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"}},
1243+
{Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"}},
12441244
{
1245-
Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"},
1245+
Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"},
12461246
ExitCode: 1,
12471247
},
12481248
{
1249-
Cmd: []string{"iptables", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true,
1249+
Cmd: []string{"iptables-legacy", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true,
12501250
ExitCode: 1,
12511251
},
12521252
{
12531253
Cmd: []string{"grep", "Chain AZURE-NPM"},
12541254
Stdout: grepOutputTwoAzureChains,
12551255
},
12561256
{
1257-
Cmd: []string{"iptables-restore", "-w", "60", "-T", "filter", "--noflush"},
1257+
Cmd: []string{"iptables-legacy-restore", "-w", "60", "-T", "filter", "--noflush"},
12581258
ExitCode: 1,
12591259
},
12601260
{
1261-
Cmd: []string{"iptables-restore", "-w", "60", "-T", "filter", "--noflush"},
1261+
Cmd: []string{"iptables-legacy-restore", "-w", "60", "-T", "filter", "--noflush"},
12621262
ExitCode: 1,
12631263
},
1264-
{Cmd: []string{"iptables", "-w", "60", "-F", "AZURE-NPM"}},
1264+
{Cmd: []string{"iptables-legacy", "-w", "60", "-F", "AZURE-NPM"}},
12651265
{
1266-
Cmd: []string{"iptables", "-w", "60", "-F", "AZURE-NPM-INGRESS"},
1266+
Cmd: []string{"iptables-legacy", "-w", "60", "-F", "AZURE-NPM-INGRESS"},
12671267
ExitCode: 1,
12681268
},
1269-
{Cmd: []string{"iptables", "-w", "60", "-X", "AZURE-NPM"}},
1269+
{Cmd: []string{"iptables-legacy", "-w", "60", "-X", "AZURE-NPM"}},
12701270
{
1271-
Cmd: []string{"iptables", "-w", "60", "-X", "AZURE-NPM-INGRESS"},
1271+
Cmd: []string{"iptables-legacy", "-w", "60", "-X", "AZURE-NPM-INGRESS"},
12721272
ExitCode: 1,
12731273
},
12741274
},
@@ -1279,15 +1279,15 @@ func TestCleanupOtherChains(t *testing.T) {
12791279
startWithNft: true,
12801280
calls: []testutils.TestCmd{
12811281
{
1282-
Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"},
1282+
Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"},
12831283
ExitCode: 1,
12841284
},
12851285
{
1286-
Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"},
1286+
Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"},
12871287
ExitCode: 1,
12881288
},
12891289
{
1290-
Cmd: []string{"iptables", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true, HasStartError: true,
1290+
Cmd: []string{"iptables-legacy", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true, HasStartError: true,
12911291
ExitCode: 1,
12921292
},
12931293
{Cmd: []string{"grep", "Chain AZURE-NPM"}},

‎npm/pkg/dataplane/policies/testutils_linux.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@ func GetBootupTestCalls() []testutils.TestCmd {
5757
ExitCode: 0,
5858
},
5959
// legacy clean up
60-
{Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"}, ExitCode: 2}, //nolint // AZURE-NPM chain didn't exist
61-
{Cmd: []string{"iptables", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"}, ExitCode: 2}, //nolint // AZURE-NPM chain didn't exist
62-
{Cmd: []string{"iptables", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true},
60+
{Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"}, ExitCode: 2}, //nolint // AZURE-NPM chain didn't exist
61+
{Cmd: []string{"iptables-legacy", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM", "-m", "conntrack", "--ctstate", "NEW"}, ExitCode: 2}, //nolint // AZURE-NPM chain didn't exist
62+
{Cmd: []string{"iptables-legacy", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true},
6363
{
6464
// 1 AZURE-NPM chain
6565
Cmd: []string{"grep", "Chain AZURE-NPM"},
6666
Stdout: `Chain AZURE-NPM (0 references)
6767
`,
6868
},
69-
{Cmd: []string{"iptables-restore", "-w", "60", "-T", "filter", "--noflush"}},
70-
{Cmd: []string{"iptables", "-w", "60", "-X", "AZURE-NPM"}},
69+
{Cmd: []string{"iptables-legacy-restore", "-w", "60", "-T", "filter", "--noflush"}},
70+
{Cmd: []string{"iptables-legacy", "-w", "60", "-X", "AZURE-NPM"}},
7171
// nft bootup
7272
{Cmd: []string{"iptables-nft", "-w", "60", "-D", "FORWARD", "-j", "AZURE-NPM"}, ExitCode: 2}, //nolint // AZURE-NPM chain didn't exist
7373
{Cmd: []string{"iptables-nft", "-w", "60", "-t", "filter", "-n", "-L"}, PipedToCommand: true},

‎npm/util/const.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ const (
3737
Ip6tablesLegacy string = "ip6tables" //nolint (avoid warning to capitalize this p)
3838
IptablesSaveNft string = "iptables-nft-save"
3939
IptablesRestoreNft string = "iptables-nft-restore"
40-
IptablesLegacy string = "iptables"
41-
IptablesSaveLegacy string = "iptables-save"
42-
IptablesRestoreLegacy string = "iptables-restore"
40+
IptablesLegacy string = "iptables-legacy"
41+
IptablesSaveLegacy string = "iptables-legacy-save"
42+
IptablesRestoreLegacy string = "iptables-legacy-restore"
4343
IptablesRestoreNoFlushFlag string = "--noflush"
4444
IptablesRestoreTableFlag string = "-T"
4545
IptablesRestoreCommit string = "COMMIT"

0 commit comments

Comments
 (0)