Skip to content

Commit

Permalink
Add IBM Cloud managed annotations to CVO manifests
Browse files Browse the repository at this point in the history
This matches openshift/enhancements#445 and does
not change behavior.
  • Loading branch information
csrwng committed Nov 18, 2020
1 parent 8a6dfd7 commit ba9e016
Show file tree
Hide file tree
Showing 22 changed files with 25 additions and 0 deletions.
Expand Up @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
rbac.authorization.kubernetes.io/autoupdate: "true"
name: system:openshift:scc:anyuid
Expand Down
Expand Up @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
rbac.authorization.kubernetes.io/autoupdate: "true"
name: system:openshift:scc:hostaccess
Expand Down
Expand Up @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
rbac.authorization.kubernetes.io/autoupdate: "true"
name: system:openshift:scc:hostmount
Expand Down
Expand Up @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
rbac.authorization.kubernetes.io/autoupdate: "true"
name: system:openshift:scc:hostnetwork
Expand Down
Expand Up @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
rbac.authorization.kubernetes.io/autoupdate: "true"
name: system:openshift:scc:nonroot
Expand Down
Expand Up @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
rbac.authorization.kubernetes.io/autoupdate: "true"
name: system:openshift:scc:privileged
Expand Down
Expand Up @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
rbac.authorization.kubernetes.io/autoupdate: "true"
name: system:openshift:scc:restricted
Expand Down
Expand Up @@ -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:
Expand Down
Expand Up @@ -15,6 +15,7 @@ groups:
kind: SecurityContextConstraints
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
kubernetes.io/description: anyuid provides all features of the restricted SCC
Expand Down
Expand Up @@ -14,6 +14,7 @@ groups: []
kind: SecurityContextConstraints
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
kubernetes.io/description: 'hostaccess allows access to all host namespaces but
Expand Down
Expand Up @@ -14,6 +14,7 @@ groups: []
kind: SecurityContextConstraints
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
kubernetes.io/description: |-
Expand Down
Expand Up @@ -14,6 +14,7 @@ groups: []
kind: SecurityContextConstraints
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
kubernetes.io/description: hostnetwork allows using host networking and host ports
Expand Down
Expand Up @@ -14,6 +14,7 @@ groups: []
kind: SecurityContextConstraints
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
kubernetes.io/description: nonroot provides all features of the restricted SCC
Expand Down
Expand Up @@ -20,6 +20,7 @@ groups:
kind: SecurityContextConstraints
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
kubernetes.io/description: 'privileged allows access to all privileged and host
Expand Down
Expand Up @@ -15,6 +15,7 @@ groups:
kind: SecurityContextConstraints
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
kubernetes.io/description: restricted denies access to all host features and requires
Expand Down
Expand Up @@ -3,6 +3,7 @@ kind: KubeAPIServer
metadata:
name: cluster
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
spec:
Expand Down
Expand Up @@ -4,6 +4,7 @@ metadata:
namespace: openshift-kube-apiserver-operator
name: kube-apiserver-operator-config
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
data:
config.yaml: |
Expand Down
Expand Up @@ -3,6 +3,7 @@ kind: ClusterRoleBinding
metadata:
name: system:openshift:operator:kube-apiserver-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
roleRef:
kind: ClusterRole
Expand Down
Expand Up @@ -6,5 +6,6 @@ metadata:
labels:
app: kube-apiserver-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"

4 changes: 4 additions & 0 deletions manifests/0000_20_kube-apiserver-operator_08_flowschema.yaml
Expand Up @@ -3,6 +3,7 @@ kind: PriorityLevelConfiguration
metadata:
name: openshift-aggregated-api-delegated-auth
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
spec:
limited:
Expand All @@ -20,6 +21,7 @@ kind: PriorityLevelConfiguration
metadata:
name: openshift-control-plane-operators
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
spec:
limited:
Expand All @@ -37,6 +39,7 @@ kind: FlowSchema
metadata:
name: openshift-monitoring-metrics
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
spec:
distinguisherMethod:
Expand All @@ -61,6 +64,7 @@ kind: FlowSchema
metadata:
name: openshift-kube-apiserver-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
spec:
distinguisherMethod:
Expand Down
Expand Up @@ -5,6 +5,7 @@ metadata:
name: prometheus-k8s
namespace: openshift-kube-apiserver-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups:
Expand Down
Expand Up @@ -4,6 +4,7 @@ metadata:
name: prometheus-k8s
namespace: openshift-kube-apiserver-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

0 comments on commit ba9e016

Please sign in to comment.