Skip to content

Commit 5833bb7

Browse files
cnvergencezirain
cnvergence
authored and
zirain
committed
update codegen
Signed-off-by: Karol Szwaj <[email protected]>
1 parent 49aa24b commit 5833bb7

39 files changed

+987
-1966
lines changed

‎internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml

+15-22
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,15 @@ spec:
4646
- envoy
4747
env:
4848
- name: ENVOY_GATEWAY_NAMESPACE
49-
value: envoy-gateway-system
49+
valueFrom:
50+
fieldRef:
51+
apiVersion: v1
52+
fieldPath: metadata.namespace
5053
- name: ENVOY_SERVICE_ZONE
5154
valueFrom:
5255
fieldRef:
5356
apiVersion: v1
54-
fieldPath: metadata.labels['topology.kubernetes.io/zone']
57+
fieldPath: metadata.annotations['topology.kubernetes.io/zone']
5558
- name: ENVOY_POD_NAME
5659
valueFrom:
5760
fieldRef:
@@ -123,22 +126,22 @@ spec:
123126
readOnly: true
124127
- mountPath: /sds
125128
name: sds
126-
- mountPath: /var/run/secrets/token
127-
name: sa-token
128-
readOnly: true
129129
- args:
130130
- envoy
131131
- shutdown-manager
132132
command:
133133
- envoy-gateway
134134
env:
135135
- name: ENVOY_GATEWAY_NAMESPACE
136-
value: envoy-gateway-system
136+
valueFrom:
137+
fieldRef:
138+
apiVersion: v1
139+
fieldPath: metadata.namespace
137140
- name: ENVOY_SERVICE_ZONE
138141
valueFrom:
139142
fieldRef:
140143
apiVersion: v1
141-
fieldPath: metadata.labels['topology.kubernetes.io/zone']
144+
fieldPath: metadata.annotations['topology.kubernetes.io/zone']
142145
- name: ENVOY_POD_NAME
143146
valueFrom:
144147
fieldRef:
@@ -204,27 +207,17 @@ spec:
204207
serviceAccountName: envoy-default-37a8eec1
205208
terminationGracePeriodSeconds: 360
206209
volumes:
207-
- name: sa-token
208-
projected:
209-
defaultMode: 420
210-
sources:
211-
- serviceAccountToken:
212-
audience: envoy-gateway.envoy-gateway-system.svc.cluster.local
213-
expirationSeconds: 3600
214-
path: sa-token
215-
- configMap:
210+
- name: certs
211+
secret:
216212
defaultMode: 420
217-
items:
218-
- key: ca.crt
219-
path: ca.crt
220-
name: envoy-default-37a8eec1
221-
optional: false
222-
name: certs
213+
secretName: envoy
223214
- configMap:
224215
defaultMode: 420
225216
items:
226217
- key: xds-trusted-ca.json
227218
path: xds-trusted-ca.json
219+
- key: xds-certificate.json
220+
path: xds-certificate.json
228221
name: envoy-default-37a8eec1
229222
optional: false
230223
name: sds

‎internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml

