Skip to content

Commit 03978b3

Browse files
AndrienkoAleksandrAndrienkoAleksandr
authored
fix: Check identity providers for oauth instead of check amount users. (#248)
* Back off openshift oauth, when oauth can't be used Signed-off-by: Oleksandr Andriienko <[email protected]> * Use freezed go modules. Signed-off-by: Oleksandr Andriienko <[email protected]> * Add newer olm bundle. Signed-off-by: Oleksandr Andriienko <[email protected]>
1 parent 87742c5 commit 03978b3

File tree

98 files changed

+23091
-6913
lines changed

Some content is hidden

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

98 files changed

+23091
-6913
lines changed

Diff for: ‎.dockerignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
tmp
1+
tmp
2+
build

Diff for: ‎Dockerfile

+6-4
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,24 @@ ENV PATH=/opt/rh/go-toolset-1.12/root/usr/bin:$PATH \
1818
GOPATH=/go/
1919

2020
USER root
21-
ADD . /go/src/github.com/eclipse/che-operator
21+
ADD . /che-operator
2222

2323
RUN case $(uname -m) in \
2424
x86_64) ARCH="amd64" ;; \
2525
s390x) ARCH="s390x";; \
2626
esac
2727

28+
WORKDIR /che-operator
29+
2830
# do no break RUN lines when building with UBI base images. https://projects.engineering.redhat.com/browse/OSBS-7398 & OSBS-7399
29-
RUN cd /go/src/github.com/eclipse/che-operator && export MOCK_API=true && go test -v ./... && OOS=linux GOARCH=$ARCH CGO_ENABLED=0 go build -o /tmp/che-operator/che-operator /go/src/github.com/eclipse/che-operator/cmd/manager/main.go && cd ..
31+
RUN export MOCK_API=true && go test -mod=vendor -v ./... && OOS=linux GOARCH=$ARCH CGO_ENABLED=0 go build -mod=vendor -o /tmp/che-operator/che-operator cmd/manager/main.go
3032

3133
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal
3234
FROM registry.access.redhat.com/ubi8-minimal:8.1-409
3335

3436
COPY --from=builder /tmp/che-operator/che-operator /usr/local/bin/che-operator
35-
COPY --from=builder /go/src/github.com/eclipse/che-operator/templates/keycloak_provision /tmp/keycloak_provision
36-
COPY --from=builder /go/src/github.com/eclipse/che-operator/templates/oauth_provision /tmp/oauth_provision
37+
COPY --from=builder /che-operator/templates/keycloak_provision /tmp/keycloak_provision
38+
COPY --from=builder /che-operator/templates/oauth_provision /tmp/oauth_provision
3739
# apply CVE fixes, if required
3840
RUN microdnf update -y libnghttp2 && microdnf clean all && rm -rf /var/cache/yum && echo "Installed Packages" && rpm -qa | sort -V && echo "End Of Installed Packages"
3941
CMD ["che-operator"]

Diff for: ‎deploy/cluster_role.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ rules:
2929
- config.openshift.io
3030
resources:
3131
- infrastructures
32+
- oauths
3233
verbs:
3334
- get
3435
- apiGroups:

Diff for: ‎go.mod

+89-59
Original file line numberDiff line numberDiff line change
@@ -2,64 +2,94 @@ module github.com/eclipse/che-operator
22

33
go 1.12
44

