Skip to content

Commit 236f7fc

Browse files
kflynnkflynn
committed
Use sourceIP in Mapping. Update Collision fake-test files.
Signed-off-by: Flynn <[email protected]>
1 parent b893785 commit 236f7fc

File tree

5 files changed

+157
-24
lines changed

5 files changed

+157
-24
lines changed

‎cmd/entrypoint/testdata/Collision1.yaml

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
# @TEMPLATE@
21
---
3-
apiVersion: getambassador.io/v3alpha1
2+
apiVersion: emissary-ingress.dev/v4alpha1
43
kind: Host
54
metadata:
65
name: staging.upchieve.org
76
namespace: default
87
spec:
9-
hostname: staging.upchieve.org
108
acmeProvider:
119
authority: none
1210
email: [email protected]
11+
hostname: staging.upchieve.org
1312
requestPolicy:
1413
insecure:
1514
action: Route
@@ -19,66 +18,66 @@ spec:
1918
# metadata:
2019
# name: staging
2120
---
22-
apiVersion: getambassador.io/v3alpha1
21+
apiVersion: emissary-ingress.dev/v4alpha1
2322
kind: KubernetesEndpointResolver
2423
metadata:
2524
labels:
2625
app.kubernetes.io/managed-by: pulumi
2726
name: endpoint
2827
namespace: ambassador
2928
---
30-
apiVersion: getambassador.io/v3alpha1
29+
apiVersion: emissary-ingress.dev/v4alpha1
3130
kind: Mapping
3231
metadata:
3332
name: subway-staging-socket-stable-mapping
3433
namespace: staging
3534
spec:
36-
allow_upgrade:
35+
allowUpgrade:
3736
- websocket
3837
host: staging.upchieve.org
39-
load_balancer:
38+
loadBalancer:
4039
policy: ring_hash
41-
source_ip: true
40+
sourceIP: true
4241
prefix: /
43-
query_parameters:
44-
transport: true
42+
queryParameters:
43+
transport: "true"
4544
resolver: endpoint
4645
service: subway-staging-stable.staging:3001
47-
timeout_ms: 500000
46+
timeoutMS: 500000
4847
---
49-
apiVersion: getambassador.io/v3alpha1
48+
apiVersion: emissary-ingress.dev/v4alpha1
5049
kind: Mapping
5150
metadata:
5251
name: subway-staging-whiteboard-reset-stable-mapping
5352
namespace: staging
5453
spec:
5554
host: staging.upchieve.org
56-
load_balancer:
55+
loadBalancer:
5756
policy: ring_hash
58-
source_ip: true
57+
sourceIP: true
5958
prefix: /whiteboard/reset/
6059
resolver: endpoint
6160
rewrite: /whiteboard/reset/
6261
service: subway-staging-stable.staging:3000
63-
timeout_ms: 500000
62+
timeoutMS: 500000
6463
---
65-
apiVersion: getambassador.io/v3alpha1
64+
apiVersion: emissary-ingress.dev/v4alpha1
6665
kind: Mapping
6766
metadata:
6867
name: subway-staging-whiteboard-stable-mapping
6968
namespace: staging
7069
spec:
71-
allow_upgrade:
70+
allowUpgrade:
7271
- websocket
7372
host: staging.upchieve.org
74-
load_balancer:
73+
loadBalancer:
7574
policy: ring_hash
76-
source_ip: true
75+
sourceIP: true
7776
prefix: /whiteboard/
7877
resolver: endpoint
7978
rewrite: /whiteboard/
8079
service: subway-staging-stable.staging:3000
81-
timeout_ms: 500000
80+
timeoutMS: 500000
8281
---
8382
apiVersion: v1
8483
kind: Service

