Skip to content

Commit d6131a6

Browse files
cskhdanielm-codefresh
authored andcommitted
fix: e2e istio crd; deprecated apiextensions/v1beta1 (argoproj#1740)
Signed-off-by: Hui Kang <[email protected]>
1 parent 89ce984 commit d6131a6

16 files changed

+5936
-2962
lines changed
Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
name: alb-rollout-root
5+
spec:
6+
type: NodePort
7+
ports:
8+
- port: 80
9+
targetPort: http
10+
protocol: TCP
11+
name: http
12+
selector:
13+
app: alb-rollout
14+
---
15+
apiVersion: v1
16+
kind: Service
17+
metadata:
18+
name: alb-rollout-canary
19+
spec:
20+
type: NodePort
21+
ports:
22+
- port: 80
23+
targetPort: http
24+
protocol: TCP
25+
name: http
26+
selector:
27+
app: alb-rollout
28+
---
29+
apiVersion: v1
30+
kind: Service
31+
metadata:
32+
name: alb-rollout-stable
33+
spec:
34+
type: NodePort
35+
ports:
36+
- port: 80
37+
targetPort: http
38+
protocol: TCP
39+
name: http
40+
selector:
41+
app: alb-rollout
42+
---
43+
apiVersion: networking.k8s.io/v1
44+
kind: Ingress
45+
metadata:
46+
name: alb-rollout-ingress
47+
annotations:
48+
kubernetes.io/ingress.class: alb
49+
spec:
50+
rules:
51+
- http:
52+
paths:
53+
- path: /*
54+
pathType: ImplementationSpecific
55+
backend:
56+
service:
57+
name: alb-rollout-root
58+
port:
59+
name: use-annotation
60+
---
61+
apiVersion: argoproj.io/v1alpha1
62+
kind: Rollout
63+
metadata:
64+
name: alb-rollout
65+
spec:
66+
selector:
67+
matchLabels:
68+
app: alb-rollout
69+
template:
70+
metadata:
71+
labels:
72+
app: alb-rollout
73+
spec:
74+
containers:
75+
- name: alb-rollout
76+
image: nginx:1.19-alpine
77+
ports:
78+
- name: http
79+
containerPort: 80
80+
protocol: TCP
81+
resources:
82+
requests:
83+
memory: 16Mi
84+
cpu: 5m
85+
strategy:
86+
canary:
87+
canaryService: alb-rollout-canary
88+
stableService: alb-rollout-stable
89+
trafficRouting:
90+
alb:
91+
ingress: alb-rollout-ingress
92+
rootService: alb-rollout-root
93+
servicePort: 80
94+
steps:
95+
- experiment:
96+
templates:
97+
- name: experiment-alb-canary
98+
specRef: canary
99+
weight: 20
100+
- name: experiment-alb-stable
101+
specRef: stable
102+
weight: 20

test/e2e/alb/rollout-alb-experiment.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
selector:
4141
app: alb-rollout
4242
---
43-
apiVersion: networking.k8s.io/v1beta1
43+
apiVersion: networking.k8s.io/v1
4444
kind: Ingress
4545
metadata:
4646
name: alb-rollout-ingress
@@ -51,9 +51,12 @@ spec:
5151
- http:
5252
paths:
5353
- path: /*
54+
pathType: ImplementationSpecific
5455
backend:
55-
serviceName: alb-rollout-root
56-
servicePort: use-annotation
56+
service:
57+
name: alb-rollout-root
58+
port:
59+
name: use-annotation
5760
---
5861
apiVersion: argoproj.io/v1alpha1
5962
kind: Rollout

0 commit comments

Comments
 (0)