5+
replace (
6+
cloud.google.com/go => cloud.google.com/go v0.34.0 // indirect
7+
github.com/PuerkitoBio/purell => github.com/PuerkitoBio/purell v1.1.0 // indirect
8+
github.com/PuerkitoBio/urlesc => github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
9+
github.com/docker/spdystream => github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 // indirect
10+
github.com/emicklei/go-restful => github.com/emicklei/go-restful v2.8.0+incompatible // indirect
11+
github.com/ghodss/yaml => github.com/ghodss/yaml v1.0.0 // indirect
12+
github.com/go-logr/logr => github.com/go-logr/logr v0.1.0 // indirect
13+
github.com/go-logr/zapr => github.com/go-logr/zapr v0.1.0 // indirect
14+
github.com/go-openapi/jsonpointer => github.com/go-openapi/jsonpointer v0.0.0-20180322222829-3a0015ad55fa // indirect
15+
github.com/go-openapi/jsonreference => github.com/go-openapi/jsonreference v0.0.0-20180322222742-3fb327e6747d // indirect
16+
github.com/go-openapi/spec => github.com/go-openapi/spec v0.0.0-20180801175345-384415f06ee2
17+
github.com/go-openapi/swag => github.com/go-openapi/swag v0.0.0-20180715190254-becd2f08beaf // indirect
18+
github.com/gogo/protobuf => github.com/gogo/protobuf v1.2.0 // indirect
19+
github.com/golang/glog => github.com/golang/glog v0.0.0-20141105023935-44145f04b68c // indirect
20+
github.com/golang/groupcache => github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff // indirect
21+
github.com/google/btree => github.com/google/btree v1.0.0 // indirect
22+
github.com/google/go-cmp => github.com/google/go-cmp v0.4.0
23+
github.com/google/gofuzz => github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367 // indirect
24+
github.com/google/uuid => github.com/google/uuid v1.1.0 // indirect
25+
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.2.0 // indirect
26+
github.com/gregjones/httpcache => github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
27+
github.com/hashicorp/golang-lru => github.com/hashicorp/golang-lru v0.5.0 // indirect
28+
github.com/imdario/mergo => github.com/imdario/mergo v0.3.6 // indirect
29+
github.com/json-iterator/go => github.com/json-iterator/go v1.1.5 // indirect
30+
github.com/mailru/easyjson => github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 // indirect
31+
github.com/mattbaird/jsonpatch => github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a // indirect
32+
github.com/modern-go/concurrent => github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
33+
github.com/modern-go/reflect2 => github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
34+
github.com/openshift/api => github.com/openshift/api v0.0.0-20190907160150-763878ba9fae
35+
github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.5.0
36+
github.com/pborman/uuid => github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 // indirect
37+
github.com/petar/GoLLRB => github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c // indirect
38+
github.com/peterbourgon/diskv => github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
39+
github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.2 // indirect
40+
github.com/prometheus/client_model => github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
41+
github.com/prometheus/common => github.com/prometheus/common v0.0.0-20190304134840-bf857faf2086
42+
github.com/prometheus/procfs => github.com/prometheus/procfs v0.0.0-20190225181712-6ed1f7e10411 // indirect
43+
github.com/sirupsen/logrus => github.com/sirupsen/logrus v1.2.0
44+
github.com/spf13/pflag => github.com/spf13/pflag v1.0.3 // indirect
45+
go.uber.org/atomic => go.uber.org/atomic v1.3.2 // indirect
46+
go.uber.org/multierr => go.uber.org/multierr v1.1.0 // indirect
47+
go.uber.org/zap => go.uber.org/zap v1.9.1 // indirect
48+
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc // indirect
49+
golang.org/x/net => golang.org/x/net v0.0.0-20190107210223-45ffb0cd1ba0
50+
golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 // indirect
51+
golang.org/x/sys => golang.org/x/sys v0.0.0-20190107173414-20be8e55dc7b // indirect
52+
golang.org/x/time => golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
53+
golang.org/x/tools => golang.org/x/tools v0.0.0-20190107155254-e063def13b29 // indirect
54+
google.golang.org/appengine => google.golang.org/appengine v1.4.0 // indirect
55+
gopkg.in/inf.v0 => gopkg.in/inf.v0 v0.9.0 // indirect
56+
gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.2.2 // indirect
57+
k8s.io/api => k8s.io/api v0.0.0-20181126151915-b503174bad59
58+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20181126123746-eddba98df674
59+
k8s.io/client-go => k8s.io/client-go v0.0.0-20181126152608-d082d5923d3c
60+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20180823001027-3dcf91f64f63 // indirect
61+
k8s.io/gengo => k8s.io/gengo v0.0.0-20181113154421-fd15ee9cc2f7 // indirect
62+
k8s.io/klog => k8s.io/klog v0.1.0 // indirect
63+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be
64+
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.8
65+
)
66+
567
require (
6-
cloud.google.com/go v0.34.0 // indirect
7-
github.com/PuerkitoBio/purell v1.1.0 // indirect
8-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
9-
github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 // indirect
10-
github.com/emicklei/go-restful v2.8.0+incompatible // indirect
11-
github.com/ghodss/yaml v1.0.0 // indirect
12-
github.com/go-logr/logr v0.1.0 // indirect
13-
github.com/go-logr/zapr v0.1.0 // indirect
14-
github.com/go-openapi/jsonpointer v0.0.0-20180322222829-3a0015ad55fa // indirect
15-
github.com/go-openapi/jsonreference v0.0.0-20180322222742-3fb327e6747d // indirect
16-
github.com/go-openapi/spec v0.0.0-20180801175345-384415f06ee2
17-
github.com/go-openapi/swag v0.0.0-20180715190254-becd2f08beaf // indirect
18-
github.com/gogo/protobuf v1.2.0 // indirect
19-
github.com/golang/glog v0.0.0-20141105023935-44145f04b68c // indirect
20-
github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff // indirect
21-
github.com/google/btree v1.0.0 // indirect
22-
github.com/google/go-cmp v0.4.0
23-
github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367 // indirect
24-
github.com/google/uuid v1.1.0 // indirect
25-
github.com/googleapis/gnostic v0.2.0 // indirect
26-
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
27-
github.com/hashicorp/golang-lru v0.5.0 // indirect
28-
github.com/imdario/mergo v0.3.6 // indirect
29-
github.com/json-iterator/go v1.1.5 // indirect
30-
github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 // indirect
31-
github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a // indirect
32-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
33-
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
34-
github.com/openshift/api v0.0.0-20190907160150-763878ba9fae
35-
github.com/operator-framework/operator-sdk v0.5.0
36-
github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 // indirect
37-
github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c // indirect
38-
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
39-
github.com/prometheus/client_golang v0.9.2 // indirect
40-
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
41-
github.com/prometheus/common v0.0.0-20190304134840-bf857faf2086
42-
github.com/prometheus/procfs v0.0.0-20190225181712-6ed1f7e10411 // indirect
43-
github.com/sirupsen/logrus v1.2.0
44-
github.com/spf13/pflag v1.0.3 // indirect
45-
go.uber.org/atomic v1.3.2 // indirect
46-
go.uber.org/multierr v1.1.0 // indirect
47-
go.uber.org/zap v1.9.1 // indirect
48-
golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc // indirect
49-
golang.org/x/net v0.0.0-20190107210223-45ffb0cd1ba0
50-
golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 // indirect
51-
golang.org/x/sys v0.0.0-20190107173414-20be8e55dc7b // indirect
52-
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
53-
golang.org/x/tools v0.0.0-20190107155254-e063def13b29 // indirect
54-
google.golang.org/appengine v1.4.0 // indirect
55-
gopkg.in/inf.v0 v0.9.0 // indirect
56-
gopkg.in/yaml.v2 v2.2.2
57-
k8s.io/api v0.0.0-20181126151915-b503174bad59
58-
k8s.io/apimachinery v0.0.0-20181126123746-eddba98df674
59-
k8s.io/client-go v0.0.0-20181126152608-d082d5923d3c
60-
k8s.io/code-generator v0.0.0-20180823001027-3dcf91f64f63 // indirect
61-
k8s.io/gengo v0.0.0-20181113154421-fd15ee9cc2f7 // indirect
62-
k8s.io/klog v0.1.0 // indirect
63-
k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be
64-
sigs.k8s.io/controller-runtime v0.1.8
68+
github.com/docker/spdystream v0.0.0-00010101000000-000000000000 // indirect
69+
github.com/elazarl/goproxy v0.0.0-20200426045556-49ad98f6dac1 // indirect
70+
github.com/go-logr/logr v0.0.0-00010101000000-000000000000 // indirect
71+
github.com/go-logr/zapr v0.0.0-00010101000000-000000000000 // indirect
72+
github.com/go-openapi/spec v0.19.3
73+
github.com/google/go-cmp v0.3.0
74+
github.com/gregjones/httpcache v0.0.0-00010101000000-000000000000 // indirect
75+
github.com/imdario/mergo v0.0.0-00010101000000-000000000000 // indirect
76+
github.com/mattbaird/jsonpatch v0.0.0-00010101000000-000000000000 // indirect
77+
github.com/onsi/ginkgo v1.12.0 // indirect
78+
github.com/onsi/gomega v1.10.0 // indirect
79+
github.com/openshift/api v0.0.0-00010101000000-000000000000
80+
github.com/operator-framework/operator-sdk v0.0.0-00010101000000-000000000000
81+
github.com/peterbourgon/diskv v0.0.0-00010101000000-000000000000 // indirect
82+
github.com/prometheus/common v0.4.1
83+
github.com/sirupsen/logrus v1.4.2
84+
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9
85+
golang.org/x/text v0.3.2 // indirect
86+
gopkg.in/inf.v0 v0.0.0-00010101000000-000000000000 // indirect
87+
gopkg.in/yaml.v2 v2.2.8
88+
k8s.io/api v0.18.2
89+
k8s.io/apiextensions-apiserver v0.18.2 // indirect
90+
k8s.io/apimachinery v0.18.2
91+
k8s.io/client-go v0.18.2
92+
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c
93+
sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000
94+
sigs.k8s.io/testing_frameworks v0.1.2 // indirect
6595
)

0 commit comments

Comments
 (0)