Skip to content

Commit fc019d0

Browse files
davidhadasdavidhadas
authored
repeat tests with TLS (#129)
* repeat tests with TLS * added second kn service to test TLS with it * added second kn service to test TLS with it * added second kn service to test TLS with it * added second kn service to test TLS with it * added second kn service to test TLS with it * added second kn service to test TLS with it
1 parent aa9e181 commit fc019d0

File tree

4 files changed

+243
-16
lines changed

4 files changed

+243
-16
lines changed

‎.github/workflows/e2e.yaml‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,20 +79,43 @@ jobs:
7979
kubectl apply -f https://github.com/knative/serving/releases/download/knative-v1.8.3/serving-default-domain.yaml
8080
kubectl wait --timeout 300s --for=condition=complete job/default-domain -n knative-serving
8181
82-
- name: install test service
82+
- name: install test service1
8383
run: |
84-
kubectl apply -f ./test/e2e/deploy/httptestCrd.yaml
85-
kn service create httptest \
84+
kubectl apply -f ./test/e2e/deploy/httptest1Crd.yaml
85+
kn service create httptest1 \
8686
--image gcr.io/knative-samples/helloworld-go \
8787
--env "TARGET=Secured World" \
8888
--annotation features.knative.dev/queueproxy-podinfo=enabled \
8989
--annotation qpoption.knative.dev/guard-activate=enable
9090
URL=`kn service list|head -2|tail -1|awk '{print $2}'`
9191
echo "SERVICE_URL=$URL" >> $GITHUB_ENV
9292
93-
- name: Run e2e Tests
93+
- name: Run e2e Tests "httptest1"
9494
run: |
95-
./test/e2e/e2e-tests.sh $SERVICE_URL
95+
./test/e2e/e2e-tests.sh $SERVICE_URL "httptest1"
96+
97+
- name: Activate TLS
98+
run: |
99+
./hack/setTLS.sh
100+
101+
- name: Cleanup httptest1
102+
run: |
103+
kn service delete httptest1
104+
105+
- name: install test service2
106+
run: |
107+
kubectl apply -f ./test/e2e/deploy/httptest2Crd.yaml
108+
kn service create httptest2 \
109+
--image gcr.io/knative-samples/helloworld-go \
110+
--env "TARGET=Secured World" \
111+
--annotation features.knative.dev/queueproxy-podinfo=enabled \
112+
--annotation qpoption.knative.dev/guard-activate=enable
113+
URL=`kn service list|head -2|tail -1|awk '{print $2}'`
114+
echo "SERVICE_URL=$URL" >> $GITHUB_ENV
115+
116+
- name: Run e2e Tests With TLS
117+
run: |
118+
./test/e2e/e2e-tests.sh $SERVICE_URL "httptest2"
96119
97120
- uses: chainguard-dev/actions/kind-diag@main
98121
# Only upload logs on failure.

test/e2e/deploy/httptestCrd.yaml renamed to test/e2e/deploy/httptest1Crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Guardian
33
metadata:
44
creationTimestamp: "2022-12-11T13:40:47Z"
55
generation: 1
6-
name: httptest
6+
name: httptest1
77
namespace: default
88
resourceVersion: "40851122"
99
uid: 3b3a4231-a2b2-4bf8-bbbd-64714b7119e9

‎test/e2e/deploy/httptest2Crd.yaml‎

Lines changed: 205 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,205 @@
1+
apiVersion: guard.security.knative.dev/v1alpha1
2+
kind: Guardian
3+
metadata:
4+
creationTimestamp: "2022-12-11T13:40:47Z"
5+
generation: 1
6+
name: httptest2
7+
namespace: default
8+
resourceVersion: "40851122"
9+
uid: 3b3a4231-a2b2-4bf8-bbbd-64714b7119e9
10+
spec:
11+
control:
12+
alert: true
13+
auto: true
14+
block: false
15+
force: true
16+
learn: true
17+
learned:
18+
active: true
19+
envelop:
20+
completiontime: 0
21+
responsetime: 0
22+
pod:
23+
tcp4peers: null
24+
tcp6peers: null
25+
udp4peers: null
26+
udp6peers: null
27+
udplite4peers: null
28+
udplite6peers: null
29+
req:
30+
cip: null
31+
contentlength:
32+
- max: 0
33+
min: 0
34+
headers:
35+
kv:
36+
otherKeynames: null
37+
otherVals: null
38+
vals:
39+
Accept:
40+
digits: 0
41+
flags: 1073750272
42+
letters: 0
43+
nonreadables: 0
44+
schars: 3
45+
sequences: 1
46+
spaces: 0
47+
unicodeFlags: []
48+
unicodes: 0
49+
Forwarded:
50+
digits: 20
51+
flags: 167936
52+
letters: 20
53+
nonreadables: 0
54+
schars: 6
55+
sequences: 30
56+
spaces: 0
57+
unicodeFlags: []
58+
unicodes: 0
59+
K-Proxy-Request:
60+
digits: 0
61+
flags: 0
62+
letters: 9
63+
nonreadables: 0
64+
schars: 0
65+
sequences: 1
66+
spaces: 0
67+
unicodeFlags: []
68+
unicodes: 0
69+
User-Agent:
70+
digits: 4
71+
flags: 12288
72+
letters: 4
73+
nonreadables: 0
74+
schars: 3
75+
sequences: 7
76+
spaces: 0
77+
unicodeFlags: []
78+
unicodes: 0
79+
X-Forwarded-For:
80+
digits: 30
81+
flags: 5120
82+
letters: 0
83+
nonreadables: 0
84+
schars: 7
85+
sequences: 16
86+
spaces: 1
87+
unicodeFlags: []
88+
unicodes: 0
89+
X-Forwarded-Proto:
90+
digits: 0
91+
flags: 0
92+
letters: 4
93+
nonreadables: 0
94+
schars: 0
95+
sequences: 1
96+
spaces: 0
97+
unicodeFlags: []
98+
unicodes: 0
99+
X-Request-Id:
100+
digits: 50
101+
flags: 2048
102+
letters: 50
103+
nonreadables: 0
104+
schars: 4
105+
sequences: 80
106+
spaces: 0
107+
unicodeFlags: []
108+
unicodes: 0
109+
hopip: null
110+
mediatype:
111+
params:
112+
otherKeynames: null
113+
otherVals: null
114+
vals: {}
115+
type:
116+
set:
117+
- none
118+
method:
119+
set:
120+
- GET
121+
proto:
122+
set:
123+
- HTTP/1.1
124+
qs:
125+
kv:
126+
otherKeynames: null
127+
otherVals: null
128+
vals: {}
129+
url:
130+
segments:
131+
- max: 0
132+
min: 0
133+
val:
134+
digits: 0
135+
flags: 0
136+
letters: 0
137+
nonreadables: 0
138+
schars: 0
139+
sequences: 0
140+
spaces: 0
141+
unicodeFlags: []
142+
unicodes: 0
143+
reqbody:
144+
structured: null
145+
unstructured: null
146+
resp:
147+
contentlength:
148+
- max: 5
149+
min: 5
150+
headers:
151+
kv:
152+
otherKeynames: null
153+
otherVals: null
154+
vals:
155+
Content-Length:
156+
digits: 2
157+
flags: 0
158+
letters: 0
159+
nonreadables: 0
160+
schars: 0
161+
sequences: 1
162+
spaces: 0
163+
unicodeFlags: []
164+
unicodes: 0
165+
Content-Type:
166+
digits: 1
167+
flags: 174080
168+
letters: 19
169+
nonreadables: 0
170+
schars: 4
171+
sequences: 10
172+
spaces: 1
173+
unicodeFlags: []
174+
unicodes: 0
175+
Date:
176+
digits: 12
177+
flags: 17408
178+
letters: 9
179+
nonreadables: 0
180+
schars: 3
181+
sequences: 16
182+
spaces: 5
183+
unicodeFlags: []
184+
unicodes: 0
185+
mediatype:
186+
params:
187+
otherKeynames: null
188+
otherVals: null
189+
vals:
190+
charset:
191+
digits: 1
192+
flags: 2048
193+
letters: 3
194+
nonreadables: 0
195+
schars: 1
196+
sequences: 3
197+
spaces: 0
198+
unicodeFlags: []
199+
unicodes: 0
200+
type:
201+
set:
202+
- text/plain
203+
respbody:
204+
structured: null
205+
unstructured: null

‎test/e2e/e2e-tests.sh‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11

22
URL=$1
3+
HTTPTEST=$2
34
echo "connecting to $URL"
45
curl $URL
5-
kubectl logs deployment/httptest-00001-deployment queue-proxy
6+
kubectl logs deployment/${HTTPTEST}-00001-deployment queue-proxy
67
kubectl logs deployment/guard-service -n knative-serving
7-
response=`kubectl logs deployment/httptest-00001-deployment queue-proxy|grep -i "alert"|tail -1`
8-
responseEnd="${response#*Alert}"
9-
alert=${responseEnd%%\"*}
8+
response=`kubectl logs deployment/${HTTPTEST}-00001-deployment queue-proxy|grep INFO | grep -i "alert"|tail -1`
109

11-
echo "Alert Value: $alert"
12-
if [ "$alert" != "!" ]; then
10+
echo "response: $response"
11+
if [ ! -z ${response} ]; then
1312
exit 1
1413
fi
1514

1615
curl "$URL?a=2"
17-
kubectl logs deployment/httptest-00001-deployment queue-proxy
18-
response=`kubectl logs deployment/httptest-00001-deployment queue-proxy|grep "ALERT!"|tail -1`
16+
kubectl logs deployment/${HTTPTEST}-00001-deployment queue-proxy
17+
response=`kubectl logs deployment/${HTTPTEST}-00001-deployment queue-proxy|grep INFO |grep "ALERT!"|tail -1`
1918
responseEnd="${response#*ALERT}"
2019
alert=${responseEnd%%\"*}
2120

@@ -26,8 +25,8 @@ fi
2625

2726

2827
curl $URL -H "a:2"
29-
kubectl logs deployment/httptest-00001-deployment queue-proxy
30-
response=`kubectl logs deployment/httptest-00001-deployment queue-proxy|grep "ALERT!"|tail -1`
28+
kubectl logs deployment/${HTTPTEST}-00001-deployment queue-proxy
29+
response=`kubectl logs deployment/${HTTPTEST}-00001-deployment queue-proxy|grep INFO |grep "ALERT!"|tail -1`
3130
responseEnd="${response#*ALERT}"
3231
alert=${responseEnd%%\"*}
3332

0 commit comments

Comments
 (0)