Skip to content

Commit

Permalink
Merge pull request #50 from nbalacha/bundle-2
Browse files Browse the repository at this point in the history
bundle: updates bundle manifests.
  • Loading branch information
nbalacha authored Dec 29, 2021
2 parents 5680a87 + 31478ea commit db83426
Show file tree
Hide file tree
Showing 27 changed files with 712 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: v1
kind: Service
metadata:
creationTimestamp: null
labels:
control-plane: controller-manager
name: controller-manager-metrics-service
spec:
ports:
- name: https
port: 8443
protocol: TCP
targetPort: https
selector:
control-plane: controller-manager
status:
loadBalancer: {}
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
apiVersion: v1
data:
CSI_LIVENESSPROBE_IMAGE: k8s.gcr.io/sig-storage/livenessprobe:v2.5.0
CSI_PROVISIONER_IMAGE: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0
CSI_REGISTRAR_IMAGE: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
CSI_RESIZER_IMAGE: k8s.gcr.io/sig-storage/csi-resizer:v1.3.0
OPERATOR_NAMESPACE: openshift-storage
TOPOLVM_CSI_IMAGE: quay.io/topolvm/topolvm:0.10.3
VGMANAGER_IMAGE: quay.io/ocs-dev/vgmanager:latest
controller_manager_config.yaml: |
apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
kind: ControllerManagerConfig
Expand Down
57 changes: 49 additions & 8 deletions bundle/manifests/lvm-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ metadata:
"deviceClasses": [
{
"name": "vg1"
},
{
"deviceSelector": null
}
]
}
Expand All @@ -31,6 +28,9 @@ spec:
apiservicedefinitions: {}
customresourcedefinitions:
owned:
- kind: LogicalVolume
name: logicalvolumes.topolvm.cybozu.com
version: v1
- description: LVMCluster is the Schema for the lvmclusters API
displayName: LVMCluster
kind: LVMCluster
Expand All @@ -45,6 +45,29 @@ spec:
spec:
clusterPermissions:
- rules:
- apiGroups:
- apps
resources:
- daemonsets
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- apps
resources:
- deployments
verbs:
- create
- delete
- get
- list
- update
- watch
- apiGroups:
- lvm.topolvm.io
resources:
Expand Down Expand Up @@ -81,6 +104,16 @@ spec:
- get
- list
- watch
- apiGroups:
- storage.k8s.io
resources:
- storageclasses
verbs:
- create
- delete
- get
- list
- watch
- apiGroups:
- authentication.k8s.io
resources:
Expand All @@ -93,9 +126,9 @@ spec:
- subjectaccessreviews
verbs:
- create
serviceAccountName: lvm-operator-controller-manager
serviceAccountName: controller-manager
deployments:
- name: lvm-operator-controller-manager
- name: controller-manager
spec:
replicas: 1
selector:
Expand Down Expand Up @@ -126,7 +159,15 @@ spec:
- --leader-elect
command:
- /manager
image: quay.io/nibalach/lvm-operator:t1
env:
- name: WATCH_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
envFrom:
- configMapRef:
name: lvm-operator-manager-config
image: quay.io/ocs-dev/lvm-operator:latest
livenessProbe:
httpGet:
path: /healthz
Expand All @@ -151,7 +192,7 @@ spec:
allowPrivilegeEscalation: false
securityContext:
runAsNonRoot: true
serviceAccountName: lvm-operator-controller-manager
serviceAccountName: controller-manager
terminationGracePeriodSeconds: 10
permissions:
- rules:
Expand Down Expand Up @@ -186,7 +227,7 @@ spec:
verbs:
- create
- patch
serviceAccountName: lvm-operator-controller-manager
serviceAccountName: controller-manager
strategy: deployment
installModes:
- supported: true
Expand Down
49 changes: 48 additions & 1 deletion bundle/manifests/lvm.topolvm.io_lvmclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,12 @@ spec:
for a device to be included in this TopoLVMCluster
type: object
name:
description: Name of the class, the VG and possibly the storageclass.
description: 'Name of the class, the VG and possibly the storageclass.
Validations to confirm that this field can be used as metadata.name
field in storageclass ref: https://github.com/kubernetes/apimachinery/blob/de7147/pkg/util/validation/validation.go#L209'
maxLength: 245
minLength: 1
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
type: string
nodeSelector:
description: NodeSelector chooses nodes
Expand Down Expand Up @@ -131,6 +136,48 @@ spec:
required:
- nodeSelectorTerms
type: object
tolerations:
description: Tolerations to apply to nodes to act on
items:
description: The pod this Toleration is attached to tolerates
any taint that matches the triple <key,value,effect> using
the matching operator <operator>.
properties:
effect:
description: Effect indicates the taint effect to match.
Empty means match all taint effects. When specified,
allowed values are NoSchedule, PreferNoSchedule and
NoExecute.
type: string
key:
description: Key is the taint key that the toleration
applies to. Empty means match all taint keys. If the
key is empty, operator must be Exists; this combination
means to match all values and all keys.
type: string
operator:
description: Operator represents a key's relationship
to the value. Valid operators are Exists and Equal.
Defaults to Equal. Exists is equivalent to wildcard
for value, so that a pod can tolerate all taints of
a particular category.
type: string
tolerationSeconds:
description: TolerationSeconds represents the period of
time the toleration (which must be of effect NoExecute,
otherwise this field is ignored) tolerates the taint.
By default, it is not set, which means tolerate the
taint forever (do not evict). Zero and negative values
will be treated as 0 (evict immediately) by the system.
format: int64
type: integer
value:
description: Value is the taint value the toleration matches
to. If the operator is Exists, the value should be empty,
otherwise just a regular string.
type: string
type: object
type: array
type: object
type: array
type: object
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: metrics-reader
rules:
- nonResourceURLs:
- /metrics
verbs:
- get
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: topolvm-controller
rules:
- apiGroups:
- ""
resources:
- nodes
verbs:
- get
- list
- watch
- patch
- update
- apiGroups:
- ""
resources:
- pods
verbs:
- get
- list
- watch
- delete
- apiGroups:
- ""
resources:
- persistentvolumeclaims
verbs:
- get
- list
- watch
- update
- delete
- apiGroups:
- storage.k8s.io
resources:
- storageclasses
- csidrivers
verbs:
- get
- list
- watch
- apiGroups:
- topolvm.cybozu.com
resources:
- logicalvolumes
- logicalvolumes/status
verbs:
- get
- list
- watch
- create
- update
- patch
- delete
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
creationTimestamp: null
name: topolvm-controller
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: topolvm-controller
subjects:
- kind: ServiceAccount
name: topolvm-controller
namespace: lvm-operator-system
5 changes: 5 additions & 0 deletions bundle/manifests/topolvm-controller_v1_serviceaccount.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: v1
kind: ServiceAccount
metadata:
creationTimestamp: null
name: topolvm-controller
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: topolvm-csi-provisioner
rules:
- apiGroups:
- ""
resources:
- persistentvolumes
verbs:
- get
- list
- watch
- create
- delete
- apiGroups:
- ""
resources:
- persistentvolumeclaims
verbs:
- get
- list
- watch
- update
- apiGroups:
- storage.k8s.io
resources:
- storageclasses
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
- events
verbs:
- list
- watch
- create
- update
- patch
- apiGroups:
- snapshot.storage.k8s.io
resources:
- volumesnapshots
verbs:
- get
- list
- apiGroups:
- snapshot.storage.k8s.io
resources:
- volumesnapshotcontents
verbs:
- get
- list
- apiGroups:
- storage.k8s.io
resources:
- csinodes
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
- nodes
verbs:
- get
- list
- watch
- apiGroups:
- storage.k8s.io
resources:
- volumeattachments
verbs:
- get
- list
- watch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
creationTimestamp: null
name: topolvm-csi-provisioner
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: topolvm-csi-provisioner
subjects:
- kind: ServiceAccount
name: topolvm-controller
namespace: lvm-operator-system
Loading

0 comments on commit db83426

Please sign in to comment.