Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add IBM Cloud managed annotations to CVO manifests #982

Merged
merged 1 commit into from
Nov 17, 2020
Merged

Add IBM Cloud managed annotations to CVO manifests #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Documentation/data-collection.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ metadata:
name: telemetry-config
namespace: openshift-monitoring
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
```

Expand Down
13 changes: 13 additions & 0 deletions assets/grafana/dashboard-definitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1839,6 +1839,7 @@ items:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
name: grafana-dashboard-cluster-total
namespace: openshift-monitoring
Expand Down Expand Up @@ -3071,6 +3072,7 @@ items:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
name: grafana-dashboard-etcd
namespace: openshift-monitoring
Expand Down Expand Up @@ -5639,6 +5641,7 @@ items:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
name: grafana-dashboard-k8s-resources-cluster
namespace: openshift-monitoring
Expand Down Expand Up @@ -7911,6 +7914,7 @@ items:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
name: grafana-dashboard-k8s-resources-namespace
namespace: openshift-monitoring
Expand Down Expand Up @@ -8875,6 +8879,7 @@ items:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
name: grafana-dashboard-k8s-resources-node
namespace: openshift-monitoring
Expand Down Expand Up @@ -10633,6 +10638,7 @@ items:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
name: grafana-dashboard-k8s-resources-pod
namespace: openshift-monitoring
Expand Down Expand Up @@ -12653,6 +12659,7 @@ items:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
name: grafana-dashboard-k8s-resources-workload
namespace: openshift-monitoring
Expand Down Expand Up @@ -14834,6 +14841,7 @@ items:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: openshift-monitoring
Expand Down Expand Up @@ -16258,6 +16266,7 @@ items:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
name: grafana-dashboard-namespace-by-pod
namespace: openshift-monitoring
Expand Down Expand Up @@ -17208,6 +17217,7 @@ items:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
name: grafana-dashboard-node-cluster-rsrc-use
namespace: openshift-monitoring
Expand Down Expand Up @@ -18185,6 +18195,7 @@ items:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
name: grafana-dashboard-node-rsrc-use
namespace: openshift-monitoring
Expand Down Expand Up @@ -19373,6 +19384,7 @@ items:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
name: grafana-dashboard-pod-total
namespace: openshift-monitoring
Expand Down Expand Up @@ -20586,6 +20598,7 @@ items:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
name: grafana-dashboard-prometheus
namespace: openshift-monitoring
Expand Down
1 change: 1 addition & 0 deletions hack/cluster-monitoring-operator-role.yaml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ kind: ClusterRole
metadata:
name: cluster-monitoring-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups: ["rbac.authorization.k8s.io"]
Expand Down
2 changes: 2 additions & 0 deletions jsonnet/add-release-annotation.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
local addAnnotation(o) = o {
[if (o.kind == 'CustomResourceDefinition') then 'metadata']+: {
annotations+: {
'include.release.openshift.io/ibm-cloud-managed': "true",
'include.release.openshift.io/self-managed-high-availability': "true"
},
},
[if (o.kind == 'ConfigMapList') then 'items']: [
i {
metadata+: {
annotations+: {
'include.release.openshift.io/ibm-cloud-managed': "true",
'include.release.openshift.io/self-managed-high-availability': "true"
}
},
Expand Down
1 change: 1 addition & 0 deletions ...00_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.4
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
creationTimestamp: null
name: alertmanagerconfigs.monitoring.coreos.com
Expand Down
1 change: 1 addition & 0 deletions ...ests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.4
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
creationTimestamp: null
name: alertmanagers.monitoring.coreos.com
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.4
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
creationTimestamp: null
name: podmonitors.monitoring.coreos.com
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_cluster-monitoring-operator_00_0probe-custom-resource-definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.4
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
creationTimestamp: null
name: probes.monitoring.coreos.com
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_cluster-monitoring-operator_00_0prometheus-custom-resource-definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.4
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
creationTimestamp: null
name: prometheuses.monitoring.coreos.com
Expand Down
1 change: 1 addition & 0 deletions ...ts/0000_50_cluster-monitoring-operator_00_0prometheusrule-custom-resource-definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.4
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
creationTimestamp: null
name: prometheusrules.monitoring.coreos.com
Expand Down
1 change: 1 addition & 0 deletions ...ts/0000_50_cluster-monitoring-operator_00_0servicemonitor-custom-resource-definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.4
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
creationTimestamp: null
name: servicemonitors.monitoring.coreos.com
Expand Down
1 change: 1 addition & 0 deletions ...fests/0000_50_cluster-monitoring-operator_00_0thanosruler-custom-resource-definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.4
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
creationTimestamp: null
name: thanosrulers.monitoring.coreos.com
Expand Down
2 changes: 2 additions & 0 deletions manifests/0000_50_cluster-monitoring-operator_01-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: Namespace
metadata:
name: openshift-monitoring
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
openshift.io/node-selector: ""
labels:
Expand All @@ -15,6 +16,7 @@ kind: Namespace
metadata:
name: openshift-user-workload-monitoring
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
openshift.io/node-selector: ""
labels:
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_cluster-monitoring-operator_02-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRole
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: 'true'
include.release.openshift.io/self-managed-high-availability: 'true'
name: cluster-monitoring-operator
rules:
Expand Down
2 changes: 2 additions & 0 deletions manifests/0000_50_cluster-monitoring-operator_03-role-binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ metadata:
name: cluster-monitoring-operator
namespace: openshift-monitoring
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
metadata:
name: cluster-monitoring-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
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_cluster-monitoring-operator_04-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,4 +235,5 @@ metadata:
name: telemetry-config
namespace: openshift-monitoring
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
1 change: 1 addition & 0 deletions manifests/0000_50_cluster-monitoring-operator_05-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
labels:
app: cluster-monitoring-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
spec:
replicas: 1
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_cluster-monitoring-operator_06-clusteroperator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: ClusterOperator
metadata:
name: monitoring
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
spec: {}
status:
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_90_cluster-monitoring-operator_00-operatorgroup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: openshift-cluster-monitoring
namespace: openshift-monitoring
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
olm.providedAPIs: Alertmanager.v1.monitoring.coreos.com,PodMonitor.v1.monitoring.coreos.com,Probe.v1.monitoring.coreos.com,Prometheus.v1.monitoring.coreos.com,PrometheusRule.v1.monitoring.coreos.com,ServiceMonitor.v1.monitoring.coreos.com,ThanosRuler.v1.monitoring.coreos.com,AlertmanagerConfig.v1alpha1.monitoring.coreos.com
spec:
Expand Down
13 changes: 13 additions & 0 deletions manifests/0000_90_cluster-monitoring-operator_01-dashboards.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1838,6 +1838,7 @@ data:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
labels:
console.openshift.io/dashboard: "true"
Expand Down Expand Up @@ -3073,6 +3074,7 @@ data:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
labels:
console.openshift.io/dashboard: "true"
Expand Down Expand Up @@ -5644,6 +5646,7 @@ data:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
labels:
console.openshift.io/dashboard: "true"
Expand Down Expand Up @@ -7919,6 +7922,7 @@ data:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
labels:
console.openshift.io/dashboard: "true"
Expand Down Expand Up @@ -8886,6 +8890,7 @@ data:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
labels:
console.openshift.io/dashboard: "true"
Expand Down Expand Up @@ -10647,6 +10652,7 @@ data:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
labels:
console.openshift.io/dashboard: "true"
Expand Down Expand Up @@ -12670,6 +12676,7 @@ data:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
labels:
console.openshift.io/dashboard: "true"
Expand Down Expand Up @@ -14854,6 +14861,7 @@ data:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
labels:
console.openshift.io/dashboard: "true"
Expand Down Expand Up @@ -16281,6 +16289,7 @@ data:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
labels:
console.openshift.io/dashboard: "true"
Expand Down Expand Up @@ -17234,6 +17243,7 @@ data:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
labels:
console.openshift.io/dashboard: "true"
Expand Down Expand Up @@ -18214,6 +18224,7 @@ data:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
labels:
console.openshift.io/dashboard: "true"
Expand Down Expand Up @@ -19405,6 +19416,7 @@ data:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
labels:
console.openshift.io/dashboard: "true"
Expand Down Expand Up @@ -20621,6 +20633,7 @@ data:
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
labels:
console.openshift.io/dashboard: "true"
Expand Down
4 changes: 2 additions & 2 deletions pkg/manifests/bindata.go
View file
Open in desktop

Large diffs are not rendered by default.