Skip to content

Commit 07e1ae6

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #903 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents e1bbc3b + 1784855 commit 07e1ae6

37 files changed

+259
-270
lines changed

‎go.mod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ require (
2424
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
2525
google.golang.org/protobuf v1.35.1
2626
gopkg.in/yaml.v2 v2.4.0
27-
k8s.io/api v0.31.2
28-
k8s.io/apimachinery v0.31.2
29-
k8s.io/client-go v0.31.2
30-
k8s.io/code-generator v0.31.2
27+
k8s.io/api v0.31.3
28+
k8s.io/apimachinery v0.31.3
29+
k8s.io/client-go v0.31.3
30+
k8s.io/code-generator v0.31.3
3131
k8s.io/kube-openapi v0.0.0-20240816214639-573285566f34
3232
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
33-
sigs.k8s.io/controller-runtime v0.19.1
33+
sigs.k8s.io/controller-runtime v0.19.2
3434
sigs.k8s.io/controller-tools v0.16.5
3535
)
3636

@@ -208,14 +208,14 @@ require (
208208
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
209209
gopkg.in/warnings.v0 v0.1.2 // indirect
210210
gopkg.in/yaml.v3 v3.0.1 // indirect
211-
k8s.io/apiextensions-apiserver v0.31.2 // indirect
212-
k8s.io/apiserver v0.31.2 // indirect
211+
k8s.io/apiextensions-apiserver v0.31.3 // indirect
212+
k8s.io/apiserver v0.31.3 // indirect
213213
k8s.io/cli-runtime v0.31.0 // indirect
214-
k8s.io/component-base v0.31.2 // indirect
214+
k8s.io/component-base v0.31.3 // indirect
215215
k8s.io/gengo/v2 v2.0.0-20240812201722-3b05ca7b6e59 // indirect
216216
k8s.io/klog v1.0.0 // indirect
217217
k8s.io/klog/v2 v2.130.1 // indirect
218-
k8s.io/kms v0.31.2 // indirect
218+
k8s.io/kms v0.31.3 // indirect
219219
k8s.io/kube-aggregator v0.31.2 // indirect
220220
k8s.io/kubectl v0.31.0 // indirect
221221
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect

‎go.sum

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3071,27 +3071,27 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
30713071
honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las=
30723072
k8s.io/api v0.18.0/go.mod h1:q2HRQkfDzHMBZL9l/y9rH63PkQl4vae0xRT+8prbrK8=
30733073
k8s.io/api v0.21.0-rc.0/go.mod h1:Dkc/ZauWJrgZhjOjeBgW89xZQiTBJA2RaBKYHXPsi2Y=
3074-
k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0=
3075-
k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk=
3076-
k8s.io/apiextensions-apiserver v0.31.2 h1:W8EwUb8+WXBLu56ser5IudT2cOho0gAKeTOnywBLxd0=
3077-
k8s.io/apiextensions-apiserver v0.31.2/go.mod h1:i+Geh+nGCJEGiCGR3MlBDkS7koHIIKWVfWeRFiOsUcM=
3074+
k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8=
3075+
k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE=
3076+
k8s.io/apiextensions-apiserver v0.31.3 h1:+GFGj2qFiU7rGCsA5o+p/rul1OQIq6oYpQw4+u+nciE=
3077+
k8s.io/apiextensions-apiserver v0.31.3/go.mod h1:2DSpFhUZZJmn/cr/RweH1cEVVbzFw9YBu4T+U3mf1e4=
30783078
k8s.io/apimachinery v0.18.0/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
30793079
k8s.io/apimachinery v0.21.0-rc.0/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
3080-
k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw=
3081-
k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
3082-
k8s.io/apiserver v0.31.2 h1:VUzOEUGRCDi6kX1OyQ801m4A7AUPglpsmGvdsekmcI4=
3083-
k8s.io/apiserver v0.31.2/go.mod h1:o3nKZR7lPlJqkU5I3Ove+Zx3JuoFjQobGX1Gctw6XuE=
3080+
k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4=
3081+
k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
3082+
k8s.io/apiserver v0.31.3 h1:+1oHTtCB+OheqFEz375D0IlzHZ5VeQKX1KGXnx+TTuY=
3083+
k8s.io/apiserver v0.31.3/go.mod h1:PrxVbebxrxQPFhJk4powDISIROkNMKHibTg9lTRQ0Qg=
30843084
k8s.io/cli-runtime v0.31.0 h1:V2Q1gj1u3/WfhD475HBQrIYsoryg/LrhhK4RwpN+DhA=
30853085
k8s.io/cli-runtime v0.31.0/go.mod h1:vg3H94wsubuvWfSmStDbekvbla5vFGC+zLWqcf+bGDw=
30863086
k8s.io/client-go v0.18.0/go.mod h1:uQSYDYs4WhVZ9i6AIoEZuwUggLVEF64HOD37boKAtF8=
3087-
k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc=
3088-
k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs=
3087+
k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4=
3088+
k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs=
30893089
k8s.io/code-generator v0.18.0/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
30903090
k8s.io/code-generator v0.21.0-rc.0/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q=
3091-
k8s.io/code-generator v0.31.2 h1:xLWxG0HEpMSHfcM//3u3Ro2Hmc6AyyLINQS//Z2GEOI=
3092-
k8s.io/code-generator v0.31.2/go.mod h1:eEQHXgBU/m7LDaToDoiz3t97dUUVyOblQdwOr8rivqc=
3093-
k8s.io/component-base v0.31.2 h1:Z1J1LIaC0AV+nzcPRFqfK09af6bZ4D1nAOpWsy9owlA=
3094-
k8s.io/component-base v0.31.2/go.mod h1:9PeyyFN/drHjtJZMCTkSpQJS3U9OXORnHQqMLDz0sUQ=
3091+
k8s.io/code-generator v0.31.3 h1:Pj0fYOBms+ZrsulLi4DMsCEx1jG8fWKRLy44onHsLBI=
3092+
k8s.io/code-generator v0.31.3/go.mod h1:/umCIlT84g1+Yu5ZXtP1KGSRTnGiIzzX5AzUAxsNlts=
3093+
k8s.io/component-base v0.31.3 h1:DMCXXVx546Rfvhj+3cOm2EUxhS+EyztH423j+8sOwhQ=
3094+
k8s.io/component-base v0.31.3/go.mod h1:xME6BHfUOafRgT0rGVBGl7TuSg8Z9/deT7qq6w7qjIU=
30953095
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
30963096
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
30973097
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
@@ -3107,8 +3107,8 @@ k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
31073107
k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
31083108
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
31093109
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
3110-
k8s.io/kms v0.31.2 h1:pyx7l2qVOkClzFMIWMVF/FxsSkgd+OIGH7DecpbscJI=
3111-
k8s.io/kms v0.31.2/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94=
3110+
k8s.io/kms v0.31.3 h1:XCFmiJn5CCKs8xoOLpCmu42Ubm/KW85wNHybGFcSAYc=
3111+
k8s.io/kms v0.31.3/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94=
31123112
k8s.io/kube-aggregator v0.31.2 h1:Uw1zUP2D/4wiSjKWVVzSOcCGLuW/+IdRwjjC0FJooYU=
31133113
k8s.io/kube-aggregator v0.31.2/go.mod h1:41/VIXH+/Qcg9ERNAY6bRF/WQR6xL1wFgYagdHac1X4=
31143114
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
@@ -3186,8 +3186,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
31863186
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
31873187
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=
31883188
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
3189-
sigs.k8s.io/controller-runtime v0.19.1 h1:Son+Q40+Be3QWb+niBXAg2vFiYWolDjjRfO8hn/cxOk=
3190-
sigs.k8s.io/controller-runtime v0.19.1/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
3189+
sigs.k8s.io/controller-runtime v0.19.2 h1:3sPrF58XQEPzbE8T81TN6selQIMGbtYwuaJ6eDssDF8=
3190+
sigs.k8s.io/controller-runtime v0.19.2/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
31913191
sigs.k8s.io/controller-tools v0.16.5 h1:5k9FNRqziBPwqr17AMEPPV/En39ZBplLAdOwwQHruP4=
31923192
sigs.k8s.io/controller-tools v0.16.5/go.mod h1:8vztuRVzs8IuuJqKqbXCSlXcw+lkAv/M2sTpg55qjMY=
31933193
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎staging/operator-lifecycle-manager/.github/workflows/e2e-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ jobs:
9292
9393
# run non-flakes if matrix-id is not 'flakes'
9494
- name: Run e2e tests
95-
# calculate the number of chunks as the number of parallel jobs minus 1 (flakes job)
95+
# calculate the number of chunks as the number of parallel jobs
9696
# use the split tool to split the test suite into chunks and run the chunk corresponding to the matrix-id
9797
# focus on those tests and skip tests marked as FLAKE
9898
run: |
99-
E2E_TEST_NUM_CHUNKS=$(( ${{ strategy.job-total }} - 1 )) \
100-
GINKGO_OPTS="${GINKGO_OPTS} -focus '$(go run ./test/e2e/split/... -chunks $E2E_TEST_NUM_CHUNKS -print-chunk $E2E_TEST_CHUNK ./test/e2e)' -skip '\[FLAKE\]'" \
99+
E2E_TEST_NUM_CHUNKS=$(( ${{ strategy.job-total }} )) \
100+
GINKGO_OPTS="${GINKGO_OPTS} -label-filter '$(go run ./test/e2e/split/... -chunks $E2E_TEST_NUM_CHUNKS -print-chunk $E2E_TEST_CHUNK ./test/e2e)' -skip '\[FLAKE\]'" \
101101
make e2e;
102102
103103
# archive test results

‎staging/operator-lifecycle-manager/go.mod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@ require (
4040
golang.org/x/time v0.8.0
4141
google.golang.org/grpc v1.67.1
4242
gopkg.in/yaml.v2 v2.4.0
43-
k8s.io/api v0.31.2
44-
k8s.io/apiextensions-apiserver v0.31.2
45-
k8s.io/apimachinery v0.31.2
46-
k8s.io/apiserver v0.31.2
47-
k8s.io/client-go v0.31.2
48-
k8s.io/code-generator v0.31.2
49-
k8s.io/component-base v0.31.2
43+
k8s.io/api v0.31.3
44+
k8s.io/apiextensions-apiserver v0.31.3
45+
k8s.io/apimachinery v0.31.3
46+
k8s.io/apiserver v0.31.3
47+
k8s.io/client-go v0.31.3
48+
k8s.io/code-generator v0.31.3
49+
k8s.io/component-base v0.31.3
5050
k8s.io/klog v1.0.0
5151
k8s.io/klog/v2 v2.130.1
5252
k8s.io/kube-aggregator v0.31.2
5353
k8s.io/kube-openapi v0.0.0-20240816214639-573285566f34
5454
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
55-
sigs.k8s.io/controller-runtime v0.19.1
55+
sigs.k8s.io/controller-runtime v0.19.2
5656
sigs.k8s.io/controller-tools v0.16.5
5757
)
5858

@@ -177,7 +177,7 @@ require (
177177
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
178178
gopkg.in/yaml.v3 v3.0.1 // indirect
179179
k8s.io/gengo/v2 v2.0.0-20240812201722-3b05ca7b6e59 // indirect
180-
k8s.io/kms v0.31.2 // indirect
180+
k8s.io/kms v0.31.3 // indirect
181181
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
182182
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
183183
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

‎staging/operator-lifecycle-manager/go.sum

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2830,28 +2830,28 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
28302830
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
28312831
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
28322832
honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las=
2833-
k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0=
2834-
k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk=
2835-
k8s.io/apiextensions-apiserver v0.31.2 h1:W8EwUb8+WXBLu56ser5IudT2cOho0gAKeTOnywBLxd0=
2836-
k8s.io/apiextensions-apiserver v0.31.2/go.mod h1:i+Geh+nGCJEGiCGR3MlBDkS7koHIIKWVfWeRFiOsUcM=
2837-
k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw=
2838-
k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
2839-
k8s.io/apiserver v0.31.2 h1:VUzOEUGRCDi6kX1OyQ801m4A7AUPglpsmGvdsekmcI4=
2840-
k8s.io/apiserver v0.31.2/go.mod h1:o3nKZR7lPlJqkU5I3Ove+Zx3JuoFjQobGX1Gctw6XuE=
2841-
k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc=
2842-
k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs=
2843-
k8s.io/code-generator v0.31.2 h1:xLWxG0HEpMSHfcM//3u3Ro2Hmc6AyyLINQS//Z2GEOI=
2844-
k8s.io/code-generator v0.31.2/go.mod h1:eEQHXgBU/m7LDaToDoiz3t97dUUVyOblQdwOr8rivqc=
2845-
k8s.io/component-base v0.31.2 h1:Z1J1LIaC0AV+nzcPRFqfK09af6bZ4D1nAOpWsy9owlA=
2846-
k8s.io/component-base v0.31.2/go.mod h1:9PeyyFN/drHjtJZMCTkSpQJS3U9OXORnHQqMLDz0sUQ=
2833+
k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8=
2834+
k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE=
2835+
k8s.io/apiextensions-apiserver v0.31.3 h1:+GFGj2qFiU7rGCsA5o+p/rul1OQIq6oYpQw4+u+nciE=
2836+
k8s.io/apiextensions-apiserver v0.31.3/go.mod h1:2DSpFhUZZJmn/cr/RweH1cEVVbzFw9YBu4T+U3mf1e4=
2837+
k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4=
2838+
k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
2839+
k8s.io/apiserver v0.31.3 h1:+1oHTtCB+OheqFEz375D0IlzHZ5VeQKX1KGXnx+TTuY=
2840+
k8s.io/apiserver v0.31.3/go.mod h1:PrxVbebxrxQPFhJk4powDISIROkNMKHibTg9lTRQ0Qg=
2841+
k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4=
2842+
k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs=
2843+
k8s.io/code-generator v0.31.3 h1:Pj0fYOBms+ZrsulLi4DMsCEx1jG8fWKRLy44onHsLBI=
2844+
k8s.io/code-generator v0.31.3/go.mod h1:/umCIlT84g1+Yu5ZXtP1KGSRTnGiIzzX5AzUAxsNlts=
2845+
k8s.io/component-base v0.31.3 h1:DMCXXVx546Rfvhj+3cOm2EUxhS+EyztH423j+8sOwhQ=
2846+
k8s.io/component-base v0.31.3/go.mod h1:xME6BHfUOafRgT0rGVBGl7TuSg8Z9/deT7qq6w7qjIU=
28472847
k8s.io/gengo/v2 v2.0.0-20240812201722-3b05ca7b6e59 h1:PfhT3P5Y7psqhl0D77Rj2B7RH77eid/wBttxlMTxXag=
28482848
k8s.io/gengo/v2 v2.0.0-20240812201722-3b05ca7b6e59/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8=
28492849
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
28502850
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
28512851
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
28522852
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
2853-
k8s.io/kms v0.31.2 h1:pyx7l2qVOkClzFMIWMVF/FxsSkgd+OIGH7DecpbscJI=
2854-
k8s.io/kms v0.31.2/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94=
2853+
k8s.io/kms v0.31.3 h1:XCFmiJn5CCKs8xoOLpCmu42Ubm/KW85wNHybGFcSAYc=
2854+
k8s.io/kms v0.31.3/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94=
28552855
k8s.io/kube-aggregator v0.31.2 h1:Uw1zUP2D/4wiSjKWVVzSOcCGLuW/+IdRwjjC0FJooYU=
28562856
k8s.io/kube-aggregator v0.31.2/go.mod h1:41/VIXH+/Qcg9ERNAY6bRF/WQR6xL1wFgYagdHac1X4=
28572857
k8s.io/kube-openapi v0.0.0-20240816214639-573285566f34 h1:/amS69DLm09mtbFtN3+LyygSFohnYGMseF8iv+2zulg=
@@ -2924,8 +2924,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
29242924
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
29252925
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=
29262926
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
2927-
sigs.k8s.io/controller-runtime v0.19.1 h1:Son+Q40+Be3QWb+niBXAg2vFiYWolDjjRfO8hn/cxOk=
2928-
sigs.k8s.io/controller-runtime v0.19.1/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
2927+
sigs.k8s.io/controller-runtime v0.19.2 h1:3sPrF58XQEPzbE8T81TN6selQIMGbtYwuaJ6eDssDF8=
2928+
sigs.k8s.io/controller-runtime v0.19.2/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
29292929
sigs.k8s.io/controller-tools v0.16.5 h1:5k9FNRqziBPwqr17AMEPPV/En39ZBplLAdOwwQHruP4=
29302930
sigs.k8s.io/controller-tools v0.16.5/go.mod h1:8vztuRVzs8IuuJqKqbXCSlXcw+lkAv/M2sTpg55qjMY=
29312931
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎staging/operator-lifecycle-manager/test/e2e/bundle_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
//go:embed testdata/vpa/crd.yaml
2727
var vpaCRDRaw []byte
2828

29-
var _ = Describe("Installing bundles with new object types", func() {
29+
var _ = Describe("Installing bundles with new object types", Label("ObjectTypes"), func() {
3030
var (
3131
kubeClient operatorclient.ClientInterface
3232
operatorClient versioned.Interface

‎staging/operator-lifecycle-manager/test/e2e/catalog_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const (
4343
badCSVDir = "bad-csv"
4444
)
4545

46-
var _ = Describe("Starting CatalogSource e2e tests", func() {
46+
var _ = Describe("Starting CatalogSource e2e tests", Label("CatalogSource"), func() {
4747
var (
4848
generatedNamespace corev1.Namespace
4949
c operatorclient.ClientInterface

‎staging/operator-lifecycle-manager/test/e2e/catalog_exclusion_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
const magicCatalogDir = "magiccatalog"
2222

23-
var _ = Describe("Global Catalog Exclusion", func() {
23+
var _ = Describe("Global Catalog Exclusion", Label("CatalogExclusion"), func() {
2424
var (
2525
generatedNamespace corev1.Namespace
2626
determinedE2eClient *util.DeterminedE2EClient

‎staging/operator-lifecycle-manager/test/e2e/catsrc_pod_config_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const catalogSourceLabel = "olm.catalogSource"
1818

1919
var _ = By
2020

21-
var _ = Describe("CatalogSource Grpc Pod Config", func() {
21+
var _ = Describe("CatalogSource Grpc Pod Config", Label("CatalogSourcePodConfig"), func() {
2222

2323
var (
2424
generatedNamespace corev1.Namespace

‎staging/operator-lifecycle-manager/test/e2e/crd_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2323
)
2424

25-
var _ = Describe("CRD Versions", func() {
25+
var _ = Describe("CRD Versions", Label("CRDs"), func() {
2626
var (
2727
generatedNamespace corev1.Namespace
2828
c operatorclient.ClientInterface

‎staging/operator-lifecycle-manager/test/e2e/csv_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
3535
)
3636

37-
var _ = Describe("ClusterServiceVersion", func() {
37+
var _ = Describe("ClusterServiceVersion", Label("ClusterServiceVersion"), func() {
3838
var (
3939
generatedNamespace corev1.Namespace
4040
c operatorclient.ClientInterface

‎staging/operator-lifecycle-manager/test/e2e/deprecated_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818

1919
var missingAPI = `{"apiVersion":"verticalpodautoscalers.autoscaling.k8s.io/v1","kind":"VerticalPodAutoscaler","metadata":{"name":"my.thing","namespace":"foo"}}`
2020

21-
var _ = Describe("Not found APIs", func() {
21+
var _ = Describe("Not found APIs", Label("APIDeprecation"), func() {
2222
var generatedNamespace corev1.Namespace
2323

2424
BeforeEach(func() {

‎staging/operator-lifecycle-manager/test/e2e/disabling_copied_csv_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const (
2626
protectedCopiedCSVNamespacesRuntimeFlag = "--protectedCopiedCSVNamespaces"
2727
)
2828

29-
var _ = Describe("Disabling copied CSVs", func() {
29+
var _ = Describe("Disabling copied CSVs", Label("DisablingCopiedCSVs"), func() {
3030
var (
3131
generatedNamespace corev1.Namespace
3232
csv operatorsv1alpha1.ClusterServiceVersion

‎staging/operator-lifecycle-manager/test/e2e/dynamic_resource_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
// This test was disabled because both of its tests are currently being skipped
2121
// We need to understand why and whether this test is even needed:
2222
// https://github.com/operator-framework/operator-lifecycle-manager/issues/3402
23-
var _ = XDescribe("Subscriptions create required objects from Catalogs", func() {
23+
var _ = XDescribe("Subscriptions create required objects from Catalogs", Label("DynamicResource"), func() {
2424
var (
2525
crc versioned.Interface
2626
generatedNamespace corev1.Namespace

‎staging/operator-lifecycle-manager/test/e2e/fail_forward_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func updateCatalogSource(namespace, name string, packages ...string) (func(), er
123123
return deployCatalogSource(namespace, name, packages...)
124124
}
125125

126-
var _ = Describe("Fail Forward Upgrades", func() {
126+
var _ = Describe("Fail Forward Upgrades", Label("FailForward"), func() {
127127

128128
var (
129129
generatedNamespace corev1.Namespace

‎staging/operator-lifecycle-manager/test/e2e/gc_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
2424
)
2525

26-
var _ = Describe("Garbage collection for dependent resources", func() {
26+
var _ = Describe("Garbage collection for dependent resources", Label("GarbageCollection"), func() {
2727
var (
2828
kubeClient operatorclient.ClientInterface
2929
operatorClient versioned.Interface

‎staging/operator-lifecycle-manager/test/e2e/installplan_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const (
5050
deprecatedCRDDir = "deprecated-crd"
5151
)
5252

53-
var _ = Describe("Install Plan", func() {
53+
var _ = Describe("Install Plan", Label("InstallPlan"), func() {
5454
var (
5555
c operatorclient.ClientInterface
5656
crc versioned.Interface

‎staging/operator-lifecycle-manager/test/e2e/magic_catalog_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"sigs.k8s.io/controller-runtime/pkg/client"
1414
)
1515

16-
var _ = Describe("MagicCatalog", func() {
16+
var _ = Describe("MagicCatalog", Label("MagicCatalog"), func() {
1717
var (
1818
generatedNamespace corev1.Namespace
1919
c client.Client

‎staging/operator-lifecycle-manager/test/e2e/metrics_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
2828
)
2929

30-
var _ = Describe("Metrics are generated for OLM managed resources", func() {
30+
var _ = Describe("Metrics are generated for OLM managed resources", Label("Metrics"), func() {
3131
var (
3232
c operatorclient.ClientInterface
3333
crc versioned.Interface

‎staging/operator-lifecycle-manager/test/e2e/operator_condition_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
2020
)
2121

22-
var _ = Describe("Operator Condition", func() {
22+
var _ = Describe("Operator Condition", Label("OperatorCondition"), func() {
2323
var (
2424
generatedNamespace corev1.Namespace
2525
)

‎staging/operator-lifecycle-manager/test/e2e/operator_groups_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
3636
)
3737

38-
var _ = Describe("Operator Group", func() {
38+
var _ = Describe("Operator Group", Label("OperatorGroup"), func() {
3939
var (
4040
c operatorclient.ClientInterface
4141
crc versioned.Interface

‎staging/operator-lifecycle-manager/test/e2e/operator_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
)
3232

3333
// Describes test specs for the Operator resource.
34-
var _ = Describe("Operator API", func() {
34+
var _ = Describe("Operator API", Label("Operator"), func() {
3535
var (
3636
clientCtx context.Context
3737
scheme *runtime.Scheme

‎staging/operator-lifecycle-manager/test/e2e/packagemanifest_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
2424
)
2525

26-
var _ = Describe("Package Manifest API lists available Operators from Catalog Sources", func() {
26+
var _ = Describe("Package Manifest API lists available Operators from Catalog Sources", Label("PackageManifest"), func() {
2727
var (
2828
crc versioned.Interface
2929
pmc pmversioned.Interface

‎staging/operator-lifecycle-manager/test/e2e/resource_manager_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
1515
)
1616

17-
var _ = Describe("ResourceManager", func() {
17+
var _ = Describe("ResourceManager", Label("ResourceManager"), func() {
1818
var generatedNamespace corev1.Namespace
1919

2020
BeforeEach(func() {

0 commit comments

Comments
 (0)