Skip to content

Commit 082ab85

Browse files
QxBytesQxBytes
authored
ci: add cilium local redirect policy test to nightly pipeline (#3500)
* add initial lrp e2e test * clean up code * add pipeline flag * add lrp config as copy of nightly with true flag * shortcircuit changes for testing * run go mod tidy * fix ut * place integration test behind build tag * Revert "shortcircuit changes for testing" This reverts commit f5b9d9c. * move test to nightly pipeline for latest cilium version * remove restart * move test after the cns is installed * cleanup and remove unused * address linter issues * address feedback * address feedback * run go mod tidy after rebase * enable lrp flag in yaml * use older cilium version in go mod for compatibility * bump cilium to latest version in train * bump cilium to 1.15 --------- Signed-off-by: Alexander <[email protected]>
1 parent 55abaa2 commit 082ab85

File tree

23 files changed

+985
-80
lines changed

23 files changed

+985
-80
lines changed

‎.pipelines/cni/cilium/nightly-release-test.yml

+1
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ stages:
129129
name: "cilium_nightly"
130130
clusterName: ciliumnightly-$(commitID)
131131
testHubble: true
132+
testLRP: true
132133

133134
- template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
134135
parameters:

‎.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ parameters:
22
name: ""
33
clusterName: ""
44
testHubble: false
5+
testLRP: false
56
scaleup: ""
67

78

@@ -95,6 +96,16 @@ steps:
9596
retryCountOnTaskFailure: 3
9697
name: "CiliumStatus"
9798
displayName: "Cilium Status"
99+
# Run LRP test after cns and config with lrp enabled config deployed
100+
- ${{ if eq( parameters['testLRP'], true) }}:
101+
- script: |
102+
set -e
103+
cd test/integration/lrp/
104+
go test ./lrp_test.go -v -tags "lrp" -count=1 -run ^TestLRP$
105+
kubectl get pods -Aowide
106+
retryCountOnTaskFailure: 3
107+
name: "LRPTest"
108+
displayName: "Run Cilium Local Redirect Policy Test"
98109
99110
- task: AzureCLI@1
100111
inputs:

‎go.mod

+44-8
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ require (
3535
github.com/spf13/viper v1.19.0
3636
github.com/stretchr/testify v1.10.0
3737
go.uber.org/zap v1.27.0
38-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
38+
golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb
3939
golang.org/x/sys v0.31.0
4040
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
4141
google.golang.org/grpc v1.71.0
@@ -47,7 +47,7 @@ require (
4747
k8s.io/client-go v0.30.7
4848
k8s.io/klog v1.0.0
4949
k8s.io/klog/v2 v2.130.1
50-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
50+
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
5151
sigs.k8s.io/controller-runtime v0.18.4
5252
)
5353

@@ -60,12 +60,12 @@ require (
6060
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6161
github.com/coreos/go-iptables v0.8.0
6262
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
63-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
63+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
6464
github.com/fsnotify/fsnotify v1.8.0
6565
github.com/go-logr/logr v1.4.2 // indirect
66-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
67-
github.com/go-openapi/jsonreference v0.20.2 // indirect
68-
github.com/go-openapi/swag v0.22.4 // indirect
66+
github.com/go-openapi/jsonpointer v0.20.2 // indirect
67+
github.com/go-openapi/jsonreference v0.20.4 // indirect
68+
github.com/go-openapi/swag v0.22.7 // indirect
6969
github.com/gofrs/uuid v4.2.0+incompatible // indirect
7070
github.com/gogo/protobuf v1.3.2 // indirect
7171
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -129,6 +129,7 @@ require (
129129
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.11.0
130130
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v5 v5.2.0
131131
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
132+
github.com/cilium/cilium v1.15.15
132133
github.com/jsternberg/zap-logfmt v1.3.0
133134
golang.org/x/sync v0.12.0
134135
gotest.tools/v3 v3.5.2
@@ -137,16 +138,51 @@ require (
137138
)
138139

139140
require (
141+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
142+
github.com/blang/semver/v4 v4.0.0 // indirect
143+
github.com/cilium/ebpf v0.12.3 // indirect
144+
github.com/cilium/proxy v0.0.0-20231202123106-38b645b854f3 // indirect
140145
github.com/containerd/errdefs/pkg v0.3.0 // indirect
141146
github.com/containerd/typeurl/v2 v2.2.0 // indirect
142-
github.com/gorilla/websocket v1.5.0 // indirect
147+
github.com/go-logr/stdr v1.2.2 // indirect
148+
github.com/go-ole/go-ole v1.2.6 // indirect
149+
github.com/go-openapi/analysis v0.21.4 // indirect
150+
github.com/go-openapi/errors v0.20.4 // indirect
151+
github.com/go-openapi/loads v0.21.2 // indirect
152+
github.com/go-openapi/runtime v0.26.2 // indirect
153+
github.com/go-openapi/spec v0.20.11 // indirect
154+
github.com/go-openapi/strfmt v0.21.9 // indirect
155+
github.com/go-openapi/validate v0.22.3 // indirect
156+
github.com/google/gopacket v1.1.19 // indirect
157+
github.com/gorilla/websocket v1.5.1 // indirect
158+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
159+
github.com/kr/pretty v0.3.1 // indirect
160+
github.com/kr/text v0.2.0 // indirect
161+
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
143162
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
163+
github.com/oklog/ulid v1.3.1 // indirect
164+
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
165+
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
166+
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
167+
github.com/rogpeppe/go-internal v1.13.1 // indirect
168+
github.com/sasha-s/go-deadlock v0.3.1 // indirect
169+
github.com/shirou/gopsutil/v3 v3.23.5 // indirect
170+
github.com/tklauser/go-sysconf v0.3.11 // indirect
171+
github.com/tklauser/numcpus v0.6.0 // indirect
172+
github.com/yusufpapurcu/wmi v1.2.3 // indirect
173+
go.mongodb.org/mongo-driver v1.13.1 // indirect
174+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
175+
go.opentelemetry.io/otel v1.34.0 // indirect
176+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
177+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
178+
go.uber.org/dig v1.17.1 // indirect
179+
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
144180
)
145181

146182
require (
147183
github.com/containerd/cgroups/v3 v3.0.3 // indirect
148184
github.com/containerd/errdefs v0.3.0 // indirect
149-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
185+
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
150186
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
151187
github.com/klauspost/compress v1.17.11 // indirect
152188
github.com/sagikazarmark/locafero v0.4.0 // indirect

0 commit comments

Comments
 (0)