Skip to content

Commit c3671cb

Browse files
perdasilvaperdasilva
committed
Import cluster-policy-controller into operator-lifecycle-manager
Signed-off-by: perdasilva <[email protected]>
1 parent 3f3937b commit c3671cb

File tree

9 files changed

+110
-42
lines changed

9 files changed

+110
-42
lines changed

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/maxbrunsfeld/counterfeiter/v6 v6.4.1
1212
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
1313
github.com/onsi/ginkgo/v2 v2.1.3
14-
github.com/openshift/api v0.0.0-20200331152225-585af27e34fd
14+
github.com/openshift/api v0.0.0-20220525145417-ee5b62754c68
1515
github.com/operator-framework/api v0.16.0
1616
github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000
1717
github.com/operator-framework/operator-registry v1.17.5
@@ -176,7 +176,7 @@ require (
176176
github.com/onsi/gomega v1.18.1 // indirect
177177
github.com/opencontainers/go-digest v1.0.0 // indirect
178178
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
179-
github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 // indirect
179+
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a // indirect
180180
github.com/otiai10/copy v1.2.0 // indirect
181181
github.com/pbnjay/strptime v0.0.0-20140226051138-5c05b0d668c9 // indirect
182182
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
@@ -223,7 +223,7 @@ require (
223223
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
224224
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
225225
golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3 // indirect
226-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
226+
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
227227
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
228228
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
229229
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect

‎go.sum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1435,8 +1435,9 @@ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ
14351435
golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
14361436
golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
14371437
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
1438-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg=
14391438
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
1439+
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 h1:OSnWWcOd/CtWQC2cYSBgbTSJv3ciqd8r54ySIW2y3RE=
1440+
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
14401441
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
14411442
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
14421443
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ require (
2222
github.com/mitchellh/mapstructure v1.4.1
2323
github.com/onsi/ginkgo/v2 v2.1.3
2424
github.com/onsi/gomega v1.18.1
25-
github.com/openshift/api v0.0.0-20200331152225-585af27e34fd
26-
github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
25+
github.com/openshift/api v0.0.0-20220525145417-ee5b62754c68
26+
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
2727
github.com/operator-framework/api v0.16.0
2828
github.com/operator-framework/operator-registry v1.17.5
2929
github.com/otiai10/copy v1.2.0
@@ -221,7 +221,7 @@ require (
221221
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
222222
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
223223
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
224-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
224+
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
225225
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
226226
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
227227
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1550,8 +1550,9 @@ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ
15501550
golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
15511551
golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
15521552
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
1553-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg=
15541553
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
1554+
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 h1:OSnWWcOd/CtWQC2cYSBgbTSJv3ciqd8r54ySIW2y3RE=
1555+
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
15551556
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
15561557
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
15571558
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

‎vendor/golang.org/x/oauth2/google/default.go

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/golang.org/x/oauth2/google/doc.go

Lines changed: 6 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/golang.org/x/oauth2/google/internal/externalaccount/aws.go

Lines changed: 68 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/golang.org/x/oauth2/google/internal/externalaccount/basecredentials.go

Lines changed: 9 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -620,10 +620,10 @@ github.com/opencontainers/go-digest
620620
## explicit
621621
github.com/opencontainers/image-spec/specs-go
622622
github.com/opencontainers/image-spec/specs-go/v1
623-
# github.com/openshift/api v0.0.0-20200331152225-585af27e34fd => github.com/openshift/api v0.0.0-20210517065120-b325f58df679
623+
# github.com/openshift/api v0.0.0-20220525145417-ee5b62754c68 => github.com/openshift/api v0.0.0-20210517065120-b325f58df679
624624
## explicit; go 1.15
625625
github.com/openshift/api/config/v1
626-
# github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 => github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
626+
# github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a => github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
627627
## explicit; go 1.13
628628
github.com/openshift/client-go/config/clientset/versioned
629629
github.com/openshift/client-go/config/clientset/versioned/scheme
@@ -1069,7 +1069,7 @@ golang.org/x/net/internal/timeseries
10691069
golang.org/x/net/proxy
10701070
golang.org/x/net/trace
10711071
golang.org/x/net/websocket
1072-
# golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
1072+
# golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
10731073
## explicit; go 1.11
10741074
golang.org/x/oauth2
10751075
golang.org/x/oauth2/authhandler

0 commit comments

Comments
 (0)