From 7970f35e3e309459cdf287152f3669b94cf73f5c Mon Sep 17 00:00:00 2001 From: Steven Crespo Date: Tue, 4 Aug 2020 14:53:04 -0700 Subject: [PATCH 1/2] Migrate openebs v1.12.3 --- packages/openebs/openebs.patch | 11 ++ packages/openebs/overlay/app-readme.md | 10 ++ packages/openebs/overlay/questions.yml | 205 +++++++++++++++++++++++++ packages/openebs/package.yaml | 2 + 4 files changed, 228 insertions(+) create mode 100644 packages/openebs/openebs.patch create mode 100644 packages/openebs/overlay/app-readme.md create mode 100644 packages/openebs/overlay/questions.yml create mode 100644 packages/openebs/package.yaml diff --git a/packages/openebs/openebs.patch b/packages/openebs/openebs.patch new file mode 100644 index 000000000..785cc7b30 --- /dev/null +++ b/packages/openebs/openebs.patch @@ -0,0 +1,11 @@ +diff -x '*.tgz' -x '*.lock' -uNr packages/openebs/charts-original/Chart.yaml packages/openebs/charts/Chart.yaml +--- packages/openebs/charts-original/Chart.yaml ++++ packages/openebs/charts/Chart.yaml +@@ -17,3 +17,7 @@ + sources: + - https://github.com/openebs/openebs + version: 1.12.3 ++annotations: ++ catalog.cattle.io/certified: partner ++ catalog.cattle.io/namespace: openebs ++ catalog.cattle.io/release-name: openebs diff --git a/packages/openebs/overlay/app-readme.md b/packages/openebs/overlay/app-readme.md new file mode 100644 index 000000000..e6a3d5f48 --- /dev/null +++ b/packages/openebs/overlay/app-readme.md @@ -0,0 +1,10 @@ +# OpenEBS + +OpenEBS is an open source storage platform that provides persistent container attached, cloud-native block storage for DevOps and for Kubernetes environments. + +OpenEBS allows you to treat your persistent workload containers, such as DBs on containers, just like other containers. OpenEBS itself is deployed as just another container on your host and enables storage services that can be designated on a per pod, application, cluster or container level, including: +- Data persistence across nodes, dramatically reducing time spent rebuilding Cassandra rings for example. +- Synchronization of data across availability zones and cloud providers. +- Use of commodity hardware plus a container engine to deliver so called container attached block storage. +- Integration with Kubernetes, so developer and application intent flows into OpenEBS configurations automatically. +- Management of tiering to and from S3 and other targets. diff --git a/packages/openebs/overlay/questions.yml b/packages/openebs/overlay/questions.yml new file mode 100644 index 000000000..a5982394c --- /dev/null +++ b/packages/openebs/overlay/questions.yml @@ -0,0 +1,205 @@ +categories: +- storage +namespace: openebs +labels: + io.rancher.certified: partner +questions: +- variable: defaultImage + default: "true" + description: "Use default OpenEBS images" + label: Use Default Image + type: boolean + show_subquestion_if: false + group: "Container Images" + subquestions: + - variable: apiserver.image + default: "quay.io/openebs/m-apiserver" + description: "Default API Server image for OpenEBS" + type: string + label: API Server Image + - variable: apiserver.imageTag + default: "1.9.0" + description: "The image tag of API Server image" + type: string + label: Image Tag For OpenEBS API Server Image + - variable: provisioner.image + default: "quay.io/openebs/openebs-k8s-provisioner" + description: "Default K8s Provisioner image for OpenEBS" + type: string + label: Provisioner Image + - variable: provisioner.imageTag + default: "1.9.0" + description: "The image tag of Provisioner image" + type: string + label: Image Tag For Provisioner Image + - variable: snapshotOperator.controller.image + default: "quay.io/openebs/snapshot-controller" + description: "Default Snapshot Controller image for OpenEBS" + type: string + label: Snapshot Controller Image + - variable: snapshotOperator.controller.imageTag + default: "1.9.0" + description: "The image tag of Snapshot Controller image" + type: string + label: Image Tag For OpenEBS Snapshot Controller Image + - variable: snapshotOperator.provisioner.image + default: "quay.io/openebs/snapshot-provisioner" + description: "Default Snapshot Provisioner image for OpenEBS" + type: string + label: Snapshot Provisioner Image + - variable: snapshotOperator.provisioner.imageTag + default: "1.9.0" + description: "The image tag of Snapshot Provisioner image" + type: string + label: Image Tag For OpenEBS Snapshot Provisioner Image + - variable: ndm.image + default: "quay.io/openebs/node-disk-manager-amd64" + description: "Default NDM image" + type: string + label: Node Disk Manager Image + - variable: ndm.imageTag + default: "v0.4.9" + description: "The image tag of NDM image" + type: string + label: Image Tag For Node Disk Manager Image + - variable: ndo.image + default: "quay.io/openebs/node-disk-operator-amd64" + description: "Default NDO image" + type: string + label: Node Disk Operator Image + - variable: ndo.imageTag + default: "v0.4.9" + description: "The image tag of NDO image" + type: string + label: Image Tag For Node Disk Manager Image + - variable: jiva.image + default: "quay.io/openebs/jiva" + description: "Default Jiva Storage Engine image for OpenEBS" + type: string + label: Jiva Storage Engine Image + - variable: jiva.imageTag + default: "1.9.0" + description: "The image tag of Jiva image" + type: string + label: Image Tag For OpenEBS Jiva Storage Engine Image + - variable: cstor.pool.image + default: "quay.io/openebs/cstor-pool" + description: "Default cStor Storage Engine Pool image for OpenEBS" + type: string + label: cStor Storage Engine Pool Image + - variable: cstor.pool.imageTag + default: "1.9.0" + description: "The image tag of cStor Storage Engine Pool image" + type: string + label: Image Tag For OpenEBS cStor Storage Engine Pool Image + - variable: cstor.poolMgmt.image + default: "quay.io/openebs/cstor-pool-mgmt" + description: "Default cStor Storage Engine Pool Management image for OpenEBS" + type: string + label: cStor Storage Engine Pool Management Image + - variable: cstor.poolMgmt.imageTag + default: "1.9.0" + description: "The image tag of cStor Storage Engine Pool Management image" + type: string + label: Image Tag For OpenEBS cStor Storage Engine Pool Management Image + - variable: cstor.target.image + default: "quay.io/openebs/cstor-istgt" + description: "Default cStor Storage Engine Target image for OpenEBS" + type: string + label: cStor Storage Engine Target Image + - variable: cstor.target.imageTag + default: "1.9.0" + description: "The image tag of cStor Storage Engine Target image" + type: string + label: Image Tag For OpenEBS cStor Storage Engine Target Image + - variable: cstor.volumeMgmt.image + default: "quay.io/openebs/cstor-volume-mgmt" + description: "Default cStor Storage Engine Target Management image for OpenEBS" + type: string + label: cStor Storage Engine Target Management Image + - variable: cstor.volumeMgmt.imageTag + default: "1.9.0" + description: "The image tag of cStor Storage Engine Target Management image" + type: string + label: Image Tag For OpenEBS cStor Storage Engine Target Management Image + - variable: policies.monitoring.image + default: "quay.io/openebs/m-exporter" + description: "Default OpeneEBS Volume and pool Exporter image" + type: string + label: Monitoring Exporter Image + show_if: "policies.monitoring.enabled=true&&defaultImage=false" + - variable: policies.monitoring.imageTag + default: "1.9.0" + description: "The image tag of OpenEBS Exporter" + type: string + label: Image Tag For OpenEBS Exporter Image + show_if: "policies.monitoring.enabled=true&&defaultImage=false" +- variable: ndm.filters.excludeVendors + default: 'CLOUDBYT,OpenEBS' + type: string + description: "Configure NDM to filter disks from following vendors" + label: Filter Disks belonging to vendors + group: "NDM Disk Filter by Vendor " +- variable: ndm.filters.excludePaths + default: 'loop,fd0,sr0,/dev/ram,/dev/dm-,/dev/md' + type: string + description: "Configure NDM to filter disks from following paths" + label: Filter Disks belonging to paths + group: "NDM Disk Filter by Path" +- variable: ndm.sparse.enabled + default: "true" + description: "Create a cStor Pool on Sparse Disks" + label: Create cStor Pool on Sprase Disks + type: boolean + show_subquestion_if: true + group: "NDM Sparse Disk Settings" + subquestions: + - variable: ndm.sparse.size + default: "10737418240" + description: "Default Size of Sparse Disk" + type: string + label: Sparse Disk Size in bytes + - variable: ndm.sparse.count + default: "0" + description: "Number of Sparse Disks" + type: string + label: Number of Sparse Disks + - variable: ndm.sparse.path + default: "/var/openebs/sparse" + description: "Directory where Sparse Disks should be created" + type: string + label: Directory for Sparse Disks +- variable: defaultPorts + default: "true" + description: "Use default Communication Ports" + label: Use Default Ports + type: boolean + show_subquestion_if: false + group: "Communication Ports" + subquestions: + - variable: apiserver.ports.externalPort + default: 5656 + description: "Default External Port for OpenEBS API Server" + type: int + min: 0 + max: 9999 + label: OpenEBS API Server External Port + - variable: apiserver.ports.internalPort + default: 5656 + description: "Default Internal Port for OpenEBS API Server" + type: int + min: 0 + max: 9999 + label: OpenEBS API Server Internal Port +- variable: policies.monitoring.enabled + default: true + description: "Enable prometheus monitoring" + type: boolean + label: Enable Prometheus Monitoring + group: "Monitoring Settings" +- variable: analytics.enabled + default: true + description: "Enable sending anonymous statistics to OpenEBS Google Analytics" + type: boolean + label: Enable updating OpenEBS with usage details + group: "Anonymous Analytics" diff --git a/packages/openebs/package.yaml b/packages/openebs/package.yaml new file mode 100644 index 000000000..b99a0151c --- /dev/null +++ b/packages/openebs/package.yaml @@ -0,0 +1,2 @@ +url: https://github.com/openebs/charts/releases/download/openebs-1.12.3/openebs-1.12.3.tgz +packageVersion: 00 From 3624aeccdd26eab6da1f9c89368cd565d3161f9a Mon Sep 17 00:00:00 2001 From: Steven Crespo Date: Tue, 4 Aug 2020 16:03:19 -0700 Subject: [PATCH 2/2] Update questions Updates in questions.yaml to align with new chart values: - Remove partner label - Remove categories - Refactor variable names - Update default image repositories and tags --- packages/openebs/overlay/questions.yml | 63 ++++++++++++-------------- 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/packages/openebs/overlay/questions.yml b/packages/openebs/overlay/questions.yml index a5982394c..c0d4641cb 100644 --- a/packages/openebs/overlay/questions.yml +++ b/packages/openebs/overlay/questions.yml @@ -1,11 +1,6 @@ -categories: -- storage -namespace: openebs -labels: - io.rancher.certified: partner questions: - variable: defaultImage - default: "true" + default: true description: "Use default OpenEBS images" label: Use Default Image type: boolean @@ -13,123 +8,123 @@ questions: group: "Container Images" subquestions: - variable: apiserver.image - default: "quay.io/openebs/m-apiserver" + default: "openebs/m-apiserver" description: "Default API Server image for OpenEBS" type: string label: API Server Image - variable: apiserver.imageTag - default: "1.9.0" + default: "1.12.0" description: "The image tag of API Server image" type: string label: Image Tag For OpenEBS API Server Image - variable: provisioner.image - default: "quay.io/openebs/openebs-k8s-provisioner" + default: "openebs/openebs-k8s-provisioner" description: "Default K8s Provisioner image for OpenEBS" type: string label: Provisioner Image - variable: provisioner.imageTag - default: "1.9.0" + default: "1.12.0" description: "The image tag of Provisioner image" type: string label: Image Tag For Provisioner Image - variable: snapshotOperator.controller.image - default: "quay.io/openebs/snapshot-controller" + default: "openebs/snapshot-controller" description: "Default Snapshot Controller image for OpenEBS" type: string label: Snapshot Controller Image - variable: snapshotOperator.controller.imageTag - default: "1.9.0" + default: "1.12.0" description: "The image tag of Snapshot Controller image" type: string label: Image Tag For OpenEBS Snapshot Controller Image - variable: snapshotOperator.provisioner.image - default: "quay.io/openebs/snapshot-provisioner" + default: "openebs/snapshot-provisioner" description: "Default Snapshot Provisioner image for OpenEBS" type: string label: Snapshot Provisioner Image - variable: snapshotOperator.provisioner.imageTag - default: "1.9.0" + default: "1.12.0" description: "The image tag of Snapshot Provisioner image" type: string label: Image Tag For OpenEBS Snapshot Provisioner Image - variable: ndm.image - default: "quay.io/openebs/node-disk-manager-amd64" + default: "openebs/node-disk-manager" description: "Default NDM image" type: string label: Node Disk Manager Image - variable: ndm.imageTag - default: "v0.4.9" + default: "0.7.0" description: "The image tag of NDM image" type: string label: Image Tag For Node Disk Manager Image - - variable: ndo.image - default: "quay.io/openebs/node-disk-operator-amd64" + - variable: ndmOperator.image + default: "openebs/node-disk-operator" description: "Default NDO image" type: string label: Node Disk Operator Image - - variable: ndo.imageTag - default: "v0.4.9" + - variable: ndmOperator.imageTag + default: "0.7.0" description: "The image tag of NDO image" type: string label: Image Tag For Node Disk Manager Image - variable: jiva.image - default: "quay.io/openebs/jiva" + default: "openebs/jiva" description: "Default Jiva Storage Engine image for OpenEBS" type: string label: Jiva Storage Engine Image - variable: jiva.imageTag - default: "1.9.0" + default: "1.12.0" description: "The image tag of Jiva image" type: string label: Image Tag For OpenEBS Jiva Storage Engine Image - variable: cstor.pool.image - default: "quay.io/openebs/cstor-pool" + default: "openebs/cstor-pool" description: "Default cStor Storage Engine Pool image for OpenEBS" type: string label: cStor Storage Engine Pool Image - variable: cstor.pool.imageTag - default: "1.9.0" + default: "1.12.0" description: "The image tag of cStor Storage Engine Pool image" type: string label: Image Tag For OpenEBS cStor Storage Engine Pool Image - variable: cstor.poolMgmt.image - default: "quay.io/openebs/cstor-pool-mgmt" + default: "openebs/cstor-pool-mgmt" description: "Default cStor Storage Engine Pool Management image for OpenEBS" type: string label: cStor Storage Engine Pool Management Image - variable: cstor.poolMgmt.imageTag - default: "1.9.0" + default: "1.12.0" description: "The image tag of cStor Storage Engine Pool Management image" type: string label: Image Tag For OpenEBS cStor Storage Engine Pool Management Image - variable: cstor.target.image - default: "quay.io/openebs/cstor-istgt" + default: "openebs/cstor-istgt" description: "Default cStor Storage Engine Target image for OpenEBS" type: string label: cStor Storage Engine Target Image - variable: cstor.target.imageTag - default: "1.9.0" + default: "1.12.0" description: "The image tag of cStor Storage Engine Target image" type: string label: Image Tag For OpenEBS cStor Storage Engine Target Image - variable: cstor.volumeMgmt.image - default: "quay.io/openebs/cstor-volume-mgmt" + default: "openebs/cstor-volume-mgmt" description: "Default cStor Storage Engine Target Management image for OpenEBS" type: string label: cStor Storage Engine Target Management Image - variable: cstor.volumeMgmt.imageTag - default: "1.9.0" + default: "1.12.0" description: "The image tag of cStor Storage Engine Target Management image" type: string label: Image Tag For OpenEBS cStor Storage Engine Target Management Image - variable: policies.monitoring.image - default: "quay.io/openebs/m-exporter" + default: "openebs/m-exporter" description: "Default OpeneEBS Volume and pool Exporter image" type: string label: Monitoring Exporter Image show_if: "policies.monitoring.enabled=true&&defaultImage=false" - variable: policies.monitoring.imageTag - default: "1.9.0" + default: "1.12.0" description: "The image tag of OpenEBS Exporter" type: string label: Image Tag For OpenEBS Exporter Image @@ -147,7 +142,7 @@ questions: label: Filter Disks belonging to paths group: "NDM Disk Filter by Path" - variable: ndm.sparse.enabled - default: "true" + default: true description: "Create a cStor Pool on Sparse Disks" label: Create cStor Pool on Sprase Disks type: boolean @@ -170,7 +165,7 @@ questions: type: string label: Directory for Sparse Disks - variable: defaultPorts - default: "true" + default: true description: "Use default Communication Ports" label: Use Default Ports type: boolean