Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:openebs/cstor-operators into dev…
Browse files Browse the repository at this point in the history
…elop
  • Loading branch information
Abhishek Agarwal committed Jul 1, 2022
2 parents 49dca57 + 9cc536c commit 5a15f90
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 28 deletions.
6 changes: 3 additions & 3 deletions deploy/helm/charts/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ description: CStor-Operator helm chart for Kubernetes
type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 3.1.0
version: 3.2.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: 3.1.0
appVersion: 3.2.0
icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/openebs/icon/color/openebs-icon-color.png
home: http://www.openebs.io/
keywords:
Expand All @@ -22,7 +22,7 @@ sources:

dependencies:
- name: openebs-ndm
version: "1.8.0"
version: "1.9.0"
repository: "https://openebs.github.io/node-disk-manager"
condition: openebsNDM.enabled

Expand Down
24 changes: 12 additions & 12 deletions deploy/helm/charts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ By default this chart installs additional, dependent charts:

| Repository | Name | Version |
|------------|------|---------|
| https://openebs.github.io/node-disk-manager | openebs-ndm | 1.8.0 |
| https://openebs.github.io/node-disk-manager | openebs-ndm | 1.9.0 |

To disable the dependency during installation, set `openebsNDM.enabled` to `false`.

Expand Down Expand Up @@ -109,7 +109,7 @@ helm install openebs-cstor openebs-cstor/cstor --namespace openebs --create-name
| admissionServer.image.pullPolicy | string | `"IfNotPresent"` | Admission webhook image pull policy |
| admissionServer.image.registry | string | `nil` | Admission webhook image registry |
| admissionServer.image.repository | string | `"openebs/cstor-webhook"` | Admission webhook image repo |
| admissionServer.image.tag | string | `"3.1.0"` | Admission webhook image tag |
| admissionServer.image.tag | string | `"3.2.0"` | Admission webhook image tag |
| admissionServer.nodeSelector | object | `{}` | Admission webhook pod node selector |
| admissionServer.podAnnotations | object | `{}` | Admission webhook pod annotations |
| admissionServer.resources | object | `{}` | Admission webhook pod resources |
Expand Down Expand Up @@ -175,19 +175,19 @@ helm install openebs-cstor openebs-cstor/cstor --namespace openebs --create-name
| cspcOperator.componentName | string | `"cspc-operator"` | CSPC operator component name |
| cspcOperator.cstorPool.image.registry | string | `nil` | CStor pool image registry |
| cspcOperator.cstorPool.image.repository | string | `"openebs/cstor-pool"` | CStor pool image repository|
| cspcOperator.cstorPool.image.tag | string | `"3.1.0"` | CStor pool image tag |
| cspcOperator.cstorPool.image.tag | string | `"3.2.0"` | CStor pool image tag |
| cspcOperator.cstorPoolExporter.image.registry | string | `nil` | CStor pool exporter image registry |
| cspcOperator.cstorPoolExporter.image.repository | string | `"openebs/m-exporter"` | CStor pool exporter image repository |
| cspcOperator.cstorPoolExporter.image.tag | string | `"3.1.0"` | CStor pool exporter image tag |
| cspcOperator.cstorPoolExporter.image.tag | string | `"3.2.0"` | CStor pool exporter image tag |
| cspcOperator.image.pullPolicy | string | `"IfNotPresent"` | CSPC operator image pull policy |
| cspcOperator.image.registry | string | `nil` | CSPC operator image registry |
| cspcOperator.image.repository | string | `"openebs/cspc-operator"` | CSPC operator image repository |
| cspcOperator.image.tag | string | `"3.1.0"` | CSPC operator image tag |
| cspcOperator.image.tag | string | `"3.2.0"` | CSPC operator image tag |
| cspcOperator.nodeSelector | object | `{}` | CSPC operator pod nodeSelector|
| cspcOperator.podAnnotations | object | `{}` | CSPC operator pod annotations |
| cspcOperator.poolManager.image.registry | string | `nil` | CStor Pool Manager image registry |
| cspcOperator.poolManager.image.repository | string | `"openebs/cstor-pool-manager"` | CStor Pool Manager image repository |
| cspcOperator.poolManager.image.tag | string | `"3.1.0"` | CStor Pool Manager image tag |
| cspcOperator.poolManager.image.tag | string | `"3.2.0"` | CStor Pool Manager image tag |
| cspcOperator.resources | object | `{}` | CSPC operator pod resources |
| cspcOperator.resyncInterval | string | `"30"` | CSPC operator resync interval |
| cspcOperator.securityContext | object | `{}` | CSPC operator security context |
Expand All @@ -197,15 +197,15 @@ helm install openebs-cstor openebs-cstor/cstor --namespace openebs --create-name
| cstorCSIPlugin.image.pullPolicy | string | `"IfNotPresent"` | CStor CSI driver image pull policy |
| cstorCSIPlugin.image.registry | string | `nil` | CStor CSI driver image registry |
| cstorCSIPlugin.image.repository | string | `"openebs/cstor-csi-driver"` | CStor CSI driver image repository |
| cstorCSIPlugin.image.tag | string | `"3.1.0"` | CStor CSI driver image tag |
| cstorCSIPlugin.image.tag | string | `"3.2.0"` | CStor CSI driver image tag |
| cstorCSIPlugin.name | string | `"cstor-csi-plugin"` | CStor CSI driver container name |
| cstorCSIPlugin.remount | string | `"true"` | Enable/disable auto-remount when volume recovers from read-only state |
| cvcOperator.annotations | object | `{}` | CVC operator annotations |
| cvcOperator.componentName | string | `"cvc-operator"` | CVC operator component name |
| cvcOperator.image.pullPolicy | string | `"IfNotPresent"` | CVC operator image pull policy |
| cvcOperator.image.registry | string | `nil` | CVC operator image registry |
| cvcOperator.image.repository | string | `"openebs/cvc-operator"` | CVC operator image repository |
| cvcOperator.image.tag | string | `"3.1.0"` | CVC operator image tag |
| cvcOperator.image.tag | string | `"3.2.0"` | CVC operator image tag |
| cvcOperator.logLevel | string | `"2"` | Log level for CVC operator container (1 = least verbose, 5 = most verbose) |
| cvcOperator.nodeSelector | object | `{}` | CVC operator pod nodeSelector |
| cvcOperator.podAnnotations | object | `{}` | CVC operator pod annotations |
Expand All @@ -214,14 +214,14 @@ helm install openebs-cstor openebs-cstor/cstor --namespace openebs --create-name
| cvcOperator.securityContext | object | `{}` | CVC operator security context |
| cvcOperator.target.image.registry | string | `nil` | Volume Target image registry |
| cvcOperator.target.image.repository | string | `"openebs/cstor-istgt"` | Volume Target image repository |
| cvcOperator.target.image.tag | string | `"3.1.0"` | Volume Target image tag |
| cvcOperator.target.image.tag | string | `"3.2.0"` | Volume Target image tag |
| cvcOperator.tolerations | list | `[]` | CVC operator pod tolerations |
| cvcOperator.volumeExporter.image.registry | string | `nil` | Volume exporter image registry |
| cvcOperator.volumeExporter.image.repository | string | `"openebs/m-exporter"` | Volume exporter image repository |
| cvcOperator.volumeExporter.image.tag | string | `"3.1.0"` | Volume exporter image tag |
| cvcOperator.volumeExporter.image.tag | string | `"3.2.0"` | Volume exporter image tag |
| cvcOperator.volumeMgmt.image.registry | string | `nil` | Volume mgmt image registry |
| cvcOperator.volumeMgmt.image.repository | string | `"openebs/cstor-volume-manager"` | Volume mgmt image repository |
| cvcOperator.volumeMgmt.image.tag | string | `"3.1.0"` | Volume mgmt image tag|
| cvcOperator.volumeMgmt.image.tag | string | `"3.2.0"` | Volume mgmt image tag|
| cvcOperator.baseDir | string | `"/var/openebs"` | CVC operator base directory for openebs on host path |
| imagePullSecrets | string | `nil` | Image registry pull secrets |
| openebsNDM.enabled | bool | `true` | Enable OpenEBS NDM dependency |
Expand All @@ -243,7 +243,7 @@ helm install openebs-cstor openebs-cstor/cstor --namespace openebs --create-name
| openebs-ndm.ndmOperator.image.repository | string | `openebs/node-disk-operator` | Image repository for NDM operator |
| rbac.create | bool | `true` | Enable RBAC |
| rbac.pspEnabled | bool | `false` | Enable PodSecurityPolicy |
| release.version | string | `"3.1.0"` | Openebs CStor release version |
| release.version | string | `"3.2.0"` | Openebs CStor release version |
| serviceAccount.annotations | object | `{}` | Service Account annotations |
| serviceAccount.csiController.create | bool | `true` | Enable CSI Controller ServiceAccount |
| serviceAccount.csiController.name | string | `"openebs-cstor-csi-controller-sa"` | CSI Controller ServiceAccount name |
Expand Down
22 changes: 11 additions & 11 deletions deploy/helm/charts/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Declare variables to be passed into your templates.

