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.

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

fix: updates bundle manifests #165

Merged
merged 1 commit into from
Apr 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
creationTimestamp: null
name: lvm-metrics
rules:
- apiGroups:
- ""
resources:
- services
- endpoints
- pods
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: RoleBinding
metadata:
creationTimestamp: null
name: lvm-metrics
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: lvm-metrics
subjects:
- kind: ServiceAccount
name: prometheus-k8s
namespace: openshift-monitoring
17 changes: 17 additions & 0 deletions bundle/manifests/lvm-node-metrics_v1_service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: v1
kind: Service
metadata:
creationTimestamp: null
labels:
app.kubernetes.io/compose: metrics
name: lvm-node-metrics
spec:
ports:
- name: lvm-metrics
port: 23532
protocol: TCP
targetPort: 23532
selector:
exporter: lvm-operator
status:
loadBalancer: {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
control-plane: controller-manager
name: lvm-operator-controller-manager-metrics-monitor
spec:
endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
path: /metrics
port: topolvm-metrics
scheme: http
tlsConfig:
insecureSkipVerify: true
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
path: /metrics
port: lvm-metrics
scheme: http
tlsConfig:
insecureSkipVerify: true
selector:
matchLabels:
app.kubernetes.io/compose: metrics
126 changes: 114 additions & 12 deletions bundle/manifests/lvm-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,35 @@ metadata:
"name": "lvmcluster-sample"
},
"spec": {
"deviceClasses": [
{
"name": "vg1"
}
]
"storage": {
"deviceClasses": [
{
"name": "vg1",
"thinPoolConfig": {
"name": "thin-pool-1",
"overprovisionRatio": 50,
"sizePercent": 50
}
}
]
}
}
},
{
"apiVersion": "lvm.topolvm.io/v1alpha1",
"kind": "LVMVolumeGroup",
"metadata": {
"name": "lvmvolumegroup-sample"
},
"spec": null
},
{
"apiVersion": "lvm.topolvm.io/v1alpha1",
"kind": "LVMVolumeGroupNodeStatus",
"metadata": {
"name": "lvmvolumegroupnodestatus-sample"
},
"spec": null
}
]
capabilities: Basic Install
Expand All @@ -36,11 +59,17 @@ spec:
kind: LVMCluster
name: lvmclusters.lvm.topolvm.io
version: v1alpha1
- kind: LVMVolumeGroupNodeStatus
name: lvmvolumegroupnodestatuses.lvm.topolvm.io
version: v1alpha1
- kind: LVMVolumeGroup
name: lvmvolumegroups.lvm.topolvm.io
version: v1alpha1
description: The ODF LVM Operator manages local storage using LVM.
displayName: ODF LVM Operator
icon:
- base64data: ""
mediatype: ""
- base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxOTIgMTQ1Ij48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2UwMDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlJlZEhhdC1Mb2dvLUhhdC1Db2xvcjwvdGl0bGU+PHBhdGggZD0iTTE1Ny43Nyw2Mi42MWExNCwxNCwwLDAsMSwuMzEsMy40MmMwLDE0Ljg4LTE4LjEsMTcuNDYtMzAuNjEsMTcuNDZDNzguODMsODMuNDksNDIuNTMsNTMuMjYsNDIuNTMsNDRhNi40Myw2LjQzLDAsMCwxLC4yMi0xLjk0bC0zLjY2LDkuMDZhMTguNDUsMTguNDUsMCwwLDAtMS41MSw3LjMzYzAsMTguMTEsNDEsNDUuNDgsODcuNzQsNDUuNDgsMjAuNjksMCwzNi40My03Ljc2LDM2LjQzLTIxLjc3LDAtMS4wOCwwLTEuOTQtMS43My0xMC4xM1oiLz48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0xMjcuNDcsODMuNDljMTIuNTEsMCwzMC42MS0yLjU4LDMwLjYxLTE3LjQ2YTE0LDE0LDAsMCwwLS4zMS0zLjQybC03LjQ1LTMyLjM2Yy0xLjcyLTcuMTItMy4yMy0xMC4zNS0xNS43My0xNi42QzEyNC44OSw4LjY5LDEwMy43Ni41LDk3LjUxLjUsOTEuNjkuNSw5MCw4LDgzLjA2LDhjLTYuNjgsMC0xMS42NC01LjYtMTcuODktNS42LTYsMC05LjkxLDQuMDktMTIuOTMsMTIuNSwwLDAtOC40MSwyMy43Mi05LjQ5LDI3LjE2QTYuNDMsNi40MywwLDAsMCw0Mi41Myw0NGMwLDkuMjIsMzYuMywzOS40NSw4NC45NCwzOS40NU0xNjAsNzIuMDdjMS43Myw4LjE5LDEuNzMsOS4wNSwxLjczLDEwLjEzLDAsMTQtMTUuNzQsMjEuNzctMzYuNDMsMjEuNzdDNzguNTQsMTA0LDM3LjU4LDc2LjYsMzcuNTgsNTguNDlhMTguNDUsMTguNDUsMCwwLDEsMS41MS03LjMzQzIyLjI3LDUyLC41LDU1LC41LDc0LjIyYzAsMzEuNDgsNzQuNTksNzAuMjgsMTMzLjY1LDcwLjI4LDQ1LjI4LDAsNTYuNy0yMC40OCw1Ni43LTM2LjY1LDAtMTIuNzItMTEtMjcuMTYtMzAuODMtMzUuNzgiLz48L3N2Zz4=
mediatype: image/svg+xml
install:
spec:
clusterPermissions:
Expand Down Expand Up @@ -102,6 +131,58 @@ spec:
- get
- patch
- update
- apiGroups:
- lvm.topolvm.io
resources:
- lvmvolumegroupnodestatuses
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- lvm.topolvm.io
resources:
- lvmvolumegroupnodestatuses/finalizers
verbs:
- update
- apiGroups:
- lvm.topolvm.io
resources:
- lvmvolumegroupnodestatuses/status
verbs:
- get
- patch
- update
- apiGroups:
- lvm.topolvm.io
resources:
- lvmvolumegroups
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- lvm.topolvm.io
resources:
- lvmvolumegroups/finalizers
verbs:
- update
- apiGroups:
- lvm.topolvm.io
resources:
- lvmvolumegroups/status
verbs:
- get
- patch
- update
- apiGroups:
- security.openshift.io
resources:
Expand Down Expand Up @@ -131,6 +212,14 @@ spec:
- get
- list
- watch
- apiGroups:
- topolvm.cybozu.com
resources:
- logicalvolumes
verbs:
- get
- list
- watch
- apiGroups:
- authentication.k8s.io
resources:
Expand All @@ -145,7 +234,7 @@ spec:
- create
serviceAccountName: controller-manager
deployments:
- name: controller-manager
- name: lvm-operator-controller-manager
spec:
replicas: 1
selector:
Expand All @@ -156,6 +245,7 @@ spec:
metadata:
labels:
control-plane: controller-manager
exporter: lvm-operator
spec:
containers:
- args:
Expand All @@ -177,6 +267,16 @@ spec:
command:
- /manager
env:
- name: TOPOLVM_CSI_IMAGE
value: quay.io/topolvm/topolvm:0.11.0
- name: CSI_LIVENESSPROBE_IMAGE
value: k8s.gcr.io/sig-storage/livenessprobe:v2.5.0
- name: CSI_PROVISIONER_IMAGE
value: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0
- name: CSI_REGISTRAR_IMAGE
value: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
- name: CSI_RESIZER_IMAGE
value: k8s.gcr.io/sig-storage/csi-resizer:v1.3.0
- name: POD_NAMESPACE
valueFrom:
fieldRef:
Expand All @@ -185,10 +285,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.name
envFrom:
- configMapRef:
name: lvm-operator-manager-config
image: quay.io/ocs-dev/lvm-operator:latest
image: quay.io/nibalach/lvm-operator:e2e
livenessProbe:
httpGet:
path: /healthz
Expand All @@ -211,6 +308,11 @@ spec:
memory: 20Mi
securityContext:
allowPrivilegeEscalation: false
- command:
- /metricsexporter
image: quay.io/nibalach/lvm-operator:e2e
name: metricsexporter
resources: {}
securityContext:
runAsNonRoot: true
serviceAccountName: controller-manager
Expand Down
Loading