Merge pull request #59 from ondat/add-ondat-2-9-0

Add Ondat 2-9-0
ondat · Oct 19, 2022 · 934e411 · 934e411
2 parents d718b18 + 5762518
commit 934e411
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 21 deletions.
diff --git a/charts/component-charts/ondat-operator/Chart.yaml b/charts/component-charts/ondat-operator/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "v2.8.3"
+appVersion: "v2.9.0"
 description: Cloud Native storage for containers
 name: ondat-operator
-version: 0.7.1
+version: 0.7.2
 keywords:
 - storage
 - block-storage
@@ -17,5 +17,5 @@ maintainers:
   email: david@ondat.io
 - name:  mhmxs
   email: richard.kovacs@ondat.io
-- name: aeroniero33
-  email: angelos.perivolaropoulos@ondat.io
+- name: scflavell
+  email: simon.flavell@ondat.io
diff --git a/charts/component-charts/ondat-operator/crds/storageoscluster_crd.yaml b/charts/component-charts/ondat-operator/crds/storageoscluster_crd.yaml
@@ -174,12 +174,12 @@ spec:
                     type: string
                   nodeContainer:
                     type: string
+                  nodeGuardContainer:
+                    type: string
                   nodeManagerContainer:
                     type: string
                   portalManagerContainer:
                     type: string
-                  upgradeGuardContainer:
-                    type: string
                 type: object
               ingress:
                 description: 'Ingress defines the ingress configurations used in the
@@ -357,7 +357,7 @@ spec:
                       pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                       x-kubernetes-int-or-string: true
                     description: 'Limits describes the maximum amount of compute resources
-                      allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
+                      allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                     type: object
                   requests:
                     additionalProperties:
@@ -369,7 +369,7 @@ spec:
                     description: 'Requests describes the minimum amount of compute
                       resources required. If Requests is omitted for a container,
                       it defaults to Limits if that is explicitly specified, otherwise
-                      to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
+                      to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                     type: object
                 type: object
               secretRefName:

diff --git a/charts/component-charts/ondat-operator/templates/config-maps.yaml b/charts/component-charts/ondat-operator/templates/config-maps.yaml
@@ -69,8 +69,8 @@ data:
   {{- if and .Values.images.node.image .Values.images.node.tag }}
   RELATED_IMAGE_STORAGEOS_NODE: "{{ .Values.images.node.registry}}/{{ .Values.images.node.image }}:{{ .Values.images.node.tag }}"
   {{- end }}
-  {{- if and .Values.images.upgradeGuard.image .Values.images.upgradeGuard.tag }}
-  RELATED_IMAGE_UPGRADE_GUARD: "{{ .Values.images.upgradeGuard.registry}}/{{ .Values.images.upgradeGuard.image }}:{{ .Values.images.upgradeGuard.tag }}"
+  {{- if and .Values.images.nodeGuard.image .Values.images.nodeGuard.tag }}
+  RELATED_IMAGE_NODE_GUARD: "{{ .Values.images.nodeGuard.registry}}/{{ .Values.images.nodeGuard.image }}:{{ .Values.images.nodeGuard.tag }}"
   {{- end }}
 kind: ConfigMap
 metadata:

diff --git a/charts/component-charts/ondat-operator/templates/operator.yaml b/charts/component-charts/ondat-operator/templates/operator.yaml
@@ -58,10 +58,9 @@ spec:
         resources:
           limits:
             cpu: 250m
-            memory: 512Mi
           requests:
             cpu: 10m
-            memory: 100Mi
+            memory: 600Mi
         securityContext:
           allowPrivilegeEscalation: false
         volumeMounts:

diff --git a/charts/component-charts/ondat-operator/templates/rbac.yaml b/charts/component-charts/ondat-operator/templates/rbac.yaml
@@ -437,6 +437,32 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - api.storageos.com
+  resources:
+  - pools
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - api.storageos.com
+  resources:
+  - pools/finalizers
+  verbs:
+  - update
+- apiGroups:
+  - api.storageos.com
+  resources:
+  - pools/status
+  verbs:
+  - get
+  - patch
+  - update
 - apiGroups:
   - api.storageos.com
   resources:
@@ -479,6 +505,8 @@ rules:
   resources:
   - storageclasses
   verbs:
+  - create
+  - delete
   - get
   - list
   - watch

diff --git a/charts/component-charts/ondat-operator/templates/storageoscluster_cr.yaml b/charts/component-charts/ondat-operator/templates/storageoscluster_cr.yaml
@@ -49,9 +49,9 @@ spec:
     volumeSnapshotClassName: {{ .Values.cluster.snapshots.volumeSnapshotClassName }}
   {{- end }}
 
-  {{- if .Values.cluster.nodeManagerFeatures.upgradeGuard.enabled }}
+  {{- if .Values.cluster.nodeManagerFeatures.nodeGuard.enabled }}
   nodeManagerFeatures:
-    upgradeGuard: "true"
+    nodeGuard: "true"
   {{- end }}
 
   {{- if .Values.cluster.toleration.key }}

diff --git a/charts/component-charts/ondat-operator/values.yaml b/charts/component-charts/ondat-operator/values.yaml
@@ -11,11 +11,11 @@ images:
   operator:
     registry: docker.io/storageos
     image: operator
-    tag: v2.8.3
+    tag: v2.9.0
   apiManager:
     registry: docker.io/storageos
     image: api-manager
-    tag: v1.2.11
+    tag: v1.2.14
   csiV1ExternalAttacherV3:
     registry: quay.io/k8scsi
     image: csi-attacher
@@ -64,7 +64,7 @@ images:
   node:
     registry: docker.io/storageos
     image: node
-    tag: v2.8.3
+    tag: v2.9.0
   metricsExporter:
     registry: docker.io/storageos
     image: metrics-exporter
@@ -77,10 +77,10 @@ images:
     registry: docker.io/storageos
     image: portal-manager
     tag: v1.0.6
-  upgradeGuard:
+  nodeGuard:
     registry: docker.io/storageos
-    image: upgrade-guard
-    tag: v0.0.4
+    image: node-guard
+    tag: v0.0.2
 
 # parameters for StorageOS resource quotas
 # Required for GKE installation!
@@ -105,7 +105,7 @@ cluster:
 
   # Enable protection for volumes during orchestrator upgrades - Tech Preview
   nodeManagerFeatures:
-    upgradeGuard:
+    nodeGuard:
       enabled: false
 
   # Enable Prometheus metrics exporting