Skip to content

Commit 55503f8

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #274 from timflannagan/sync-03-30
Update staging OLM 03-30
2 parents 039ff16 + 41311af commit 55503f8

File tree

233 files changed

+11560
-6815
lines changed

Some content is hidden

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

233 files changed

+11560
-6815
lines changed

‎go.mod

+7-7
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ require (
4141
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
4242
github.com/Azure/go-autorest/logger v0.2.1 // indirect
4343
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
44-
github.com/BurntSushi/toml v0.3.1 // indirect
44+
github.com/BurntSushi/toml v0.4.1 // indirect
4545
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
4646
github.com/Masterminds/goutils v1.1.1 // indirect
4747
github.com/Masterminds/semver/v3 v3.1.1 // indirect
@@ -59,7 +59,7 @@ require (
5959
github.com/beorn7/perks v1.0.1 // indirect
6060
github.com/blang/semver v3.5.1+incompatible // indirect
6161
github.com/blang/semver/v4 v4.0.0 // indirect
62-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
62+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
6363
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
6464
github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59 // indirect
6565
github.com/containerd/containerd v1.4.11 // indirect
@@ -137,7 +137,7 @@ require (
137137
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
138138
github.com/mailru/easyjson v0.7.6 // indirect
139139
github.com/mattn/go-colorable v0.1.8 // indirect
140-
github.com/mattn/go-isatty v0.0.12 // indirect
140+
github.com/mattn/go-isatty v0.0.14 // indirect
141141
github.com/mattn/go-runewidth v0.0.9 // indirect
142142
github.com/mattn/go-sqlite3 v1.14.10 // indirect
143143
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
@@ -165,10 +165,10 @@ require (
165165
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
166166
github.com/pkg/errors v0.9.1 // indirect
167167
github.com/pmezard/go-difflib v1.0.0 // indirect
168-
github.com/prometheus/client_golang v1.11.0 // indirect
168+
github.com/prometheus/client_golang v1.12.1 // indirect
169169
github.com/prometheus/client_model v0.2.0 // indirect
170-
github.com/prometheus/common v0.28.0 // indirect
171-
github.com/prometheus/procfs v0.6.0 // indirect
170+
github.com/prometheus/common v0.32.1 // indirect
171+
github.com/prometheus/procfs v0.7.3 // indirect
172172
github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351 // indirect
173173
github.com/russross/blackfriday v1.5.2 // indirect
174174
github.com/russross/blackfriday/v2 v2.0.1 // indirect
@@ -209,7 +209,7 @@ require (
209209
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
210210
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
211211
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
212-
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
212+
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
213213
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
214214
golang.org/x/text v0.3.7 // indirect
215215
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect

‎go.sum

+17-7
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,9 @@ github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ
7070
github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
7171
github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
7272
github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
73-
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
7473
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
74+
github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw=
75+
github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
7576
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
7677
github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
7778
github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
@@ -182,8 +183,9 @@ github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6
182183
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
183184
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
184185
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
185-
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
186186
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
187+
github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
188+
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
187189
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 h1:7aWHqerlJ41y6FOsEUvknqgXnGmJyJSbjhAWq5pO4F8=
188190
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
189191
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
@@ -331,6 +333,7 @@ github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQL
331333
github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
332334
github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
333335
github.com/evanphx/json-patch/v5 v5.2.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
336+
github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
334337
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
335338
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
336339
github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 h1:Ghm4eQYC0nEPnSJdVkTrXpu9KtoVCSo1hg7mtI7G9KU=
@@ -773,8 +776,9 @@ github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx
773776
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
774777
github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
775778
github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
776-
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
777779
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
780+
github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
781+
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
778782
github.com/mattn/go-oci8 v0.0.7/go.mod h1:wjDx6Xm9q7dFtHJvIlrI99JytznLw5wQ4R+9mNXJwGI=
779783
github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
780784
github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
@@ -928,6 +932,7 @@ github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP
928932
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
929933
github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
930934
github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
935+
github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
931936
github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
932937
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
933938
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
@@ -954,8 +959,9 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn
954959
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
955960
github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
956961
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
957-
github.com/prometheus/client_golang v1.11.0 h1:HNkLOAEQMIDv/K+04rukrLx6ch7msSRwf3/SASFAGtQ=
958962
github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
963+
github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk=
964+
github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
959965
github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
960966
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
961967
github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
@@ -973,8 +979,9 @@ github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+
973979
github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
974980
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
975981
github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
976-
github.com/prometheus/common v0.28.0 h1:vGVfV9KrDTvWt5boZO0I19g2E3CsWfpPPKZM9dt3mEw=
977982
github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
983+
github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4=
984+
github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
978985
github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
979986
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
980987
github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
@@ -985,8 +992,9 @@ github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa
985992
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
986993
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
987994
github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
988-
github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=
989995
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
996+
github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
997+
github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
990998
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
991999
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
9921000
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
@@ -1467,8 +1475,9 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBc
14671475
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14681476
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14691477
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1470-
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 h1:M69LAlWZCshgp0QSzyDcSsSIejIEeuaCVpmwcKwyLMk=
14711478
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1479+
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
1480+
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14721481
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
14731482
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
14741483
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -1887,6 +1896,7 @@ sigs.k8s.io/controller-tools v0.8.0/go.mod h1:qE2DXhVOiEq5ijmINcFbqi9GZrrUjzB1Tu
18871896
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s=
18881897
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs=
18891898
sigs.k8s.io/kind v0.11.1/go.mod h1:fRpgVhtqAWrtLB9ED7zQahUimpUXuG/iHT88xYqEGIA=
1899+
sigs.k8s.io/kind v0.12.0/go.mod h1:EcgDSBVxz8Bvm19fx8xkioFrf9dC30fMJdOTXBSGNoM=
18901900
sigs.k8s.io/kustomize/api v0.8.5/go.mod h1:M377apnKT5ZHJS++6H4rQoCHmWtt6qTpp3mbe7p6OLY=
18911901
sigs.k8s.io/kustomize/api v0.8.11/go.mod h1:a77Ls36JdfCWojpUqR6m60pdGY1AYFix4AH83nJtY1g=
18921902
sigs.k8s.io/kustomize/api v0.10.1 h1:KgU7hfYoscuqag84kxtzKdEC3mKMb99DPI3a0eaV1d0=

‎staging/operator-lifecycle-manager/.golangci.yaml

+18
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,24 @@ linters:
2121
disable:
2222
- errcheck
2323

24+
linters-settings:
25+
importas:
26+
alias:
27+
- pkg: k8s.io/api/core/v1
28+
alias: corev1
29+
- pkg: k8s.io/api/apps/v1
30+
alias: appsv1
31+
- pkg: k8s.io/apimachinery/pkg/apis/meta/v1
32+
alias: metav1
33+
- pkg: k8s.io/apimachinery/pkg/api/errors
34+
alias: apierrors
35+
- pkg: github.com/operator-framework/api/pkg/operators/v1alpha1
36+
alias: operatorsv1alpha1
37+
- pkg: github.com/operator-framework/api/pkg/operators/v1
38+
alias: operatorsv1
39+
- pkg: github.com/operator-framework/api/pkg/operators/v2
40+
alias: operatorsv2
41+
2442
issues:
2543
max-issues-per-linter: 0
2644
max-same-issues: 0

‎staging/operator-lifecycle-manager/cmd/olm/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
1414
"github.com/sirupsen/logrus"
1515
"github.com/spf13/pflag"
16-
v1 "k8s.io/api/core/v1"
16+
corev1 "k8s.io/api/core/v1"
1717
"k8s.io/klog"
1818
ctrl "sigs.k8s.io/controller-runtime"
1919

@@ -103,8 +103,8 @@ func main() {
103103
// the empty string, the resulting array will be `[]string{""}`.
104104
namespaces := strings.Split(*watchedNamespaces, ",")
105105
for _, ns := range namespaces {
106-
if ns == v1.NamespaceAll {
107-
namespaces = []string{v1.NamespaceAll}
106+
if ns == corev1.NamespaceAll {
107+
namespaces = []string{corev1.NamespaceAll}
108108
break
109109
}
110110
}

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ require (
2828
github.com/operator-framework/operator-registry v1.17.5
2929
github.com/otiai10/copy v1.2.0
3030
github.com/pkg/errors v0.9.1
31-
github.com/prometheus/client_golang v1.11.0
31+
github.com/prometheus/client_golang v1.12.1
3232
github.com/prometheus/client_model v0.2.0
33-
github.com/prometheus/common v0.28.0
33+
github.com/prometheus/common v0.32.1
3434
github.com/sirupsen/logrus v1.8.1
3535
github.com/spf13/cobra v1.2.1
3636
github.com/spf13/pflag v1.0.5
@@ -53,7 +53,7 @@ require (
5353
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
5454
sigs.k8s.io/controller-runtime v0.11.1
5555
sigs.k8s.io/controller-tools v0.8.0
56-
sigs.k8s.io/kind v0.11.1
56+
sigs.k8s.io/kind v0.12.0
5757
)
5858

5959
require (
@@ -65,7 +65,7 @@ require (
6565
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
6666
github.com/Azure/go-autorest/logger v0.2.1 // indirect
6767
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
68-
github.com/BurntSushi/toml v0.3.1 // indirect
68+
github.com/BurntSushi/toml v0.4.1 // indirect
6969
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
7070
github.com/Masterminds/goutils v1.1.1 // indirect
7171
github.com/Masterminds/semver/v3 v3.1.1 // indirect
@@ -83,7 +83,7 @@ require (
8383
github.com/beorn7/perks v1.0.1 // indirect
8484
github.com/blang/semver v3.5.1+incompatible // indirect
8585
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
86-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
86+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
8787
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
8888
github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59 // indirect
8989
github.com/containerd/containerd v1.4.4 // indirect
@@ -102,7 +102,7 @@ require (
102102
github.com/docker/go-units v0.4.0 // indirect
103103
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
104104
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
105-
github.com/evanphx/json-patch/v5 v5.2.0 // indirect
105+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
106106
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
107107
github.com/fatih/color v1.12.0 // indirect
108108
github.com/felixge/httpsnoop v1.0.1 // indirect
@@ -149,7 +149,7 @@ require (
149149
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
150150
github.com/mailru/easyjson v0.7.6 // indirect
151151
github.com/mattn/go-colorable v0.1.8 // indirect
152-
github.com/mattn/go-isatty v0.0.12 // indirect
152+
github.com/mattn/go-isatty v0.0.14 // indirect
153153
github.com/mattn/go-runewidth v0.0.9 // indirect
154154
github.com/mattn/go-sqlite3 v1.14.6 // indirect
155155
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
@@ -168,10 +168,10 @@ require (
168168
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6 // indirect
169169
github.com/opencontainers/runc v0.1.1 // indirect
170170
github.com/pbnjay/strptime v0.0.0-20140226051138-5c05b0d668c9 // indirect
171-
github.com/pelletier/go-toml v1.9.3 // indirect
171+
github.com/pelletier/go-toml v1.9.4 // indirect
172172
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
173173
github.com/pmezard/go-difflib v1.0.0 // indirect
174-
github.com/prometheus/procfs v0.6.0 // indirect
174+
github.com/prometheus/procfs v0.7.3 // indirect
175175
github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351 // indirect
176176
github.com/russross/blackfriday v1.5.2 // indirect
177177
github.com/russross/blackfriday/v2 v2.0.1 // indirect
@@ -208,7 +208,7 @@ require (
208208
golang.org/x/mod v0.4.2 // indirect
209209
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
210210
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
211-
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
211+
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
212212
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
213213
golang.org/x/text v0.3.7 // indirect
214214
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff // indirect

0 commit comments

Comments
 (0)