Skip to content

Commit ad9cd5a

Browse files
YashwantGohokarYashwantGohokar
committed
Fixed e2e for CSI snapshot and LB ipMode
Fixed kubeclient.go Bump dependency versions and fix e2e
1 parent 881f897 commit ad9cd5a

File tree

226 files changed

+4018
-16748
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+4018
-16748
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ else
3838
VERSION ?= ${VERSION}
3939
endif
4040

41-
RELEASE = v1.30.0
41+
RELEASE = v1.31.0
4242

4343
GOOS ?= linux
4444
ARCH ?= amd64

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.30
1+
1.31

‎go.mod

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ require (
5353
github.com/spf13/viper v1.8.1
5454
github.com/stretchr/testify v1.9.0
5555
go.uber.org/zap v1.27.0
56-
golang.org/x/net v0.28.0
57-
golang.org/x/sys v0.24.0 // indirect
56+
golang.org/x/net v0.33.0
57+
golang.org/x/sys v0.28.0 // indirect
5858
google.golang.org/grpc v1.65.0
5959
gopkg.in/natefinch/lumberjack.v2 v2.2.1
6060
gopkg.in/yaml.v2 v2.4.0
@@ -76,7 +76,7 @@ require (
7676
)
7777

7878
require (
79-
golang.org/x/sync v0.8.0
79+
golang.org/x/sync v0.10.0
8080
google.golang.org/protobuf v1.34.2
8181
gopkg.in/yaml.v3 v3.0.1
8282
k8s.io/apiextensions-apiserver v0.31.1
@@ -105,7 +105,6 @@ require (
105105
github.com/go-openapi/jsonpointer v0.21.0 // indirect
106106
github.com/go-openapi/jsonreference v0.21.0 // indirect
107107
github.com/go-openapi/swag v0.23.0 // indirect
108-
github.com/godbus/dbus/v5 v5.1.0 // indirect
109108
github.com/gofrs/flock v0.8.1 // indirect
110109
github.com/gogo/protobuf v1.3.2 // indirect
111110
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -130,22 +129,21 @@ require (
130129
github.com/mitchellh/mapstructure v1.4.1 // indirect
131130
github.com/moby/spdystream v0.5.0 // indirect
132131
github.com/moby/sys/mountinfo v0.7.2 // indirect
132+
github.com/moby/sys/userns v0.1.0 // indirect
133133
github.com/moby/term v0.5.0 // indirect
134134
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
135135
github.com/modern-go/reflect2 v1.0.2 // indirect
136136
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
137137
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
138138
github.com/nxadm/tail v1.4.8 // indirect
139139
github.com/opencontainers/go-digest v1.0.0 // indirect
140-
github.com/opencontainers/runc v1.1.13 // indirect
141-
github.com/opencontainers/runtime-spec v1.2.0 // indirect
140+
github.com/opencontainers/runc v1.2.0 // indirect
142141
github.com/opencontainers/selinux v1.11.0 // indirect
143142
github.com/pelletier/go-toml v1.9.3 // indirect
144143
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
145144
github.com/prometheus/client_model v0.6.1 // indirect
146145
github.com/prometheus/common v0.55.0 // indirect
147146
github.com/prometheus/procfs v0.15.1 // indirect
148-
github.com/sirupsen/logrus v1.9.3 // indirect
149147
github.com/sony/gobreaker v0.5.0 // indirect
150148
github.com/spf13/afero v1.11.0 // indirect
151149
github.com/spf13/cast v1.6.0 // indirect
@@ -166,12 +164,12 @@ require (
166164
go.opentelemetry.io/otel/trace v1.28.0 // indirect
167165
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
168166
go.uber.org/multierr v1.11.0 // indirect
169-
golang.org/x/crypto v0.26.0 // indirect
167+
golang.org/x/crypto v0.31.0 // indirect
170168
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
171169
golang.org/x/mod v0.20.0 // indirect
172170
golang.org/x/oauth2 v0.22.0 // indirect
173-
golang.org/x/term v0.23.0 // indirect
174-
golang.org/x/text v0.17.0 // indirect
171+
golang.org/x/term v0.27.0 // indirect
172+
golang.org/x/text v0.21.0 // indirect
175173
golang.org/x/time v0.6.0 // indirect
176174
golang.org/x/tools v0.24.0 // indirect
177175
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect

‎go.sum

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,6 @@ github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg78
135135
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
136136
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
137137
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
138-
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
139-
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
140138
github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
141139
github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
142140
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -312,6 +310,8 @@ github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU
312310
github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
313311
github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=
314312
github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4=
313+
github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=
314+
github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
315315
github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
316316
github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
317317
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -340,10 +340,8 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
340340
github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
341341
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
342342
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
343-
github.com/opencontainers/runc v1.1.13 h1:98S2srgG9vw0zWcDpFMn5TRrh8kLxa/5OFUstuUhmRs=
344-
github.com/opencontainers/runc v1.1.13/go.mod h1:R016aXacfp/gwQBYw2FDGa9m+n6atbLWrYY8hNMT/sA=
345-
github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
346-
github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
343+
github.com/opencontainers/runc v1.2.0 h1:qke7ZVCmJcKrJVY2iHJVC+0kql9uYdkusOPsQOOeBw4=
344+
github.com/opencontainers/runc v1.2.0/go.mod h1:/PXzF0h531HTMsYQnmxXkBD7YaGShm/2zcRB79dksUc=
347345
github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU=
348346
github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=
349347
github.com/oracle/oci-go-sdk/v65 v65.79.0 h1:Tv9L1XTKWkdXtSViMbP+dA93WunquvW++/2s5pOvOgU=
@@ -489,8 +487,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
489487
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
490488
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
491489
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
492-
golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
493-
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
490+
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
491+
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
494492
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
495493
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
496494
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -568,8 +566,8 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v
568566
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
569567
golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
570568
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
571-
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
572-
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
569+
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
570+
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
573571
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
574572
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
575573
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -595,8 +593,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
595593
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
596594
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
597595
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
598-
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
599-
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
596+
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
597+
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
600598
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
601599
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
602600
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -643,22 +641,21 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
643641
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
644642
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
645643
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
646-
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
647644
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
648-
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
649-
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
645+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
646+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
650647
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
651-
golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
652-
golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
648+
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
649+
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
653650
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
654651
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
655652
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
656653
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
657654
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
658655
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
659656
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
660-
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
661-
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
657+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
658+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
662659
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
663660
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
664661
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎hack/existing-standalone-cluster-env-template.sh

Lines changed: 45 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,81 +3,78 @@
33
##################################################################################################
44
# This template can be used to tweak the environment variables needed to run the E2E tests locally #
55
# Default behavior:
6-
# Runs test on an existing cluster
7-
# Note: All variables that have comment as "# Mandatory" need to be filled with appropriate values for the tests to run correctly.
6+
# Runs test on an existing cluster in dev0-iad
87

98
# To run the tests:
10-
# 1. Change the FOCUS valiable here to specify the subset of E2E tests to run
9+
# 1. Change the FOCUS variable here to specify the subset of E2E tests to run
1110
# 2. Set CLUSTER_KUBECONFIG and CLOUD_CONFIG if needed
12-
# 3. run 'source existing-standalone-cluster-env-template.sh' to set the variables
11+
# 3. run 'source existing-cluster-dev0-env-template.sh' to set the variables
1312
# 4. run 'make run-ccm-e2e-tests-local`
1413
##################################################################################################
1514

1615
# The test suites to run (can replace or add tags)
17-
export FOCUS="\[cloudprovider\]"
16+
export FOCUS="\[test1\]"
1817

1918
# The test suites to skip (can replace or add tags)
2019
export FOCUS_SKIP=""
2120

22-
# Scope can be ARM / AMD / BOTH
23-
# Mandatory
24-
export SCOPE="BOTH"
21+
# Run E2Es in parallel. # of ginkgo "nodes" will be decided automatically based on CPU cores.
22+
export ENABLE_PARALLEL_RUN=true
2523

26-
# A Reserved IP in your compartment for testing LB creation with Reserved IP
27-
# Create a public reserved IP in your compartment using the following link:
28-
# https://docs.oracle.com/en-us/iaas/Content/Network/Tasks/managingpublicIPs.htm#console-reserved
29-
# Set the public reserved IP in the following env-variable:
30-
# Mandatory
31-
export RESERVED_IP=""
24+
# This variable tells the test not to install oci cli and wipe out your .oci/config
25+
export LOCAL_RUN=1
26+
export TC_BUILD=0
3227

33-
# Set path to kubeconfig of existing cluster if it does not exist in default path. Defaults to $HOME/.kube/config.
34-
# Mandatory
35-
export CLUSTER_KUBECONFIG=$HOME/.kube/config
28+
# This allows you to use your existing cluster
29+
export ENABLE_CREATE_CLUSTER=false
3630

37-
# Set path to cloud_config of existing cluster if it does not exist in default path. Defaults to $HOME/cloudconfig.
38-
# Mandatory
39-
export CLOUD_CONFIG=$HOME/cloudconfig
31+
# Set path to kubeconfig of existing cluster if it does not exist in default path. Defaults to $HOME/.kube/config_*
32+
export CLUSTER_KUBECONFIG=/Users/ypgohoka/.e2e_ccm_csi/oss-1-31.kubeconfig
4033

41-
# ADLOCATION example is IqDk:US-ASHBURN-AD-1
42-
# Mandatory
43-
export ADLOCATION=""
34+
# Set path to cloud_config of existing cluster if it does not exist in default path. Defaults to $HOME/cloudconfig_*
35+
export CLOUD_CONFIG=/Users/ypgohoka/go/src/github.com/oracle/oci-cloud-controller-manager/manifests/provider-config-example.yaml
4436

45-
# KMS key for CMEK testing
46-
# CMEK KEY example "ocid1.key.relm.region.bb..cc.aaa...aa"
47-
# Mandatory
48-
export CMEK_KMS_KEY=""
4937

50-
# NSG Network security group created in cluster's VCN
51-
# CCM E2E tests require two NSGs to run successfully. Please create two NSGs in the cluster's VCN and set NSG_OCIDS
52-
# NSG_OCIDS example ocid1.networksecuritygroup.relm.region.aa...aa,ocid1.networksecuritygroup.relm.region.aa...aa
53-
# Mandatory
54-
export NSG_OCIDS=","
38+
export IMAGE_PULL_REPO="iad.ocir.io/okedev/e2e-tests/"
39+
export ADLOCATION="Ddfp:US-ASHBURN-AD-2"
40+
41+
#KMS key for CMEK testing
42+
export CMEK_KMS_KEY="ocid1.key.oc1.iad.b5r7iu5xaagy2.abuwcljsizwczmdfnitnxaruykluz3p6kwprasd2l7ebfvbkxbytvuumg4cq"
43+
44+
#NSG Network security group created in cluster's VCN
45+
export NSG_OCIDS="ocid1.networksecuritygroup.oc1.iad.aaaaaaaarqaak4vupqsxits6crgsxu5p65eh7p422iry6qttvafn5jvhsmva,ocid1.networksecuritygroup.oc1.iad.aaaaaaaaie4b3quurf3b5sgwz7lwmygii65k3yvlhkyakqacu74xowe3763q"
5546

5647
# NSG Network security group created in cluster's VCN for backend management, this NSG will have to be attached to the nodes manually for tests to pass
57-
export BACKEND_NSG_OCIDS=""
48+
export BACKEND_NSG_OCIDS="ocid1.networksecuritygroup.oc1.iad.aaaaaaaaie4b3quurf3b5sgwz7lwmygii65k3yvlhkyakqacu74xowe3763q"
49+
50+
#Reserved IP created in e2e test compartment
51+
export RESERVED_IP="169.155.149.109"
5852

59-
# FSS VOLUME HANDLE in the format filesystem_ocid:mountTargetIP:export_path
60-
# Make sure fss volume handle is in the same subnet as your nodes
61-
# Create a file system, file export path and mount target in your VCN by following
62-
# https://docs.oracle.com/en-us/iaas/Content/File/Tasks/creatingfilesystems.htm#Using_the_Console
63-
# And setup your network for the file system by following:
64-
# https://docs.oracle.com/en-us/iaas/Content/File/Tasks/securitylistsfilestorage.htm
65-
# Mandatory
66-
export FSS_VOLUME_HANDLE=""
53+
#Architecture to run tests on
54+
export ARCHITECTURE_AMD="AMD"
55+
export ARCHITECTURE_ARM="ARM"
56+
57+
#Focus the tests : ARM, AMD or BOTH
58+
export SCOPE="AMD"
6759

6860
# For debugging the tests in existing cluster, do not turn it off by default.
6961
# Optional
7062
# export DELETE_NAMESPACE=false
7163

72-
# By default, public images are used. But if your Cluster's environment cannot access above public images then below option can be used to specify an accessible repo.
73-
# Optional
74-
# export IMAGE_PULL_REPO="accessiblerepo.com/repo/path/"
64+
# FSS volume handle
65+
# format is FileSystemOCID:serverIP:path
66+
export FSS_VOLUME_HANDLE="ocid1.filesystem.oc1.iad.aaaaaaaaaacdndlxnfqwillqojxwiotjmfsc2ylefuyqaaaa:10.0.73.199:/oss-test"
67+
export FSS_VOLUME_HANDLE_ARM="ocid1.filesystem.oc1.iad.aaaaaaaaaacdndlxnfqwillqojxwiotjmfsc2ylefuyqaaaa:10.0.73.199:/oss-test"
68+
69+
export MNT_TARGET_ID="ocid1.mounttarget.oc1.iad.aaaaacvippzjdfiynfqwillqojxwiotjmfsc2ylefuyqaaaa"
70+
export MNT_TARGET_SUBNET_ID="ocid1.subnet.oc1.iad.aaaaaaaafujcpvwdn3s2liqwrilolm7jmxkwq35zieo7zk4medjtqxjac7cq"
71+
export MNT_TARGET_COMPARTMENT_ID="ocid1.compartment.oc1..aaaaaaaaee2fxlf36idmiqlyvnyhkh2oquz5loogbmzat73hnnqhu2c3352a"
7572

76-
export MNT_TARGET_ID=""
77-
export MNT_TARGET_SUBNET_ID=""
78-
export MNT_TARGET_COMPARTMENT_ID=""
73+
export STATIC_SNAPSHOT_COMPARTMENT_ID="ocid1.compartment.oc1..aaaaaaaaee2fxlf36idmiqlyvnyhkh2oquz5loogbmzat73hnnqhu2c3352a"
7974

80-
export STATIC_SNAPSHOT_COMPARTMENT_ID=""
75+
# For SKE node, node_info, node_lifecycle controller tests against PDE
76+
# To setup PDE and point your localhost:25000 to the PDE CP API refer: Refer: https://bitbucket.oci.oraclecorp.com/projects/OKE/repos/oke-control-plane/browse/personal-environments/README.md
77+
# export CE_ENDPOINT_OVERRIDE="http://localhost:25000"
8178

8279
# Whether to run UHP E2Es or not, requires Volume Management Plugin enabled on the node and 16+ cores
8380
# Check the following doc for the exact requirements:

‎manifests/cloud-controller-manager/oci-cloud-controller-manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
path: /etc/kubernetes
4343
containers:
4444
- name: oci-cloud-controller-manager
45-
image: ghcr.io/oracle/cloud-provider-oci:v1.30.0
45+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.31.0
4646
command: ["/usr/local/bin/oci-cloud-controller-manager"]
4747
args:
4848
- --cloud-config=/etc/oci/cloud-provider.yaml

‎manifests/container-storage-interface/oci-csi-controller-driver.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ spec:
9696
- --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
9797
command:
9898
- /usr/local/bin/oci-csi-controller-driver
99-
image: ghcr.io/oracle/cloud-provider-oci:v1.30.0
99+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.31.0
100100
imagePullPolicy: IfNotPresent
101101
volumeMounts:
102102
- name: config

‎manifests/container-storage-interface/oci-csi-node-driver.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ spec:
117117
fieldPath: spec.nodeName
118118
- name: PATH
119119
value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
120-
image: ghcr.io/oracle/cloud-provider-oci:v1.30.0
120+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.31.0
121121
securityContext:
122122
privileged: true
123123
volumeMounts:

‎manifests/flexvolume-driver/oci-flexvolume-driver.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
secretName: oci-flexvolume-driver
4141
containers:
4242
- name: oci-flexvolume-driver
43-
image: ghcr.io/oracle/cloud-provider-oci:v1.30.0
43+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.31.0
4444
command: ["/usr/local/bin/install.py", "-c", "/tmp/config.yaml"]
4545
securityContext:
4646
privileged: true
@@ -76,7 +76,7 @@ spec:
7676
type: DirectoryOrCreate
7777
containers:
7878
- name: oci-flexvolume-driver
79-
image: ghcr.io/oracle/cloud-provider-oci:v1.30.0
79+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.31.0
8080
command: ["/usr/local/bin/install.py"]
8181
securityContext:
8282
privileged: true

0 commit comments

Comments
 (0)