release:
version: "3.1.0"
version: "3.2.0"

# If false, openebs NDM sub-chart will not be installed
openebsNDM:
Expand All @@ -24,25 +24,25 @@ cspcOperator:
image:
registry:
repository: openebs/cstor-pool-manager
tag: 3.1.0
tag: 3.2.0
cstorPool:
image:
registry:
repository: openebs/cstor-pool
tag: 3.1.0
tag: 3.2.0
cstorPoolExporter:
image:
registry:
repository: openebs/m-exporter
tag: 3.1.0
tag: 3.2.0
image:
# Make sure that registry name end with a '/'.
# For example : quay.io/ is a correct value here and quay.io is incorrect
registry:
repository: openebs/cspc-operator
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: 3.1.0
tag: 3.2.0
annotations: {}
resyncInterval: "30"
podAnnotations: {}
Expand All @@ -60,25 +60,25 @@ cvcOperator:
image:
registry:
repository: openebs/cstor-istgt
tag: 3.1.0
tag: 3.2.0
volumeMgmt:
image:
registry:
repository: openebs/cstor-volume-manager
tag: 3.1.0
tag: 3.2.0
volumeExporter:
image:
registry:
repository: openebs/m-exporter
tag: 3.1.0
tag: 3.2.0
image:
# Make sure that registry name end with a '/'.
# For example : quay.io/ is a correct value here and quay.io is incorrect
registry:
repository: openebs/cvc-operator
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: 3.1.0
tag: 3.2.0
annotations: {}
resyncInterval: "30"
podAnnotations: {}
Expand Down Expand Up @@ -164,7 +164,7 @@ cstorCSIPlugin:
repository: openebs/cstor-csi-driver
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: 3.1.0
tag: 3.2.0
remount: "true"

csiNode:
Expand Down Expand Up @@ -217,7 +217,7 @@ admissionServer:
repository: openebs/cstor-webhook
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: 3.1.0
tag: 3.2.0
failurePolicy: "Fail"
annotations: {}
podAnnotations: {}
Expand Down
4 changes: 2 additions & 2 deletions e2e-tests/apps/busybox/liveness/busybox_liveness.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# Source: openebs/templates/clusterrole.yaml
apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: app-namespace
Expand All @@ -21,7 +21,7 @@ metadata:
name: app-namespace

---
apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: app-namespace
Expand Down

0 comments on commit 5a15f90

Please sign in to comment.