Skip to content

Commit 8a0e04e

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2677 from jwendell/bump-conformance-refs1
Bump conformance images
2 parents 487d2ec + 710cb4e commit 8a0e04e

File tree

3 files changed

+22
-18
lines changed

3 files changed

+22
-18
lines changed

‎conformance/base/manifests.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ spec:
126126
containers:
127127
- name: infra-backend-v1
128128
# From https://github.com/kubernetes-sigs/ingress-controller-conformance/tree/master/images/echoserver
129-
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231024-v1.0.0-rc1-33-g9c830e50
129+
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e
130130
env:
131131
- name: POD_NAME
132132
valueFrom:
@@ -172,7 +172,7 @@ spec:
172172
spec:
173173
containers:
174174
- name: infra-backend-v2
175-
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231024-v1.0.0-rc1-33-g9c830e50
175+
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e
176176
env:
177177
- name: POD_NAME
178178
valueFrom:
@@ -218,7 +218,7 @@ spec:
218218
spec:
219219
containers:
220220
- name: infra-backend-v3
221-
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231024-v1.0.0-rc1-33-g9c830e50
221+
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e
222222
env:
223223
- name: POD_NAME
224224
valueFrom:
@@ -264,7 +264,7 @@ spec:
264264
spec:
265265
containers:
266266
- name: tls-backend
267-
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231024-v1.0.0-rc1-33-g9c830e50
267+
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e
268268
volumeMounts:
269269
- name: secret-volume
270270
mountPath: /etc/secret-volume
@@ -333,7 +333,7 @@ spec:
333333
spec:
334334
containers:
335335
- name: tls-backend
336-
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231024-v1.0.0-rc1-33-g9c830e50
336+
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e
337337
volumeMounts:
338338
- name: secret-volume
339339
mountPath: /etc/secret-volume
@@ -395,7 +395,7 @@ spec:
395395
spec:
396396
containers:
397397
- name: app-backend-v1
398-
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231024-v1.0.0-rc1-33-g9c830e50
398+
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e
399399
env:
400400
- name: POD_NAME
401401
valueFrom:
@@ -441,7 +441,7 @@ spec:
441441
spec:
442442
containers:
443443
- name: app-backend-v2
444-
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231024-v1.0.0-rc1-33-g9c830e50
444+
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e
445445
env:
446446
- name: POD_NAME
447447
valueFrom:
@@ -494,7 +494,7 @@ spec:
494494
spec:
495495
containers:
496496
- name: web-backend
497-
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231024-v1.0.0-rc1-33-g9c830e50
497+
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e
498498
env:
499499
- name: POD_NAME
500500
valueFrom:

‎conformance/mesh/manifests.yaml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,14 @@ spec:
2626
spec:
2727
containers:
2828
- name: echo
29-
image: gcr.io/k8s-staging-gateway-api/echo-advanced:v20231024-v1.0.0-rc1-33-g9c830e50
29+
image: gcr.io/k8s-staging-gateway-api/echo-advanced:v20231214-v1.0.0-140-gf544a46e
3030
imagePullPolicy: IfNotPresent
3131
args:
3232
- --tcp=9090
33-
- --port=80
3433
- --port=8080
3534
- --grpc=7070
36-
- --port=443
37-
- --tls=443
35+
- --port=8443
36+
- --tls=8443
3837
- --crt=/cert.crt
3938
- --key=/cert.key
4039
---
@@ -51,11 +50,13 @@ spec:
5150
- name: http
5251
port: 80
5352
appProtocol: http
53+
targetPort: 8080
5454
- name: http-alt
5555
port: 8080
5656
appProtocol: http
5757
- name: https
5858
port: 443
59+
targetPort: 8443
5960
- name: tcp
6061
port: 9090
6162
- name: grpc
@@ -82,15 +83,14 @@ spec:
8283
spec:
8384
containers:
8485
- name: echo
85-
image: gcr.io/k8s-staging-gateway-api/echo-advanced:v20231024-v1.0.0-rc1-33-g9c830e50
86+
image: gcr.io/k8s-staging-gateway-api/echo-advanced:v20231214-v1.0.0-140-gf544a46e
8687
imagePullPolicy: IfNotPresent
8788
args:
8889
- --tcp=9090
89-
- --port=80
9090
- --port=8080
9191
- --grpc=7070
92-
- --port=443
93-
- --tls=443
92+
- --port=8443
93+
- --tls=8443
9494
- --crt=/cert.crt
9595
- --key=/cert.key
9696
---
@@ -107,11 +107,13 @@ spec:
107107
- name: http
108108
port: 80
109109
appProtocol: http
110+
targetPort: 8080
110111
- name: http-alt
111112
port: 8080
112113
appProtocol: http
113114
- name: https
114115
port: 443
116+
targetPort: 8443
115117
- name: tcp
116118
port: 9090
117119
- name: grpc
@@ -130,11 +132,13 @@ spec:
130132
- name: http
131133
port: 80
132134
appProtocol: http
135+
targetPort: 8080
133136
- name: http-alt
134137
port: 8080
135138
appProtocol: http
136139
- name: https
137140
port: 443
141+
targetPort: 8443
138142
- name: tcp
139143
port: 9090
140144
- name: grpc
@@ -168,5 +172,5 @@ spec:
168172
spec:
169173
containers:
170174
- name: echo
171-
image: gcr.io/k8s-staging-gateway-api/echo-advanced:v20231024-v1.0.0-rc1-33-g9c830e50
175+
image: gcr.io/k8s-staging-gateway-api/echo-advanced:v20231214-v1.0.0-140-gf544a46e
172176
imagePullPolicy: IfNotPresent

‎conformance/tests/mesh-frontend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ var MeshFrontend = suite.ConformanceTest{
5959
{
6060
TestCaseName: "Send to pod IP",
6161
Request: http.Request{
62-
Host: v2.Address,
62+
Host: v2.Address + ":8080",
6363
Method: "GET",
6464
},
6565
Response: http.Response{

0 commit comments

Comments
 (0)