Skip to content

Commit 79770f7

Browse files
authored
Merge pull request #34 from leelavg/csi-metrics-1-feature
controllers: send platform and operator version while reporting status
2 parents ffea2d7 + 8c964f2 commit 79770f7

File tree

287 files changed

+15450
-5729
lines changed

Some content is hidden

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

287 files changed

+15450
-5729
lines changed

config/rbac/status-reporter-clusterrole.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,11 @@ rules:
1818
- get
1919
- list
2020
- update
21+
- apiGroups:
22+
- config.openshift.io
23+
resources:
24+
- clusterversions
25+
verbs:
26+
- get
27+
- list
28+
- watch

config/rbac/status-reporter-role.yaml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
kind: Role
4+
metadata:
5+
creationTimestamp: null
6+
name: status-reporter
7+
rules:
8+
- apiGroups:
9+
- operators.coreos.com
10+
resources:
11+
- clusterserviceversions
12+
verbs:
13+
- get
14+
- list
15+
- watch
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
kind: RoleBinding
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
metadata:
4+
name: status-reporter
5+
roleRef:
6+
apiGroup: rbac.authorization.k8s.io
7+
kind: Role
8+
name: status-reporter
9+
subjects:
10+
- kind: ServiceAccount
11+
name: status-reporter
12+
namespace: system

go.mod

+21-18
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ require (
1414
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.2.0
1515
github.com/onsi/ginkgo v1.16.5
1616
github.com/onsi/gomega v1.27.9
17-
github.com/openshift/api v0.0.0-20230816181854-a7ca92db022a
17+
github.com/openshift/api v0.0.0-20231010191030-1f9525271dda
18+
github.com/operator-framework/api v0.17.7-0.20230626210316-aa3e49803e7b
1819
github.com/pkg/errors v0.9.1
1920
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.67.1
20-
github.com/red-hat-storage/ocs-operator/v4 v4.0.0-20230915072501-d290a4270291
21+
github.com/red-hat-storage/ocs-operator/v4 v4.0.0-20231031112628-5ea7bff99378
2122
github.com/stretchr/testify v1.8.4
2223
google.golang.org/grpc v1.56.2
2324
gopkg.in/yaml.v2 v2.4.0
@@ -26,15 +27,16 @@ require (
2627
k8s.io/client-go v0.28.2
2728
k8s.io/klog/v2 v2.100.1
2829
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
29-
sigs.k8s.io/controller-runtime v0.15.1
30+
sigs.k8s.io/controller-runtime v0.15.2
3031
)
3132

3233
require (
3334
github.com/beorn7/perks v1.0.1 // indirect
35+
github.com/blang/semver/v4 v4.0.0 // indirect
3436
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3537
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3638
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
37-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
39+
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
3840
github.com/fsnotify/fsnotify v1.6.0 // indirect
3941
github.com/go-logr/zapr v1.2.4 // indirect
4042
github.com/go-openapi/jsonpointer v0.20.0 // indirect
@@ -44,7 +46,7 @@ require (
4446
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4547
github.com/golang/protobuf v1.5.3 // indirect
4648
github.com/google/gnostic-models v0.6.8 // indirect
47-
github.com/google/go-cmp v0.5.9 // indirect
49+
github.com/google/go-cmp v0.6.0 // indirect
4850
github.com/google/gofuzz v1.2.0 // indirect
4951
github.com/google/uuid v1.3.1 // indirect
5052
github.com/imdario/mergo v0.3.16 // indirect
@@ -57,29 +59,30 @@ require (
5759
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5860
github.com/nxadm/tail v1.4.8 // indirect
5961
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
60-
github.com/prometheus/client_golang v1.16.0 // indirect
61-
github.com/prometheus/client_model v0.4.0 // indirect
62+
github.com/prometheus/client_golang v1.17.0 // indirect
63+
github.com/prometheus/client_model v0.5.0 // indirect
6264
github.com/prometheus/common v0.44.0 // indirect
63-
github.com/prometheus/procfs v0.11.1 // indirect
65+
github.com/prometheus/procfs v0.12.0 // indirect
66+
github.com/sirupsen/logrus v1.9.3 // indirect
6467
github.com/spf13/pflag v1.0.5 // indirect
6568
go.uber.org/multierr v1.11.0 // indirect
66-
go.uber.org/zap v1.25.0 // indirect
67-
golang.org/x/net v0.14.0 // indirect
68-
golang.org/x/oauth2 v0.11.0 // indirect
69-
golang.org/x/sys v0.11.0 // indirect
70-
golang.org/x/term v0.11.0 // indirect
71-
golang.org/x/text v0.12.0 // indirect
69+
go.uber.org/zap v1.26.0 // indirect
70+
golang.org/x/net v0.17.0 // indirect
71+
golang.org/x/oauth2 v0.13.0 // indirect
72+
golang.org/x/sys v0.13.0 // indirect
73+
golang.org/x/term v0.13.0 // indirect
74+
golang.org/x/text v0.13.0 // indirect
7275
golang.org/x/time v0.3.0 // indirect
7376
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
74-
google.golang.org/appengine v1.6.7 // indirect
77+
google.golang.org/appengine v1.6.8 // indirect
7578
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
7679
google.golang.org/protobuf v1.31.0 // indirect
7780
gopkg.in/inf.v0 v0.9.1 // indirect
7881
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
7982
gopkg.in/yaml.v3 v3.0.1 // indirect
80-
k8s.io/apiextensions-apiserver v0.28.0 // indirect
81-
k8s.io/component-base v0.28.0 // indirect
82-
k8s.io/kube-openapi v0.0.0-20230816210353-14e408962443 // indirect
83+
k8s.io/apiextensions-apiserver v0.28.2 // indirect
84+
k8s.io/component-base v0.28.2 // indirect
85+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
8386
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
8487
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
8588
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)