+27-55
Original file line numberDiff line numberDiff line change
@@ -160,20 +160,6 @@ spec:
160160
connection_keepalive:
161161
interval: 30s
162162
timeout: 5s
163-
http_filters:
164-
- name: envoy.filters.http.credential_injector
165-
typed_config:
166-
"@type": type.googleapis.com/envoy.extensions.filters.http.credential_injector.v3.CredentialInjector
167-
credential:
168-
name: envoy.http.injected_credentials.generic
169-
typed_config:
170-
"@type": type.googleapis.com/envoy.extensions.http.injected_credentials.generic.v3.Generic
171-
credential:
172-
name: jwt-sa-bearer
173-
overwrite: true
174-
- name: envoy.extensions.filters.http.upstream_codec.v3.UpstreamCodec
175-
typed_config:
176-
"@type": type.googleapis.com/envoy.extensions.filters.http.upstream_codec.v3.UpstreamCodec
177163
name: xds_cluster
178164
type: STRICT_DNS
179165
transport_socket:
@@ -183,6 +169,12 @@ spec:
183169
common_tls_context:
184170
tls_params:
185171
tls_maximum_protocol_version: TLSv1_3
172+
tls_certificate_sds_secret_configs:
173+
- name: xds_certificate
174+
sds_config:
175+
path_config_source:
176+
path: /sds/xds-certificate.json
177+
resource_api_version: V3
186178
validation_context_sds_secret_config:
187179
name: xds_trusted_ca
188180
sds_config:
@@ -208,38 +200,25 @@ spec:
208200
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
209201
explicit_http_config:
210202
http2_protocol_options: {}
211-
http_filters:
212-
- name: envoy.filters.http.credential_injector
213-
typed_config:
214-
"@type": type.googleapis.com/envoy.extensions.filters.http.credential_injector.v3.CredentialInjector
215-
credential:
216-
name: envoy.http.injected_credentials.generic
217-
typed_config:
218-
"@type": type.googleapis.com/envoy.extensions.http.injected_credentials.generic.v3.Generic
219-
credential:
220-
name: jwt-sa-bearer
221-
overwrite: true
222-
- name: envoy.extensions.filters.http.upstream_codec.v3.UpstreamCodec
223-
typed_config:
224-
"@type": type.googleapis.com/envoy.extensions.filters.http.upstream_codec.v3.UpstreamCodec
225203
transport_socket:
226204
name: envoy.transport_sockets.tls
227205
typed_config:
228206
"@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext
229207
common_tls_context:
230208
tls_params:
231209
tls_maximum_protocol_version: TLSv1_3
210+
tls_certificate_sds_secret_configs:
211+
- name: xds_certificate
212+
sds_config:
213+
path_config_source:
214+
path: /sds/xds-certificate.json
215+
resource_api_version: V3
232216
validation_context_sds_secret_config:
233217
name: xds_trusted_ca
234218
sds_config:
235219
path_config_source:
236220
path: /sds/xds-trusted-ca.json
237221
resource_api_version: V3
238-
secrets:
239-
- name: jwt-sa-bearer
240-
generic_secret:
241-
secret:
242-
filename: "/var/run/secrets/token/sa-token"
243222
overload_manager:
244223
refresh_interval: 0.25s
245224
resource_monitors:
@@ -270,12 +249,15 @@ spec:
270249
- envoy
271250
env:
272251
- name: ENVOY_GATEWAY_NAMESPACE
273-
value: envoy-gateway-system
252+
valueFrom:
253+
fieldRef:
254+
apiVersion: v1
255+
fieldPath: metadata.namespace
274256
- name: ENVOY_SERVICE_ZONE
275257
valueFrom:
276258
fieldRef:
277259
apiVersion: v1
278-
fieldPath: metadata.labels['topology.kubernetes.io/zone']
260+
fieldPath: metadata.annotations['topology.kubernetes.io/zone']
279261
- name: ENVOY_POD_NAME
280262
valueFrom:
281263
fieldRef:
@@ -341,22 +323,22 @@ spec:
341323
readOnly: true
342324
- mountPath: /sds
343325
name: sds
344-
- mountPath: /var/run/secrets/token
345-
name: sa-token
346-
readOnly: true
347326
- args:
348327
- envoy
349328
- shutdown-manager
350329
command:
351330
- envoy-gateway
352331
env:
353332
- name: ENVOY_GATEWAY_NAMESPACE
354-
value: envoy-gateway-system
333+
valueFrom:
334+
fieldRef:
335+
apiVersion: v1
336+
fieldPath: metadata.namespace
355337
- name: ENVOY_SERVICE_ZONE
356338
valueFrom:
357339
fieldRef:
358340
apiVersion: v1
359-
fieldPath: metadata.labels['topology.kubernetes.io/zone']
341+
fieldPath: metadata.annotations['topology.kubernetes.io/zone']
360342
- name: ENVOY_POD_NAME
361343
valueFrom:
362344
fieldRef:
@@ -415,27 +397,17 @@ spec:
415397
serviceAccountName: envoy-default-37a8eec1
416398
terminationGracePeriodSeconds: 360
417399
volumes:
418-
- name: sa-token
419-
projected:
400+
- name: certs
401+
secret:
420402
defaultMode: 420
421-
sources:
422-
- serviceAccountToken:
423-
audience: envoy-gateway.envoy-gateway-system.svc.cluster.local
424-
expirationSeconds: 3600
425-
path: sa-token
426-
- configMap:
427-
defaultMode: 420
428-
items:
429-
- key: ca.crt
430-
path: ca.crt
431-
name: envoy-default-37a8eec1
432-
optional: false
433-
name: certs
403+
secretName: envoy
434404
- configMap:
435405
defaultMode: 420
436406
items:
437407
- key: xds-trusted-ca.json
438408
path: xds-trusted-ca.json
409+
- key: xds-certificate.json
410+
path: xds-certificate.json
439411
name: envoy-default-37a8eec1
440412
optional: false
441413
name: sds

‎internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml

+27-55
Original file line numberDiff line numberDiff line change
@@ -159,20 +159,6 @@ spec:
159159
connection_keepalive:
160160
interval: 30s
161161
timeout: 5s
162-
http_filters:
163-
- name: envoy.filters.http.credential_injector
164-
typed_config:
165-
"@type": type.googleapis.com/envoy.extensions.filters.http.credential_injector.v3.CredentialInjector
166-
credential:
167-
name: envoy.http.injected_credentials.generic
168-
typed_config:
169-
"@type": type.googleapis.com/envoy.extensions.http.injected_credentials.generic.v3.Generic
170-
credential:
171-
name: jwt-sa-bearer
172-
overwrite: true
173-
- name: envoy.extensions.filters.http.upstream_codec.v3.UpstreamCodec
174-
typed_config:
175-
"@type": type.googleapis.com/envoy.extensions.filters.http.upstream_codec.v3.UpstreamCodec
176162
name: xds_cluster
177163
type: STRICT_DNS
178164
transport_socket:
@@ -182,6 +168,12 @@ spec:
182168
common_tls_context:
183169
tls_params:
184170
tls_maximum_protocol_version: TLSv1_3
171+
tls_certificate_sds_secret_configs:
172+
- name: xds_certificate
173+
sds_config:
174+
path_config_source:
175+
path: /sds/xds-certificate.json
176+
resource_api_version: V3
185177
validation_context_sds_secret_config:
186178
name: xds_trusted_ca
187179
sds_config:
@@ -207,38 +199,25 @@ spec:
207199
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
208200
explicit_http_config:
209201
http2_protocol_options: {}
210-
http_filters:
211-
- name: envoy.filters.http.credential_injector
212-
typed_config:
213-
"@type": type.googleapis.com/envoy.extensions.filters.http.credential_injector.v3.CredentialInjector
214-
credential:
215-
name: envoy.http.injected_credentials.generic
216-
typed_config:
217-
"@type": type.googleapis.com/envoy.extensions.http.injected_credentials.generic.v3.Generic
218-
credential:
219-
name: jwt-sa-bearer
220-
overwrite: true
221-
- name: envoy.extensions.filters.http.upstream_codec.v3.UpstreamCodec
222-
typed_config:
223-
"@type": type.googleapis.com/envoy.extensions.filters.http.upstream_codec.v3.UpstreamCodec
224202
transport_socket:
225203
name: envoy.transport_sockets.tls
226204
typed_config:
227205
"@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext
228206
common_tls_context:
229207
tls_params:
230208
tls_maximum_protocol_version: TLSv1_3
209+
tls_certificate_sds_secret_configs:
210+
- name: xds_certificate
211+
sds_config:
212+
path_config_source:
213+
path: /sds/xds-certificate.json
214+
resource_api_version: V3
231215
validation_context_sds_secret_config:
232216
name: xds_trusted_ca
233217
sds_config:
234218
path_config_source:
235219
path: /sds/xds-trusted-ca.json
236220
resource_api_version: V3
237-
secrets:
238-
- name: jwt-sa-bearer
239-
generic_secret:
240-
secret:
241-
filename: "/var/run/secrets/token/sa-token"
242221
overload_manager:
243222
refresh_interval: 0.25s
244223
resource_monitors:
@@ -269,12 +248,15 @@ spec:
269248
- envoy
270249
env:
271250
- name: ENVOY_GATEWAY_NAMESPACE
272-
value: envoy-gateway-system
251+
valueFrom:
252+
fieldRef:
253+
apiVersion: v1
254+
fieldPath: metadata.namespace
273255
- name: ENVOY_SERVICE_ZONE
274256
valueFrom:
275257
fieldRef:
276258
apiVersion: v1
277-
fieldPath: metadata.labels['topology.kubernetes.io/zone']
259+
fieldPath: metadata.annotations['topology.kubernetes.io/zone']
278260
- name: ENVOY_POD_NAME
279261
valueFrom:
280262
fieldRef:
@@ -340,22 +322,22 @@ spec:
340322
readOnly: true
341323
- mountPath: /sds
342324
name: sds
343-
- mountPath: /var/run/secrets/token
344-
name: sa-token
345-
readOnly: true
346325
- args:
347326
- envoy
348327
- shutdown-manager
349328
command:
350329
- envoy-gateway
351330
env:
352331
- name: ENVOY_GATEWAY_NAMESPACE
353-
value: envoy-gateway-system
332+
valueFrom:
333+
fieldRef:
334+
apiVersion: v1
335+
fieldPath: metadata.namespace
354336
- name: ENVOY_SERVICE_ZONE
355337
valueFrom:
356338
fieldRef:
357339
apiVersion: v1
358-
fieldPath: metadata.labels['topology.kubernetes.io/zone']
340+
fieldPath: metadata.annotations['topology.kubernetes.io/zone']
359341
- name: ENVOY_POD_NAME
360342
valueFrom:
361343
fieldRef:
@@ -414,27 +396,17 @@ spec:
414396
serviceAccountName: envoy-default-37a8eec1
415397
terminationGracePeriodSeconds: 360
416398
volumes:
417-
- name: sa-token
418-
projected:
399+
- name: certs
400+
secret:
419401
defaultMode: 420
420-
sources:
421-
- serviceAccountToken:
422-
audience: envoy-gateway.envoy-gateway-system.svc.cluster.local
423-
expirationSeconds: 3600
424-
path: sa-token
425-
- configMap:
426-
defaultMode: 420
427-
items:
428-
- key: ca.crt
429-
path: ca.crt
430-
name: envoy-default-37a8eec1
431-
optional: false
432-
name: certs
402+
secretName: envoy
433403
- configMap:
434404
defaultMode: 420
435405
items:
436406
- key: xds-trusted-ca.json
437407
path: xds-trusted-ca.json
408+
- key: xds-certificate.json
409+
path: xds-certificate.json
438410
name: envoy-default-37a8eec1
439411
optional: false
440412
name: sds

0 commit comments

Comments
 (0)