Skip to content

Commit 3f62f1a

Browse files
akshaysnguptaakshaysngupta
authored
Cleanup dummy defaults in pool, settings and probe when unused (#1598) (#1604)
* cleanup unused defaults in pool, settings and probe * fix test yamls * compare with resource name instead of suffix * resource id has resource name * lower case
1 parent 299f2c1 commit 3f62f1a

29 files changed

+171
-1196
lines changed

‎docs/troubleshootings/troubleshooting-installing-a-simple-application.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Application Gateway Ingress Controller (AGIC) continuously monitors the followin
135135
The following must be in place for AGIC to function as expected:
136136
1. AKS must have one or more healthy **pods**.
137137
Verify this from [Cloud Shell](https://shell.azure.com/) with `kubectl get pods -o wide --show-labels`
138-
If you have a Pod with an `apsnetapp`, your output may look like this:
138+
If you have a Pod with an `aspnetapp`, your output may look like this:
139139
```bash
140140
$> kubectl get pods -o wide --show-labels
141141

‎functional_tests/cookie_name.json

-51
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
{
22
"properties": {
33
"backendAddressPools": [
4-
{
5-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendAddressPools/defaultaddresspool",
6-
"name": "defaultaddresspool",
7-
"properties": {
8-
"backendAddresses": []
9-
}
10-
},
114
{
125
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendAddressPools/pool---namespace---hello-world-a-80-bp-80",
136
"name": "pool---namespace---hello-world-a-80-bp-80",
@@ -73,20 +66,6 @@
7366
"protocol": "Http",
7467
"requestTimeout": 30
7568
}
76-
},
77-
{
78-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendHttpSettingsCollection/defaulthttpsetting",
79-
"name": "defaulthttpsetting",
80-
"properties": {
81-
"cookieBasedAffinity": "Disabled",
82-
"pickHostNameFromBackendAddress": false,
83-
"port": 80,
84-
"probe": {
85-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Http"
86-
},
87-
"protocol": "Http",
88-
"requestTimeout": 30
89-
}
9069
}
9170
],
9271
"frontendIPConfigurations": [
@@ -134,36 +113,6 @@
134113
}
135114
],
136115
"probes": [
137-
{
138-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Http",
139-
"name": "defaultprobe-Http",
140-
"properties": {
141-
"host": "localhost",
142-
"interval": 30,
143-
"match": {},
144-
"minServers": 0,
145-
"path": "/",
146-
"pickHostNameFromBackendHttpSettings": false,
147-
"protocol": "Http",
148-
"timeout": 30,
149-
"unhealthyThreshold": 3
150-
}
151-
},
152-
{
153-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Https",
154-
"name": "defaultprobe-Https",
155-
"properties": {
156-
"host": "localhost",
157-
"interval": 30,
158-
"match": {},
159-
"minServers": 0,
160-
"path": "/",
161-
"pickHostNameFromBackendHttpSettings": false,
162-
"protocol": "Https",
163-
"timeout": 30,
164-
"unhealthyThreshold": 3
165-
}
166-
},
167116
{
168117
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/pb---namespace---hello-world-a-80---name--SlashNothingSlashSomething",
169118
"name": "pb---namespace---hello-world-a-80---name--SlashNothingSlashSomething",

‎functional_tests/duplicate_ports.json

-51
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
{
22
"properties": {
33
"backendAddressPools": [
4-
{
5-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendAddressPools/defaultaddresspool",
6-
"name": "defaultaddresspool",
7-
"properties": {
8-
"backendAddresses": []
9-
}
10-
},
114
{
125
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendAddressPools/pool---namespace---hello-world-80-bp-80",
136
"name": "pool---namespace---hello-world-80-bp-80",
@@ -40,20 +33,6 @@
4033
"protocol": "Http",
4134
"requestTimeout": 30
4235
}
43-
},
44-
{
45-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendHttpSettingsCollection/defaulthttpsetting",
46-
"name": "defaulthttpsetting",
47-
"properties": {
48-
"cookieBasedAffinity": "Disabled",
49-
"pickHostNameFromBackendAddress": false,
50-
"port": 80,
51-
"probe": {
52-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Http"
53-
},
54-
"protocol": "Http",
55-
"requestTimeout": 30
56-
}
5736
}
5837
],
5938
"frontendIPConfigurations": [
@@ -130,36 +109,6 @@
130109
}
131110
],
132111
"probes": [
133-
{
134-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Http",
135-
"name": "defaultprobe-Http",
136-
"properties": {
137-
"host": "localhost",
138-
"interval": 30,
139-
"match": {},
140-
"minServers": 0,
141-
"path": "/",
142-
"pickHostNameFromBackendHttpSettings": false,
143-
"protocol": "Http",
144-
"timeout": 30,
145-
"unhealthyThreshold": 3
146-
}
147-
},
148-
{
149-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Https",
150-
"name": "defaultprobe-Https",
151-
"properties": {
152-
"host": "localhost",
153-
"interval": 30,
154-
"match": {},
155-
"minServers": 0,
156-
"path": "/",
157-
"pickHostNameFromBackendHttpSettings": false,
158-
"protocol": "Https",
159-
"timeout": 30,
160-
"unhealthyThreshold": 3
161-
}
162-
},
163112
{
164113
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/pb---namespace---hello-world-80---name--",
165114
"name": "pb---namespace---hello-world-80---name--",

‎functional_tests/empty_cluster_with_private_ip.json

-15
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,6 @@
8484
"timeout": 30,
8585
"unhealthyThreshold": 3
8686
}
87-
},
88-
{
89-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Https",
90-
"name": "defaultprobe-Https",
91-
"properties": {
92-
"host": "localhost",
93-
"interval": 30,
94-
"match": {},
95-
"minServers": 0,
96-
"path": "/",
97-
"pickHostNameFromBackendHttpSettings": false,
98-
"protocol": "Https",
99-
"timeout": 30,
100-
"unhealthyThreshold": 3
101-
}
10287
}
10388
],
10489
"redirectConfigurations": [],

‎functional_tests/health_probes_same_labels_different_namespaces.json

-51
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
{
22
"properties": {
33
"backendAddressPools": [
4-
{
5-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendAddressPools/defaultaddresspool",
6-
"name": "defaultaddresspool",
7-
"properties": {
8-
"backendAddresses": []
9-
}
10-
},
114
{
125
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendAddressPools/pool---namespace---hello-world-80-bp-80",
136
"name": "pool---namespace---hello-world-80-bp-80",
@@ -71,20 +64,6 @@
7164
"protocol": "Http",
7265
"requestTimeout": 30
7366
}
74-
},
75-
{
76-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendHttpSettingsCollection/defaulthttpsetting",
77-
"name": "defaulthttpsetting",
78-
"properties": {
79-
"cookieBasedAffinity": "Disabled",
80-
"pickHostNameFromBackendAddress": false,
81-
"port": 80,
82-
"probe": {
83-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Http"
84-
},
85-
"protocol": "Http",
86-
"requestTimeout": 30
87-
}
8867
}
8968
],
9069
"frontendIPConfigurations": [
@@ -161,36 +140,6 @@
161140
}
162141
],
163142
"probes": [
164-
{
165-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Http",
166-
"name": "defaultprobe-Http",
167-
"properties": {
168-
"host": "localhost",
169-
"interval": 30,
170-
"match": {},
171-
"minServers": 0,
172-
"path": "/",
173-
"pickHostNameFromBackendHttpSettings": false,
174-
"protocol": "Http",
175-
"timeout": 30,
176-
"unhealthyThreshold": 3
177-
}
178-
},
179-
{
180-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Https",
181-
"name": "defaultprobe-Https",
182-
"properties": {
183-
"host": "localhost",
184-
"interval": 30,
185-
"match": {},
186-
"minServers": 0,
187-
"path": "/",
188-
"pickHostNameFromBackendHttpSettings": false,
189-
"protocol": "Https",
190-
"timeout": 30,
191-
"unhealthyThreshold": 3
192-
}
193-
},
194143
{
195144
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/pb---namespace---hello-world-80---name--",
196145
"name": "pb---namespace---hello-world-80---name--",

‎functional_tests/one_ingress_https_backend.json

-51
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
{
22
"properties": {
33
"backendAddressPools": [
4-
{
5-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendAddressPools/defaultaddresspool",
6-
"name": "defaultaddresspool",
7-
"properties": {
8-
"backendAddresses": []
9-
}
10-
},
114
{
125
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendAddressPools/pool---https-backend-namespace---hello-world-https-443-bp-443",
136
"name": "pool---https-backend-namespace---hello-world-https-443-bp-443",
@@ -45,20 +38,6 @@
4538
}
4639
]
4740
}
48-
},
49-
{
50-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendHttpSettingsCollection/defaulthttpsetting",
51-
"name": "defaulthttpsetting",
52-
"properties": {
53-
"cookieBasedAffinity": "Disabled",
54-
"pickHostNameFromBackendAddress": false,
55-
"port": 80,
56-
"probe": {
57-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Http"
58-
},
59-
"protocol": "Http",
60-
"requestTimeout": 30
61-
}
6241
}
6342
],
6443
"frontendIPConfigurations": [
@@ -131,36 +110,6 @@
131110
}
132111
],
133112
"probes": [
134-
{
135-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Http",
136-
"name": "defaultprobe-Http",
137-
"properties": {
138-
"host": "localhost",
139-
"interval": 30,
140-
"match": {},
141-
"minServers": 0,
142-
"path": "/",
143-
"pickHostNameFromBackendHttpSettings": false,
144-
"protocol": "Http",
145-
"timeout": 30,
146-
"unhealthyThreshold": 3
147-
}
148-
},
149-
{
150-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Https",
151-
"name": "defaultprobe-Https",
152-
"properties": {
153-
"host": "localhost",
154-
"interval": 30,
155-
"match": {},
156-
"minServers": 0,
157-
"path": "/",
158-
"pickHostNameFromBackendHttpSettings": false,
159-
"protocol": "Https",
160-
"timeout": 30,
161-
"unhealthyThreshold": 3
162-
}
163-
},
164113
{
165114
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/pb---https-backend-namespace---hello-world-https-443---name--HttpsBackend",
166115
"name": "pb---https-backend-namespace---hello-world-https-443---name--HttpsBackend",

‎functional_tests/one_ingress_https_backend_without_backend_protocol.json

-51
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
{
22
"properties": {
33
"backendAddressPools": [
4-
{
5-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendAddressPools/defaultaddresspool",
6-
"name": "defaultaddresspool",
7-
"properties": {
8-
"backendAddresses": []
9-
}
10-
},
114
{
125
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendAddressPools/pool---https-backend-namespace---hello-world-https-443-bp-443",
136
"name": "pool---https-backend-namespace---hello-world-https-443-bp-443",
@@ -40,20 +33,6 @@
4033
"protocol": "Https",
4134
"requestTimeout": 30
4235
}
43-
},
44-
{
45-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/backendHttpSettingsCollection/defaulthttpsetting",
46-
"name": "defaulthttpsetting",
47-
"properties": {
48-
"cookieBasedAffinity": "Disabled",
49-
"pickHostNameFromBackendAddress": false,
50-
"port": 80,
51-
"probe": {
52-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Http"
53-
},
54-
"protocol": "Http",
55-
"requestTimeout": 30
56-
}
5736
}
5837
],
5938
"frontendIPConfigurations": [
@@ -104,36 +83,6 @@
10483
}
10584
],
10685
"probes": [
107-
{
108-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Http",
109-
"name": "defaultprobe-Http",
110-
"properties": {
111-
"host": "localhost",
112-
"interval": 30,
113-
"match": {},
114-
"minServers": 0,
115-
"path": "/",
116-
"pickHostNameFromBackendHttpSettings": false,
117-
"protocol": "Http",
118-
"timeout": 30,
119-
"unhealthyThreshold": 3
120-
}
121-
},
122-
{
123-
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Https",
124-
"name": "defaultprobe-Https",
125-
"properties": {
126-
"host": "localhost",
127-
"interval": 30,
128-
"match": {},
129-
"minServers": 0,
130-
"path": "/",
131-
"pickHostNameFromBackendHttpSettings": false,
132-
"protocol": "Https",
133-
"timeout": 30,
134-
"unhealthyThreshold": 3
135-
}
136-
},
13786
{
13887
"id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/pb---https-backend-namespace---hello-world-https-443---name--HttpsBackend",
13988
"name": "pb---https-backend-namespace---hello-world-https-443---name--HttpsBackend",

0 commit comments

Comments
 (0)