‎cmd/entrypoint/testdata/Collision1_v3.yaml

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
# @TEMPLATE@
2+
---
3+
apiVersion: getambassador.io/v3alpha1
4+
kind: Host
5+
metadata:
6+
name: staging.upchieve.org
7+
namespace: default
8+
spec:
9+
hostname: staging.upchieve.org
10+
acmeProvider:
11+
authority: none
12+
email: [email protected]
13+
requestPolicy:
14+
insecure:
15+
action: Route
16+
# ---
17+
# apiVersion: v1
18+
# kind: Namespace
19+
# metadata:
20+
# name: staging
21+
---
22+
apiVersion: getambassador.io/v3alpha1
23+
kind: KubernetesEndpointResolver
24+
metadata:
25+
labels:
26+
app.kubernetes.io/managed-by: pulumi
27+
name: endpoint
28+
namespace: ambassador
29+
---
30+
apiVersion: getambassador.io/v3alpha1
31+
kind: Mapping
32+
metadata:
33+
name: subway-staging-socket-stable-mapping
34+
namespace: staging
35+
spec:
36+
allow_upgrade:
37+
- websocket
38+
host: staging.upchieve.org
39+
load_balancer:
40+
policy: ring_hash
41+
source_ip: true
42+
prefix: /
43+
query_parameters:
44+
transport: "true"
45+
resolver: endpoint
46+
service: subway-staging-stable.staging:3001
47+
timeout_ms: 500000
48+
---
49+
apiVersion: getambassador.io/v3alpha1
50+
kind: Mapping
51+
metadata:
52+
name: subway-staging-whiteboard-reset-stable-mapping
53+
namespace: staging
54+
spec:
55+
host: staging.upchieve.org
56+
load_balancer:
57+
policy: ring_hash
58+
source_ip: true
59+
prefix: /whiteboard/reset/
60+
resolver: endpoint
61+
rewrite: /whiteboard/reset/
62+
service: subway-staging-stable.staging:3000
63+
timeout_ms: 500000
64+
---
65+
apiVersion: getambassador.io/v3alpha1
66+
kind: Mapping
67+
metadata:
68+
name: subway-staging-whiteboard-stable-mapping
69+
namespace: staging
70+
spec:
71+
allow_upgrade:
72+
- websocket
73+
host: staging.upchieve.org
74+
load_balancer:
75+
policy: ring_hash
76+
source_ip: true
77+
prefix: /whiteboard/
78+
resolver: endpoint
79+
rewrite: /whiteboard/
80+
service: subway-staging-stable.staging:3000
81+
timeout_ms: 500000
82+
---
83+
apiVersion: v1
84+
kind: Service
85+
metadata:
86+
name: subway-staging-stable
87+
namespace: staging
88+
spec:
89+
selector:
90+
app: echo
91+
ports:
92+
- name: http
93+
port: 3000
94+
protocol: TCP
95+
targetPort: 3000
96+
sessionAffinity: ClientIP
97+
type: ClusterIP
98+
# ---
99+
# apiVersion: apps/v1
100+
# kind: Deployment
101+
# metadata:
102+
# name: echo
103+
# namespace: staging
104+
# spec:
105+
# replicas: 1
106+
# selector:
107+
# matchLabels:
108+
# app: echo
109+
# template:
110+
# metadata:
111+
# labels:
112+
# app: echo
113+
# spec:
114+
# containers:
115+
# - name: churn
116+
# # image: {{image "echo/Dockerfile"}}
117+
# image: churn:0.0.1
118+
# command: ["echo-server"]
119+
# ports:
120+
# - containerPort: 3000

‎cmd/entrypoint/testdata/Collision2.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
2-
apiVersion: getambassador.io/v3alpha1
2+
apiVersion: emissary-ingress.dev/v4alpha1
33
kind: Mapping
44
metadata:
55
name: subway-staging-stable-mapping
66
namespace: staging
77
spec:
88
host: staging.upchieve.org
9-
load_balancer:
9+
loadBalancer:
1010
policy: least_request
1111
prefix: /
1212
resolver: endpoint
1313
service: subway-staging-stable.staging:3000
14-
timeout_ms: 500000
14+
timeoutMS: 500000

‎cmd/entrypoint/testdata/Collision2_v3.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
apiVersion: getambassador.io/v3alpha1
3+
kind: Mapping
4+
metadata:
5+
name: subway-staging-stable-mapping
6+
namespace: staging
7+
spec:
8+
host: staging.upchieve.org
9+
load_balancer:
10+
policy: least_request
11+
prefix: /
12+
resolver: endpoint
13+
service: subway-staging-stable.staging:3000
14+
timeout_ms: 500000

‎pkg/api/emissary-ingress.dev/v4alpha1/crd_mapping.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ type LoadBalancer struct {
300300
Policy string `json:"policy,omitempty"`
301301
Cookie *LoadBalancerCookie `json:"cookie,omitempty"`
302302
Header string `json:"header,omitempty"`
303-
SourceIp *bool `json:"sourceIp,omitempty" v3:"source_ip,omitempty"`
303+
SourceIp *bool `json:"sourceIP,omitempty" v3:"source_ip,omitempty"`
304304
}
305305

306306
type LoadBalancerCookie struct {

0 commit comments

Comments
 (0)