Merge pull request openshift#339 from csrwng/roks_profile

Add IBM Cloud managed annotations to CVO manifests
osherdp · Nov 18, 2020 · 28f0879 · 28f0879
2 parents 4b1f9e2 + 3eead9d
commit 28f0879
Show file tree

Hide file tree

Showing 212 changed files with 21,553 additions and 8,234 deletions.
diff --git a/go.mod b/go.mod
@@ -4,26 +4,27 @@ go 1.13
 
 require (
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
-	github.com/coreos/bbolt v1.3.3 // indirect
-	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/emicklei/go-restful v2.11.1+incompatible // indirect
+	github.com/go-logr/logr v0.3.0 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/gorilla/websocket v1.4.1 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.11.3 // indirect
 	github.com/hashicorp/golang-lru v0.5.3 // indirect
-	github.com/openshift/api v0.0.0-20201023182528-2ed1db6e1551
+	github.com/openshift/api v0.0.0-20201117184740-859beeffd973
 	github.com/openshift/client-go v0.0.0-20201020074620-f8fd44879f7c
 	github.com/openshift/library-go v0.0.0-20201023142140-a2f8f23f66f0
 	github.com/prometheus/client_golang v1.7.1
 	github.com/prometheus/client_model v0.2.0
 	github.com/prometheus/common v0.10.0
 	github.com/sirupsen/logrus v1.6.0
 	github.com/spf13/cobra v1.0.0
-	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
-	github.com/ugorji/go v1.1.7 // indirect
 	go.uber.org/zap v1.12.0 // indirect
-	k8s.io/api v0.19.2
-	k8s.io/apimachinery v0.19.2
+	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
+	golang.org/x/text v0.3.4 // indirect
+	k8s.io/api v0.19.4
+	k8s.io/apimachinery v0.19.4
 	k8s.io/client-go v0.19.2
-	sigs.k8s.io/structured-merge-diff/v3 v3.0.1-0.20200706213357-43c19bbb7fba // indirect
+	k8s.io/klog/v2 v2.4.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/manifests/01-namespace.yaml b/manifests/01-namespace.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Namespace
 metadata:
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     openshift.io/node-selector: ""
   labels:

diff --git a/manifests/010-prometheus-rules.yaml b/manifests/010-prometheus-rules.yaml
@@ -6,6 +6,7 @@ metadata:
   name: samples-operator-alerts
   namespace: openshift-cluster-samples-operator
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   groups:

diff --git a/manifests/02-sa.yaml b/manifests/02-sa.yaml
@@ -5,4 +5,5 @@ metadata:
   name: cluster-samples-operator
   namespace: openshift-cluster-samples-operator
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
diff --git a/manifests/03-rbac-proxies-role-binding.yaml b/manifests/03-rbac-proxies-role-binding.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-samples-operator-proxy-reader
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 subjects:
   - kind: ServiceAccount

diff --git a/manifests/03-rbac-proxies-role.yaml b/manifests/03-rbac-proxies-role.yaml
@@ -3,6 +3,7 @@ kind: ClusterRole
 metadata:
   name: cluster-samples-operator-proxy-reader
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 rules:
   - apiGroups:

diff --git a/manifests/03-rbac.yaml b/manifests/03-rbac.yaml
@@ -4,6 +4,7 @@ metadata:
   name: cluster-samples-operator
   namespace: openshift-cluster-samples-operator
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
@@ -35,6 +36,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-samples-operator
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
@@ -61,6 +63,7 @@ metadata:
     rbac.authorization.k8s.io/aggregate-to-cluster-reader: "true"
   name: system:openshift:cluster-samples-operator:cluster-reader
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
@@ -81,6 +84,7 @@ metadata:
   name: cluster-samples-operator
   namespace: openshift-cluster-samples-operator
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 subjects:
 - kind: ServiceAccount
@@ -97,6 +101,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-samples-operator
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 subjects:
 - kind: ServiceAccount

diff --git a/manifests/04-openshift-rbac.yaml b/manifests/04-openshift-rbac.yaml
@@ -4,6 +4,7 @@ metadata:
   name: cluster-samples-operator-openshift-edit
   namespace: openshift
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 subjects:
 - kind: ServiceAccount

diff --git a/manifests/05-kube-system-rbac.yaml b/manifests/05-kube-system-rbac.yaml
@@ -4,6 +4,7 @@ metadata:
   name: coreos-pull-secret-reader
   namespace: openshift-config
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
@@ -23,6 +24,7 @@ metadata:
   name: cluster-samples-operator-openshift-config-secret-reader
   namespace: openshift-config
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 subjects:
 - kind: ServiceAccount

diff --git a/manifests/06-metricsservice.yaml b/manifests/06-metricsservice.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     service.beta.openshift.io/serving-cert-secret-name: samples-operator-tls
   labels:
@@ -16,4 +17,4 @@ spec:
     protocol: TCP
     targetPort: 60000
   selector:
-    name: cluster-samples-operator
+    name: cluster-samples-operator
diff --git a/manifests/06-operator.yaml b/manifests/06-operator.yaml
@@ -4,6 +4,7 @@ metadata:
   name: cluster-samples-operator
   namespace: openshift-cluster-samples-operator
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   replicas: 1

diff --git a/manifests/06-servicemonitor.yaml b/manifests/06-servicemonitor.yaml
@@ -5,6 +5,7 @@ metadata:
   name: cluster-samples-operator
   namespace: openshift-cluster-samples-operator
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   endpoints:

diff --git a/manifests/07-clusteroperator.yaml b/manifests/07-clusteroperator.yaml
@@ -3,6 +3,7 @@ kind: ClusterOperator
 metadata:
   name: openshift-samples
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 spec: {}
 status:

diff --git a/manifests/08-openshift-imagestreams.yaml b/manifests/08-openshift-imagestreams.yaml
@@ -7,6 +7,7 @@ metadata:
   namespace: openshift
   name: cli
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   tags:
@@ -23,6 +24,7 @@ metadata:
   namespace: openshift
   name: cli-artifacts
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   tags:
@@ -39,6 +41,7 @@ metadata:
   namespace: openshift
   name: installer
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   tags:
@@ -55,6 +58,7 @@ metadata:
   namespace: openshift
   name: installer-artifacts
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   tags:
@@ -71,6 +75,7 @@ metadata:
   namespace: openshift
   name: tests
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   tags:
@@ -87,6 +92,7 @@ metadata:
   namespace: openshift
   name: tools
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   tags:
@@ -103,6 +109,7 @@ metadata:
   namespace: openshift
   name: must-gather
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   tags:
@@ -119,6 +126,7 @@ metadata:
   namespace: openshift
   name: oauth-proxy
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   tags:
@@ -135,6 +143,7 @@ metadata:
   namespace: openshift
   name: hello-openshift
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   tags:

diff --git a/manifests/09-servicemonitor-rbac.yaml b/manifests/09-servicemonitor-rbac.yaml
@@ -5,6 +5,7 @@ metadata:
   name: prometheus-k8s
   namespace: openshift-cluster-samples-operator
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
@@ -24,6 +25,7 @@ metadata:
   name: prometheus-k8s
   namespace: openshift-cluster-samples-operator
   annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -32,4 +34,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: prometheus-k8s
-  namespace: openshift-monitoring
+  namespace: openshift-monitoring
diff --git a/vendor/github.com/go-logr/logr/README.md b/vendor/github.com/go-logr/logr/README.md
diff --git a/vendor/github.com/go-logr/logr/discard.go b/vendor/github.com/go-logr/logr/discard.go