From cfa0ffba4d7fc2baeead926fe3af6bb90d569a91 Mon Sep 17 00:00:00 2001 From: David Vossel Date: Mon, 26 Aug 2019 17:42:36 -0400 Subject: [PATCH] fix olm header formatting Signed-off-by: David Vossel --- cluster/examples/kubernetes/ceph/common.yaml | 40 ++++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/cluster/examples/kubernetes/ceph/common.yaml b/cluster/examples/kubernetes/ceph/common.yaml index 1c9c66895..7d852a31c 100644 --- a/cluster/examples/kubernetes/ceph/common.yaml +++ b/cluster/examples/kubernetes/ceph/common.yaml @@ -15,9 +15,9 @@ apiVersion: v1 kind: Namespace metadata: name: rook-ceph ---- # OLM: BEGIN CEPH CRD # The CRD declarations +--- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -168,8 +168,8 @@ spec: description: Ceph Health JSONPath: .status.ceph.health # OLM: END CEPH CRD ---- # OLM: BEGIN CEPH FS CRD +--- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -236,8 +236,8 @@ spec: type: date JSONPath: .metadata.creationTimestamp # OLM: END CEPH FS CRD ---- # OLM: BEGIN CEPH NFS CRD +--- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -273,8 +273,8 @@ spec: resources: {} # OLM: END CEPH NFS CRD ---- # OLM: BEGIN CEPH OBJECT STORE CRD +--- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -335,8 +335,8 @@ spec: codingChunks: type: integer # OLM: END CEPH OBJECT STORE CRD ---- # OLM: BEGIN CEPH OBJECT STORE USERS CRD +--- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -351,8 +351,8 @@ spec: scope: Namespaced version: v1 # OLM: END CEPH OBJECT STORE USERS CRD ---- # OLM: BEGIN CEPH BLOCK POOL CRD +--- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -367,8 +367,8 @@ spec: scope: Namespaced version: v1 # OLM: END CEPH BLOCK POOL CRD ---- # OLM: BEGIN CEPH VOLUME POOL CRD +--- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -385,8 +385,8 @@ spec: scope: Namespaced version: v1alpha2 # OLM: END CEPH VOLUME POOL CRD ---- # OLM: BEGIN OBJECTBUCKET CRD +--- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -409,8 +409,8 @@ spec: subresources: status: {} # OLM: END OBJECTBUCKET CRD ---- # OLM: BEGIN OBJECTBUCKETCLAIM CRD +--- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -433,8 +433,8 @@ spec: subresources: status: {} # OLM: END OBJECTBUCKETCLAIM CRD ---- # OLM: BEGIN OBJECTBUCKET ROLEBINDING +--- kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: @@ -448,8 +448,8 @@ subjects: name: rook-ceph-system namespace: rook-ceph # OLM: END OBJECTBUCKET ROLEBINDING ---- # OLM: BEGIN OPERATOR ROLE +--- # The cluster role for managing all the cluster-specific resources in a namespace apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole @@ -697,9 +697,9 @@ rules: - "*" resources: - "*" ---- # OLM: END OPERATOR ROLE # OLM: BEGIN SERVICE ACCOUNT SYSTEM +--- # The rook system service account used by the operator, agent, and discovery pods apiVersion: v1 kind: ServiceAccount @@ -709,9 +709,9 @@ metadata: labels: operator: rook storage-backend: ceph ---- # OLM: END SERVICE ACCOUNT SYSTEM # OLM: BEGIN OPERATOR ROLEBINDING +--- # Grant the operator, agent, and discovery agents access to resources in the namespace kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1beta1 @@ -747,7 +747,6 @@ subjects: - kind: ServiceAccount name: rook-ceph-system namespace: rook-ceph ---- # OLM: END OPERATOR ROLEBINDING ################################################################################################################# # Beginning of cluster-specific resources. The example will assume the cluster will be created in the "rook-ceph" @@ -756,6 +755,7 @@ subjects: ################################################################################################################# # Service account for the Ceph OSDs. Must exist and cannot be renamed. # OLM: BEGIN SERVICE ACCOUNT OSD +--- apiVersion: v1 kind: ServiceAccount metadata: @@ -779,8 +779,8 @@ metadata: name: rook-ceph-cmd-reporter namespace: rook-ceph # OLM: END CMD REPORTER SERVICE ACCOUNT ---- # OLM: BEGIN CLUSTER ROLE +--- kind: Role apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: @@ -857,8 +857,8 @@ rules: verbs: - "*" # OLM: END CLUSTER ROLE ---- # OLM: BEGIN CMD REPORTER ROLE +--- kind: Role apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: @@ -878,8 +878,8 @@ rules: - update - delete # OLM: END CMD REPORTER ROLE ---- # OLM: BEGIN CLUSTER ROLEBINDING +--- # Allow the operator to create resources in this cluster's namespace kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1beta1 @@ -954,8 +954,8 @@ subjects: name: rook-ceph-mgr namespace: rook-ceph # OLM: END CLUSTER ROLEBINDING ---- # OLM: BEGIN CMD REPORTER ROLEBINDING +--- kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: @@ -970,13 +970,13 @@ subjects: name: rook-ceph-cmd-reporter namespace: rook-ceph # OLM: END CMD REPORTER ROLEBINDING ---- ################################################################################################################# # Beginning of pod security policy resources. The example will assume the cluster will be created in the # "rook-ceph" namespace. If you want to create the cluster in a different namespace, you will need to modify # the roles and bindings accordingly. ################################################################################################################# # OLM: BEGIN CLUSTER POD SECURITY POLICY +--- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -1044,8 +1044,8 @@ spec: - min: 9283 max: 9283 # OLM: END CLUSTER POD SECURITY POLICY ---- # OLM: BEGIN POD SECURITY POLICY BINDINGS +--- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: