Skip to content

Commit d6a9c5e

Browse files
z103cbz103cb
authored
Update MCAD dependancies as there are vulnerabilities as reported by GH (#472)
* Update MCAD dependancies as there are vulnerabilities as reported by GH Re-enabled pending test to allow for test to pass. Fixes #422 * Added logic to not dump the logs if the tests are successful
1 parent d31d044 commit d6a9c5e

File tree

4 files changed

+74
-57
lines changed

4 files changed

+74
-57
lines changed

‎go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,16 @@ require (
7171
go.uber.org/atomic v1.4.0 // indirect
7272
go.uber.org/multierr v1.1.0 // indirect
7373
go.uber.org/zap v1.10.0 // indirect
74-
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect
75-
golang.org/x/mod v0.4.2 // indirect
76-
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect
74+
golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b // indirect
75+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
76+
golang.org/x/net v0.7.0 // indirect
7777
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
78-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
79-
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
80-
golang.org/x/text v0.3.4 // indirect
78+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
79+
golang.org/x/sys v0.5.0 // indirect
80+
golang.org/x/term v0.5.0 // indirect
81+
golang.org/x/text v0.7.0 // indirect
8182
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
82-
golang.org/x/tools v0.1.4 // indirect
83-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
83+
golang.org/x/tools v0.1.12 // indirect
8484
google.golang.org/appengine v1.6.5 // indirect
8585
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
8686
google.golang.org/grpc v1.27.1 // indirect

‎go.sum

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,9 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
431431
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
432432
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
433433
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
434-
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE=
435434
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
435+
golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b h1:Qwe1rC8PSniVfAFPFJeyUkB+zcysC3RgJBAGk7eqBEU=
436+
golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
436437
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
437438
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
438439
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -463,8 +464,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
463464
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
464465
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
465466
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
466-
golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
467-
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
467+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
468+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
468469
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
469470
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
470471
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -493,8 +494,8 @@ golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLL
493494
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
494495
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
495496
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
496-
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0=
497-
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
497+
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
498+
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
498499
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
499500
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
500501
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -508,8 +509,8 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ
508509
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
509510
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
510511
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
511-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
512-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
512+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
513+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
513514
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
514515
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
515516
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -544,20 +545,20 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w
544545
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
545546
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
546547
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
547-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
548548
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
549-
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
550549
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
551-
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
552-
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
553-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
550+
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
551+
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
552+
golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
553+
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
554554
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
555555
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
556556
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
557557
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
558558
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
559-
golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
560559
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
560+
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
561+
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
561562
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
562563
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
563564
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -602,8 +603,8 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK
602603
golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
603604
golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
604605
golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
605-
golang.org/x/tools v0.1.4 h1:cVngSRcfgyZCzys3KYOpCFa+4dqX/Oub9tAq00ttGVs=
606-
golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
606+
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
607+
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
607608
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
608609
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
609610
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎hack/run-e2e-kind.sh

Lines changed: 45 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ export IMAGE_MCAD="${IMAGE_REPOSITORY_MCAD}:${IMAGE_TAG_MCAD}"
4545
CLUSTER_STARTED="false"
4646
export KUTTL_VERSION=0.15.0
4747
export KUTTL_OPTIONS=${TEST_KUTTL_OPTIONS}
48-
export KUTTL_TEST_SUITES=("${ROOT_DIR}/test/kuttl-test.yaml" "${ROOT_DIR}/test/kuttl-test-deployment-03.yaml" "${ROOT_DIR}/test/kuttl-test-deployment-02.yaml" "${ROOT_DIR}/test/kuttl-test-deployment-01.yaml")
48+
export KUTTL_TEST_SUITES=("${ROOT_DIR}/test/kuttl-test.yaml" "${ROOT_DIR}/test/kuttl-test-deployment-03.yaml" "${ROOT_DIR}/test/kuttl-test-deployment-02.yaml" "${ROOT_DIR}/test/kuttl-test-deployment-01.yaml")
49+
DUMP_LOGS="true"
50+
4951

5052
function update_test_host {
5153

@@ -258,49 +260,54 @@ function cleanup {
258260
return
259261
fi
260262

261-
echo "Custom Resource Definitions..."
262-
echo "kubectl get crds"
263-
kubectl get crds
263+
if [[ ${DUMP_LOGS} == "true" ]]
264+
then
264265

265-
echo "---"
266-
echo "Get All AppWrappers..."
267-
kubectl get appwrappers --all-namespaces -o yaml
266+
echo "Custom Resource Definitions..."
267+
echo "kubectl get crds"
268+
kubectl get crds
268269

269-
echo "---"
270-
echo "Describe all AppWrappers..."
271-
kubectl describe appwrappers --all-namespaces
270+
echo "---"
271+
echo "Get All AppWrappers..."
272+
kubectl get appwrappers --all-namespaces -o yaml
272273

273-
echo "---"
274-
echo "'test' Pod list..."
275-
kubectl get pods -n test
274+
echo "---"
275+
echo "Describe all AppWrappers..."
276+
kubectl describe appwrappers --all-namespaces
276277

277-
echo "---"
278-
echo "'test' Pod yaml..."
279-
kubectl get pods -n test -o yaml
278+
echo "---"
279+
echo "'test' Pod list..."
280+
kubectl get pods -n test
280281

281-
echo "---"
282-
echo "'test' Pod descriptions..."
283-
kubectl describe pods -n test
282+
echo "---"
283+
echo "'test' Pod yaml..."
284+
kubectl get pods -n test -o yaml
284285

285-
echo "---"
286-
echo "'all' Namespaces list..."
287-
kubectl get namespaces
286+
echo "---"
287+
echo "'test' Pod descriptions..."
288+
kubectl describe pods -n test
288289

289-
echo "---"
290-
echo "'aw-namespace-1' Namespace list..."
291-
kubectl get namespace aw-namespace-1 -o yaml
290+
echo "---"
291+
echo "'all' Namespaces list..."
292+
kubectl get namespaces
292293

293-
echo "===================================================================================="
294-
echo "==========================>>>>> MCAD Controller Logs <<<<<=========================="
295-
echo "===================================================================================="
296-
local mcad_pod=$(kubectl get pods -n kube-system | grep mcad-controller | awk '{print $1}')
297-
if [[ "$mcad_pod" != "" ]]
298-
then
299-
echo "kubectl logs ${mcad_pod} -n kube-system"
300-
kubectl logs ${mcad_pod} -n kube-system
294+
echo "---"
295+
echo "'aw-namespace-1' Namespace list..."
296+
kubectl get namespace aw-namespace-1 -o yaml
297+
298+
echo "===================================================================================="
299+
echo "==========================>>>>> MCAD Controller Logs <<<<<=========================="
300+
echo "===================================================================================="
301+
local mcad_pod=$(kubectl get pods -n kube-system | grep mcad-controller | awk '{print $1}')
302+
if [[ "$mcad_pod" != "" ]]
303+
then
304+
echo "kubectl logs ${mcad_pod} -n kube-system"
305+
kubectl logs ${mcad_pod} -n kube-system
306+
fi
301307
fi
308+
302309
rm -f kubeconfig
303-
310+
304311
if [[ $CLEANUP_CLUSTER == "true" ]]
305312
then
306313
kind delete cluster ${CLUSTER_CONTEXT}
@@ -400,3 +407,7 @@ setup-mcad-env
400407
kuttl-tests
401408
mcad-up
402409
go test ./test/e2e -v -timeout 130m -count=1
410+
if [ ${?} -eq 0 ]
411+
then
412+
DUMP_LOGS="false"
413+
fi

‎test/e2e/queue.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,9 @@ var _ = Describe("AppWrapper E2E Test", func() {
367367

368368
})
369369

370+
// This test is flawed, the namespace created by this appwrapper is not cleaned up.
371+
// FIXME https://github.com/project-codeflare/multi-cluster-app-dispatcher/issues/471
372+
// Leaving it here so that the builds no longer fail
370373
It("Create AppWrapper - Namespace Only - 0 Pods", func() {
371374
fmt.Fprintf(os.Stdout, "[e2e] Create AppWrapper - Namespace Only - 0 Pods - Started.\n")
372375
context := initTestContext()
@@ -376,9 +379,11 @@ var _ = Describe("AppWrapper E2E Test", func() {
376379

377380
aw := createNamespaceAW(context, "aw-namespace-0")
378381
appwrappers = append(appwrappers, aw)
382+
fmt.Fprintf(GinkgoWriter, "[e2e] Create AppWrapper - Namespace Only - 0 Pods - app wrappers len %d.\n", len(appwrappers))
379383

380384
err := waitAWNonComputeResourceActive(context, aw)
381385
Expect(err).NotTo(HaveOccurred())
386+
fmt.Fprintf(os.Stdout, "[e2e] Create AppWrapper - Namespace Only - 0 Pods - Completed. Awaiting app wrapper cleanup\n")
382387
})
383388

384389
It("Create AppWrapper - Generic Namespace Only - 0 Pods", func() {

0 commit comments

Comments
 (0)