Skip to content

Commit ca36e3f

Browse files
author
tmsnan
authored
chore: modify the bootstrap configuration to remove deprecated fields (#1539)
* remove deprecated field Signed-off-by: zhaonan <[email protected]> * fix e2e and doc Signed-off-by: zhaonan <[email protected]> * reset v0.4.0/doc Signed-off-by: zhaonan <[email protected]> --------- Signed-off-by: zhaonan <[email protected]>
1 parent 585dc30 commit ca36e3f

16 files changed

+55
-4
lines changed

‎api/config/v1alpha1/testdata/different-dynamic-resources-user-bootstrap.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,18 @@ dynamicResources:
1818
transportApiVersion: V3
1919
ldsConfig:
2020
ads: {}
21+
resourceApiVersion: V3
2122
cdsConfig:
2223
ads: {}
24+
resourceApiVersion: V3
2325
layeredRuntime:
2426
layers:
2527
- name: runtime-0
2628
rtdsLayer:
2729
name: runtime-0
2830
rtdsConfig:
2931
ads: {}
32+
resourceApiVersion: V3
3033
staticResources:
3134
clusters:
3235
- connectTimeout: 10s

‎api/config/v1alpha1/testdata/different-xds-cluster-address-bootstrap.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,18 @@ dynamicResources:
1818
transportApiVersion: V3
1919
ldsConfig:
2020
ads: {}
21+
resourceApiVersion: V3
2122
cdsConfig:
2223
ads: {}
24+
resourceApiVersion: V3
2325
layeredRuntime:
2426
layers:
2527
- name: runtime-0
2628
rtdsLayer:
2729
name: runtime-0
2830
rtdsConfig:
2931
ads: {}
32+
resourceApiVersion: V3
3033
staticResources:
3134
clusters:
3235
- connectTimeout: 10s

‎api/config/v1alpha1/testdata/missing-admin-address-user-bootstrap.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,18 @@ dynamicResources:
1717
transportApiVersion: V3
1818
ldsConfig:
1919
ads: {}
20+
resourceApiVersion: V3
2021
cdsConfig:
2122
ads: {}
23+
resourceApiVersion: V3
2224
layeredRuntime:
2325
layers:
2426
- name: runtime-0
2527
rtdsLayer:
2628
name: runtime-0
2729
rtdsConfig:
2830
ads: {}
31+
resourceApiVersion: V3
2932
staticResources:
3033
clusters:
3134
- connectTimeout: 10s

‎api/config/v1alpha1/testdata/valid-user-bootstrap.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,18 @@ dynamicResources:
1818
transportApiVersion: V3
1919
ldsConfig:
2020
ads: {}
21+
resourceApiVersion: V3
2122
cdsConfig:
2223
ads: {}
24+
resourceApiVersion: V3
2325
layeredRuntime:
2426
layers:
2527
- name: runtime-0
2628
rtdsLayer:
2729
name: runtime-0
2830
rtdsConfig:
2931
ads: {}
32+
resourceApiVersion: V3
3033
staticResources:
3134
clusters:
3235
- connectTimeout: 10s

‎docs/latest/user/customize-envoyproxy.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,10 @@ spec:
249249
set_node_on_first_message_only: true
250250
lds_config:
251251
ads: {}
252+
resource_api_version: V3
252253
cds_config:
253254
ads: {}
255+
resource_api_version: V3
254256
static_resources:
255257
clusters:
256258
- connect_timeout: 10s
@@ -295,6 +297,7 @@ spec:
295297
rtds_layer:
296298
rtds_config:
297299
ads: {}
300+
resource_api_version: V3
298301
name: runtime-0
299302
EOF
300303
```

‎docs/latest/user/egctl.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,10 @@ envoyProxy:
473473
set_node_on_first_message_only: true
474474
lds_config:
475475
ads: {}
476+
resource_api_version: V3
476477
cds_config:
477478
ads: {}
479+
resource_api_version: V3
478480
static_resources:
479481
clusters:
480482
- connect_timeout: 10s
@@ -519,6 +521,7 @@ envoyProxy:
519521
rtds_layer:
520522
rtds_config:
521523
ads: {}
524+
resource_api_version: V3
522525
name: runtime-0
523526
logging: {}
524527
status: {}

‎internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ envoyProxy:
2525
set_node_on_first_message_only: true
2626
lds_config:
2727
ads: {}
28+
resource_api_version: V3
2829
cds_config:
2930
ads: {}
31+
resource_api_version: V3
3032
static_resources:
3133
clusters:
3234
- connect_timeout: 10s
@@ -71,6 +73,7 @@ envoyProxy:
7173
rtds_layer:
7274
rtds_config:
7375
ads: {}
76+
resource_api_version: V3
7477
name: runtime-0
7578
logging: {}
7679
telemetry: {}
@@ -410,15 +413,18 @@ xds:
410413
transportApiVersion: V3
411414
cdsConfig:
412415
ads: {}
416+
resourceApiVersion: V3
413417
ldsConfig:
414418
ads: {}
419+
resourceApiVersion: V3
415420
layeredRuntime:
416421
layers:
417422
- name: runtime-0
418423
rtdsLayer:
419424
name: runtime-0
420425
rtdsConfig:
421426
ads: {}
427+
resourceApiVersion: V3
422428
staticResources:
423429
clusters:
424430
- connectTimeout: 10s

‎internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,12 @@
3636
"transportApiVersion": "V3"
3737
},
3838
"cdsConfig": {
39-
"ads": {}
39+
"ads": {},
40+
"resourceApiVersion": "V3"
4041
},
4142
"ldsConfig": {
42-
"ads": {}
43+
"ads": {},
44+
"resourceApiVersion": "V3"
4345
}
4446
},
4547
"layeredRuntime": {
@@ -49,7 +51,8 @@
4951
"rtdsLayer": {
5052
"name": "runtime-0",
5153
"rtdsConfig": {
52-
"ads": {}
54+
"ads": {},
55+
"resourceApiVersion": "V3"
5356
}
5457
}
5558
}
@@ -858,4 +861,4 @@
858861
]
859862
}
860863
}
861-
}
864+
}

‎internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,18 @@ xds:
2323
transportApiVersion: V3
2424
cdsConfig:
2525
ads: {}
26+
resourceApiVersion: V3
2627
ldsConfig:
2728
ads: {}
29+
resourceApiVersion: V3
2830
layeredRuntime:
2931
layers:
3032
- name: runtime-0
3133
rtdsLayer:
3234
name: runtime-0
3335
rtdsConfig:
3436
ads: {}
37+
resourceApiVersion: V3
3538
staticResources:
3639
clusters:
3740
- connectTimeout: 10s

‎internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,18 @@ xds:
2222
transportApiVersion: V3
2323
cdsConfig:
2424
ads: {}
25+
resourceApiVersion: V3
2526
ldsConfig:
2627
ads: {}
28+
resourceApiVersion: V3
2729
layeredRuntime:
2830
layers:
2931
- name: runtime-0
3032
rtdsLayer:
3133
name: runtime-0
3234
rtdsConfig:
3335
ads: {}
36+
resourceApiVersion: V3
3437
staticResources:
3538
clusters:
3639
- connectTimeout: 10s

0 commit comments

Comments
 (0)