Skip to content

Commit 455b19d

Browse files
committed
pull upstream changes
1 parent ab5ecfd commit 455b19d

File tree

14 files changed

+68
-747
lines changed

14 files changed

+68
-747
lines changed

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ require (
176176
github.com/opencontainers/go-digest v1.0.0 // indirect
177177
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
178178
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a // indirect
179-
github.com/openshift/cluster-policy-controller v0.0.0-20220825134653-523e4104074f // indirect
180179
github.com/otiai10/copy v1.2.0 // indirect
181180
github.com/pbnjay/strptime v0.0.0-20140226051138-5c05b0d668c9 // indirect
182181
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
@@ -272,7 +271,7 @@ replace (
272271

273272
// use staged repositories
274273
github.com/operator-framework/api => ./staging/api
275-
github.com/operator-framework/operator-lifecycle-manager => ./staging/operator-lifecycle-manager
274+
github.com/operator-framework/operator-lifecycle-manager => github.com/awgreene/operator-lifecycle-manager v0.0.0-20221027145921-8dfab62f234c
276275
github.com/operator-framework/operator-registry => ./staging/operator-registry
277276

278277
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY
161161
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
162162
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 h1:4daAzAu0S6Vi7/lbWECcX0j45yZReDZ56BQsrVBOEEY=
163163
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
164+
github.com/awgreene/operator-lifecycle-manager v0.0.0-20221027145921-8dfab62f234c h1:mPKgGZxlPJm9YjHORRbdaF9ZsGa9QauWHAeltZBOnHA=
165+
github.com/awgreene/operator-lifecycle-manager v0.0.0-20221027145921-8dfab62f234c/go.mod h1:CsiQ6vZePdRybtttLCf4WximQW6Xs0SgD6DlAFPDJMA=
164166
github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
165167
github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
166168
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
@@ -987,8 +989,6 @@ github.com/openshift/api v0.0.0-20210517065120-b325f58df679/go.mod h1:dZ4kytOo3s
987989
github.com/openshift/build-machinery-go v0.0.0-20210209125900-0da259a2c359/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
988990
github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 h1:kMiuiZXH1GdfbiMwsuAQOqGaMxlo9NCUk0wT4XAdfNM=
989991
github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0/go.mod h1:uUQ4LClRO+fg5MF/P6QxjMCb1C9f7Oh4RKepftDnEJE=
990-
github.com/openshift/cluster-policy-controller v0.0.0-20220825134653-523e4104074f h1:ll0eE7rgGHsFlrI6ksr6nXL2ur8GYBe8Jj0GwNQ/1+o=
991-
github.com/openshift/cluster-policy-controller v0.0.0-20220825134653-523e4104074f/go.mod h1:r9ZZT5wjwoS2heBfYR26uJhhkGYwgmFqomu9ww0y9Qw=
992992
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
993993
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
994994
github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=

vendor/github.com/openshift/cluster-policy-controller/LICENSE

Lines changed: 0 additions & 201 deletions
This file was deleted.

vendor/github.com/openshift/cluster-policy-controller/pkg/psalabelsyncer/nsexemptions/nsexemptions.go

Lines changed: 0 additions & 85 deletions
This file was deleted.

vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/decorators/operator.go

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

0 commit comments

Comments
 (0)