Skip to content

Commit 885d8b8

Browse files
nunnatsanunnatsa
committed
Merge remote-tracking branch 'auto-sync-script-upstream/main' into auto_sync_upstream_2023-11-14-09-31
Signed-off-by: Nahshon Unna-Tsameret <[email protected]>
2 parents a5c21d0 + c2cd191 commit 885d8b8

File tree

3 files changed

+26
-28
lines changed

3 files changed

+26
-28
lines changed

‎e2e/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ require (
77
github.com/onsi/ginkgo/v2 v2.13.0
88
github.com/onsi/gomega v1.28.0
99
github.com/spf13/pflag v1.0.5
10-
k8s.io/api v0.28.2
11-
k8s.io/apimachinery v0.28.2
10+
k8s.io/api v0.28.3
11+
k8s.io/apimachinery v0.28.3
1212
k8s.io/client-go v12.0.0+incompatible
1313
k8s.io/utils v0.0.0-20230505201702-9f6742963106
1414
kubevirt.io/api v1.0.0
@@ -65,7 +65,7 @@ require (
6565
github.com/prometheus/client_model v0.4.0 // indirect
6666
github.com/prometheus/common v0.44.0 // indirect
6767
github.com/prometheus/procfs v0.10.1 // indirect
68-
golang.org/x/net v0.14.0 // indirect
68+
golang.org/x/net v0.17.0 // indirect
6969
golang.org/x/oauth2 v0.10.0 // indirect
7070
golang.org/x/sys v0.13.0 // indirect
7171
golang.org/x/term v0.13.0 // indirect
@@ -79,7 +79,7 @@ require (
7979
gopkg.in/yaml.v2 v2.4.0 // indirect
8080
gopkg.in/yaml.v3 v3.0.1 // indirect
8181
k8s.io/apiextensions-apiserver v0.28.0 // indirect
82-
k8s.io/component-base v0.28.2 // indirect
82+
k8s.io/component-base v0.28.3 // indirect
8383
k8s.io/klog/v2 v2.100.1 // indirect
8484
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
8585
kubevirt.io/containerized-data-importer-api v1.57.0 // indirect

‎go.mod

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ require (
1212
github.com/spf13/pflag v1.0.5
1313
golang.org/x/crypto v0.14.0
1414
gopkg.in/yaml.v3 v3.0.1
15-
k8s.io/api v0.28.2
16-
k8s.io/apimachinery v0.28.2
17-
k8s.io/client-go v12.0.0+incompatible
18-
k8s.io/component-base v0.28.2
15+
k8s.io/api v0.28.3
16+
k8s.io/apimachinery v0.28.3
17+
k8s.io/client-go v0.28.3
18+
k8s.io/component-base v0.28.3
1919
k8s.io/klog/v2 v2.100.1
20-
k8s.io/kubectl v0.28.2
20+
k8s.io/kubectl v0.28.3
21+
k8s.io/utils v0.0.0-20230505201702-9f6742963106
2122
kubevirt.io/api v1.0.0
2223
sigs.k8s.io/cluster-api v1.5.2
2324
sigs.k8s.io/controller-runtime v0.16.2
@@ -85,7 +86,7 @@ require (
8586
go.uber.org/multierr v1.11.0 // indirect
8687
go.uber.org/zap v1.25.0 // indirect
8788
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
88-
golang.org/x/net v0.14.0 // indirect
89+
golang.org/x/net v0.17.0 // indirect
8990
golang.org/x/oauth2 v0.10.0 // indirect
9091
golang.org/x/sync v0.3.0 // indirect
9192
golang.org/x/sys v0.13.0 // indirect
@@ -99,15 +100,12 @@ require (
99100
gopkg.in/inf.v0 v0.9.1 // indirect
100101
gopkg.in/yaml.v2 v2.4.0 // indirect
101102
k8s.io/apiextensions-apiserver v0.28.0 // indirect
102-
k8s.io/cli-runtime v0.28.2 // indirect
103+
k8s.io/cli-runtime v0.28.3 // indirect
103104
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
104-
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
105105
kubevirt.io/containerized-data-importer-api v1.57.0 // indirect
106106
kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90 // indirect
107107
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
108108
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
109109
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
110110
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
111111
)
112-
113-
replace k8s.io/client-go => k8s.io/client-go v0.28.2

‎go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,8 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qx
328328
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
329329
golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
330330
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
331-
golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
332-
golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
331+
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
332+
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
333333
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
334334
golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8=
335335
golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
@@ -464,22 +464,22 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
464464
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
465465
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
466466
k8s.io/api v0.23.3/go.mod h1:w258XdGyvCmnBj/vGzQMj6kzdufJZVUwEM1U2fRJwSQ=
467-
k8s.io/api v0.28.2 h1:9mpl5mOb6vXZvqbQmankOfPIGiudghwCoLl1EYfUZbw=
468-
k8s.io/api v0.28.2/go.mod h1:RVnJBsjU8tcMq7C3iaRSGMeaKt2TWEUXcpIt/90fjEg=
467+
k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM=
468+
k8s.io/api v0.28.3/go.mod h1:MRCV/jr1dW87/qJnZ57U5Pak65LGmQVkKTzf3AtKFHc=
469469
k8s.io/apiextensions-apiserver v0.28.0 h1:CszgmBL8CizEnj4sj7/PtLGey6Na3YgWyGCPONv7E9E=
470470
k8s.io/apiextensions-apiserver v0.28.0/go.mod h1:uRdYiwIuu0SyqJKriKmqEN2jThIJPhVmOWETm8ud1VE=
471471
k8s.io/apimachinery v0.23.3/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
472-
k8s.io/apimachinery v0.28.2 h1:KCOJLrc6gu+wV1BYgwik4AF4vXOlVJPdiqn0yAWWwXQ=
473-
k8s.io/apimachinery v0.28.2/go.mod h1:RdzF87y/ngqk9H4z3EL2Rppv5jj95vGS/HaFXrLDApU=
472+
k8s.io/apimachinery v0.28.3 h1:B1wYx8txOaCQG0HmYF6nbpU8dg6HvA06x5tEffvOe7A=
473+
k8s.io/apimachinery v0.28.3/go.mod h1:uQTKmIqs+rAYaq+DFaoD2X7pcjLOqbQX2AOiO0nIpb8=
474474
k8s.io/apiserver v0.28.1 h1:dw2/NKauDZCnOUAzIo2hFhtBRUo6gQK832NV8kuDbGM=
475-
k8s.io/cli-runtime v0.28.2 h1:64meB2fDj10/ThIMEJLO29a1oujSm0GQmKzh1RtA/uk=
476-
k8s.io/cli-runtime v0.28.2/go.mod h1:bTpGOvpdsPtDKoyfG4EG041WIyFZLV9qq4rPlkyYfDA=
477-
k8s.io/client-go v0.28.2 h1:DNoYI1vGq0slMBN/SWKMZMw0Rq+0EQW6/AK4v9+3VeY=
478-
k8s.io/client-go v0.28.2/go.mod h1:sMkApowspLuc7omj1FOSUxSoqjr+d5Q0Yc0LOFnYFJY=
475+
k8s.io/cli-runtime v0.28.3 h1:lvuJYVkwCqHEvpS6KuTZsUVwPePFjBfSGvuaLl2SxzA=
476+
k8s.io/cli-runtime v0.28.3/go.mod h1:jeX37ZPjIcENVuXDDTskG3+FnVuZms5D9omDXS/2Jjc=
477+
k8s.io/client-go v0.28.3 h1:2OqNb72ZuTZPKCl+4gTKvqao0AMOl9f3o2ijbAj3LI4=
478+
k8s.io/client-go v0.28.3/go.mod h1:LTykbBp9gsA7SwqirlCXBWtK0guzfhpoW4qSm7i9dxo=
479479
k8s.io/cluster-bootstrap v0.27.2 h1:OL3onrOwrUD7NQxBUqQwTl1Uu2GQKCkw9BMHpc4PbiA=
480480
k8s.io/code-generator v0.23.3/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk=
481-
k8s.io/component-base v0.28.2 h1:Yc1yU+6AQSlpJZyvehm/NkJBII72rzlEsd6MkBQ+G0E=
482-
k8s.io/component-base v0.28.2/go.mod h1:4IuQPQviQCg3du4si8GpMrhAIegxpsgPngPRR/zWpzc=
481+
k8s.io/component-base v0.28.3 h1:rDy68eHKxq/80RiMb2Ld/tbH8uAE75JdCqJyi6lXMzI=
482+
k8s.io/component-base v0.28.3/go.mod h1:fDJ6vpVNSk6cRo5wmDa6eKIG7UlIQkaFmZN2fYgIUD8=
483483
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
484484
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
485485
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@@ -492,8 +492,8 @@ k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lV
492492
k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk=
493493
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=
494494
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
495-
k8s.io/kubectl v0.28.2 h1:fOWOtU6S0smdNjG1PB9WFbqEIMlkzU5ahyHkc7ESHgM=
496-
k8s.io/kubectl v0.28.2/go.mod h1:6EQWTPySF1fn7yKoQZHYf9TPwIl2AygHEcJoxFekr64=
495+
k8s.io/kubectl v0.28.3 h1:H1Peu1O3EbN9zHkJCcvhiJ4NUj6lb88sGPO5wrWIM6k=
496+
k8s.io/kubectl v0.28.3/go.mod h1:RDAudrth/2wQ3Sg46fbKKl4/g+XImzvbsSRZdP2RiyE=
497497
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
498498
k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
499499
k8s.io/utils v0.0.0-20230505201702-9f6742963106 h1:EObNQ3TW2D+WptiYXlApGNLVy0zm/JIBVY9i+M4wpAU=

0 commit comments

Comments
 (0)