Update storageos-operator to version 0.2.19

proposed/storageos-operator/v0.2.19/Chart.yaml

 apiVersion: v1
-appVersion: "1.5.2"
+appVersion: "1.5.3"
 description: Cloud Native storage for containers
 name: storageos-operator
-version: 0.2.17
+version: 0.2.19
 tillerVersion: ">=2.10.0"
 keywords:
 - storage

proposed/storageos-operator/v0.2.19/LICENSE

 MIT License
 
-Copyright (c) 2019 StorageOS
+Copyright (c) 2020 StorageOS
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

proposed/storageos-operator/v0.2.19/README.md

@@ -150,7 +150,7 @@ Operator chart and their default values.
 Parameter | Description | Default
 --------- | ----------- | -------
 `operator.image.repository` | StorageOS Operator container image repository | `storageos/cluster-operator`
-`operator.image.tag` | StorageOS Operator container image tag | `1.5.2`
+`operator.image.tag` | StorageOS Operator container image tag | `1.5.3`
 `operator.image.pullPolicy` | StorageOS Operator container image pull policy | `IfNotPresent`
 `podSecurityPolicy.enabled` | If true, create & use PodSecurityPolicy resources | `false`
 `podSecurityPolicy.annotations` | Specify pod annotations in the pod security policy | `{}`
@@ -171,8 +171,32 @@ Parameter | Description | Default
 `cluster.toleration.key` | Key of the pod toleration parameter |
 `cluster.toleration.value` | Value of the pod toleration parameter |
 `cluster.disableTelemetry` | If true, no telemetry data will be collected from the cluster | `false`
-`cluster.images.node.repository` | StorageOS Node container image repository | `storageos/node`
-`cluster.images.node.tag` | StorageOS Node container image tag | `1.5.2`
+`cluster.images.node.repository` | StorageOS Node container image repository |
+`cluster.images.node.tag` | StorageOS Node container image tag |
+`cluster.images.init.repository` | StorageOS init container image repository |
+`cluster.images.init.tag` | StorageOS init container image tag |
+`cluster.images.csiV1ClusterDriverRegistrar.repository` | CSI v1 Cluster Driver Registrar image repository |
+`cluster.images.csiV1ClusterDriverRegistrar.tag` | CSI v1 Cluster Driver Registrar image tag |
+`cluster.images.csiV1NodeDriverRegistrar.repository` | CSI v1 Node Driver Registrar image repository |
+`cluster.images.csiV1NodeDriverRegistrar.tag` | CSI v1 Node Driver Registrar image tag |
+`cluster.images.csiV1ExternalProvisioner.repository` | CSI v1 External Provisioner image repository |
+`cluster.images.csiV1ExternalProvisioner.tag` | CSI v1 External Provisioner image tag |
+`cluster.images.csiV1ExternalAttacher.repository` | CSI v1 External Attacher image repository |
+`cluster.images.csiV1ExternalAttacher.tag` | CSI v1 External Attacher image tag |
+`cluster.images.csiV1ExternalAttacherV2.repository` | CSI v1 External Attacher v2 image repository |
+`cluster.images.csiV1ExternalAttacherV2.tag` | CSI v1 External Attacher v2 image tag |
+`cluster.images.csiV1LivenessProbe.repository` | CSI v1 Liveness Probe image repository |
+`cluster.images.csiV1LivenessProbe.tag` | CSI v1 Liveness Probe image tag |
+`cluster.images.csiV0DriverRegistrar.repository` | CSI v0 Driver Registrar image repository |
+`cluster.images.csiV0DriverRegistrar.tag` | CSI v0 Driver Registrar image tag |
+`cluster.images.csiV0ExternalProvisioner.repository` | CSI v0 External Provisioner image repository |
+`cluster.images.csiV0ExternalProvisioner.tag` | CSI v0 External Provisioner image tag |
+`cluster.images.csiV0ExternalAttacher.repository` | CSI v0 External Attacher image repository |
+`cluster.images.csiV0ExternalAttacher.tag` | CSI v0 External Attacher image tag |
+`cluster.images.nfs.repository` | NFS container image repository |
+`cluster.images.nfs.tag` | NFS container image tag |
+`cluster.images.kubeScheduler.repository` | Kube Scheduler container image repository |
+`cluster.images.kubeScheduler.tag` | Kube Scheduler container image tag |
 `cluster.csi.enable` | If true, CSI driver is enabled | `true`
 `cluster.csi.deploymentStrategy` | Whether CSI helpers should be deployed as a `deployment` or `statefulset` | `deployment`
 

proposed/storageos-operator/v0.2.19/questions.yml

@@ -32,7 +32,7 @@ questions:
     type: string
     label: StorageOS Operator Image Name
   - variable: operator.image.tag
-    default: "1.5.2"
+    default: "1.5.3"
     description: "StorageOS Operator image tag"
     type: string
     label: StorageOS Operator Image Tag
@@ -73,7 +73,7 @@ questions:
     type: string
     label: StorageOS Node Container Image Name
   - variable: cluster.images.node.tag
-    default: "1.5.2"
+    default: "1.5.3"
     description: "StorageOS Node container image tag"
     type: string
     label: StorageOS Node Container Image Tag

proposed/storageos-operator/v0.2.19/templates/cleanup.yaml

@@ -44,6 +44,8 @@ rules:
   - apps
   resources:
   - statefulsets
+  - deployments
+  - daemonsets
   verbs:
   - delete
 - apiGroups:
@@ -76,6 +78,14 @@ rules:
   - configmaps
   verbs:
   - delete
+- apiGroups:
+  - storageos.com
+  resources:
+  - storageosclusters
+  verbs:
+  - get
+  - patch
+  - delete
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -97,10 +107,42 @@ roleRef:
 
 ---
 
+# Delete the StorageOSCluster object by removing the finalizer.
+
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: "storageos-storageoscluster-cleanup"
+  namespace: {{ .namespace }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-delete-policy": "hook-succeeded, before-hook-creation"
+    "helm.sh/hook-weight": "3"
+spec:
+  template:
+    spec:
+      serviceAccountName: storageos-cleanup
+      containers:
+      - name: "storageos-storageoscluster-cleanup"
+        image: "{{ $.Values.cleanup.images.kubectl.repository }}:{{ $.Values.cleanup.images.kubectl.tag }}"
+        command:
+          - kubectl
+          - -n
+          - {{ $.Release.namespace }}
+          - patch
+          - stos
+          - {{ $.Values.cluster.name }}
+          - --type=merge
+          - --patch={"metadata":{"finalizers":null}}
+      restartPolicy: Never
+  backoffLimit: 4
+
+---
+
 # Iterate through the Values.cleanup list and create jobs to delete all the
 # unmanaged resources of the cluster.
 
-{{- range .Values.cleanup }}
+{{- range .Values.cleanup.resources }}
 
 apiVersion: batch/v1
 kind: Job
@@ -117,7 +159,7 @@ spec:
       serviceAccountName: storageos-cleanup
       containers:
       - name: "storageos-{{ .name }}-cleanup"
-        image: bitnami/kubectl:1.14.1
+        image: "{{ $.Values.cleanup.images.kubectl.repository }}:{{ $.Values.cleanup.images.kubectl.tag }}"
         command:
           - kubectl
           - -n

proposed/storageos-operator/v0.2.19/templates/operator.yaml

@@ -35,6 +35,58 @@ spec:
           command:
           - cluster-operator
           env:
+            {{- if and .Values.cluster.images.node.repository .Values.cluster.images.node.tag }}
+            - name: RELATED_IMAGE_STORAGEOS_NODE
+              value: "{{ .Values.cluster.images.node.repository }}:{{ .Values.cluster.images.node.tag }}"
+            {{- end }}
+            {{- if and .Values.cluster.images.init.repository .Values.cluster.images.init.tag }}
+            - name: RELATED_IMAGE_STORAGEOS_INIT
+              value: "{{ .Values.cluster.images.init.repository }}:{{ .Values.cluster.images.init.tag }}"
+            {{- end }}
+            {{- if and .Values.cluster.images.csiV1ClusterDriverRegistrar.repository .Values.cluster.images.csiV1ClusterDriverRegistrar.tag }}
+            - name: RELATED_IMAGE_CSIV1_CLUSTER_DRIVER_REGISTRAR
+              value: "{{ .Values.cluster.images.csiV1ClusterDriverRegistrar.repository }}:{{ .Values.cluster.images.csiV1ClusterDriverRegistrar.tag }}"
+            {{- end }}
+            {{- if and .Values.cluster.images.csiV1NodeDriverRegistrar.repository .Values.cluster.images.csiV1NodeDriverRegistrar.tag }}
+            - name: RELATED_IMAGE_CSIV1_NODE_DRIVER_REGISTRAR
+              value: "{{ .Values.cluster.images.csiV1NodeDriverRegistrar.repository }}:{{ .Values.cluster.images.csiV1NodeDriverRegistrar.tag }}"
+            {{- end }}
+            {{- if and .Values.cluster.images.csiV1ExternalProvisioner.repository .Values.cluster.images.csiV1ExternalProvisioner.tag }}
+            - name: RELATED_IMAGE_CSIV1_EXTERNAL_PROVISIONER
+              value: "{{ .Values.cluster.images.csiV1ExternalProvisioner.repository }}:{{ .Values.cluster.images.csiV1ExternalProvisioner.tag }}"
+            {{- end }}
+            {{- if and .Values.cluster.images.csiV1ExternalAttacher.repository .Values.cluster.images.csiV1ExternalAttacher.tag }}
+            - name: RELATED_IMAGE_CSIV1_EXTERNAL_ATTACHER
+              value: "{{ .Values.cluster.images.csiV1ExternalAttacher.repository }}:{{ .Values.cluster.images.csiV1ExternalAttacher.tag }}"
+            {{- end }}
+            {{- if and .Values.cluster.images.csiV1ExternalAttacherV2.repository .Values.cluster.images.csiV1ExternalAttacherV2.tag }}
+            - name: RELATED_IMAGE_CSIV1_EXTERNAL_ATTACHER_V2
+              value: "{{ .Values.cluster.images.csiV1ExternalAttacherV2.repository }}:{{ .Values.cluster.images.csiV1ExternalAttacherV2.tag }}"
+            {{- end }}
+            {{- if and .Values.cluster.images.csiV1LivenessProbe.repository .Values.cluster.images.csiV1LivenessProbe.tag }}
+            - name: RELATED_IMAGE_CSIV1_LIVENESS_PROBE
+              value: "{{ .Values.cluster.images.csiV1LivenessProbe.repository }}:{{ .Values.cluster.images.csiV1LivenessProbe.tag }}"
+            {{- end }}
+            {{- if and .Values.cluster.images.csiV0DriverRegistrar.repository .Values.cluster.images.csiV0DriverRegistrar.tag }}
+            - name: RELATED_IMAGE_CSIV0_DRIVER_REGISTRAR
+              value: "{{ .Values.cluster.images.csiV0DriverRegistrar.repository }}:{{ .Values.cluster.images.csiV0DriverRegistrar.tag }}"
+            {{- end }}
+            {{- if and .Values.cluster.images.csiV0ExternalProvisioner.repository .Values.cluster.images.csiV0ExternalProvisioner.tag }}
+            - name: RELATED_IMAGE_CSIV0_EXTERNAL_PROVISIONER
+              value: "{{ .Values.cluster.images.csiV0ExternalProvisioner.repository }}:{{ .Values.cluster.images.csiV0ExternalProvisioner.tag }}"
+            {{- end }}
+            {{- if and .Values.cluster.images.csiV0ExternalAttacher.repository .Values.cluster.images.csiV0ExternalAttacher.tag }}
+            - name: RELATED_IMAGE_CSIV0_EXTERNAL_ATTACHER
+              value: "{{ .Values.cluster.images.csiV0ExternalAttacher.repository }}:{{ .Values.cluster.images.csiV0ExternalAttacher.tag }}"
+            {{- end }}
+            {{- if and .Values.cluster.images.nfs.repository .Values.cluster.images.nfs.tag }}
+            - name: RELATED_IMAGE_NFS
+              value: "{{ .Values.cluster.images.nfs.repository }}:{{ .Values.cluster.images.nfs.tag }}"
+            {{- end }}
+            {{- if and .Values.cluster.images.kubeScheduler.repository .Values.cluster.images.kubeScheduler.tag }}
+            - name: RELATED_IMAGE_KUBE_SCHEDULER
+              value: "{{ .Values.cluster.images.kubeScheduler.repository }}:{{ .Values.cluster.images.kubeScheduler.tag }}"
+            {{- end }}
             - name: WATCH_NAMESPACE
               valueFrom:
                 fieldRef:

proposed/storageos-operator/v0.2.19/templates/storageoscluster_cr.yaml

@@ -15,11 +15,6 @@ spec:
   k8sDistro: {{ .Values.k8sDistro }}
   {{- end }}
 
-  {{- if .Values.cluster.images.node.repository }}
-  images:
-    nodeContainer: "{{ .Values.cluster.images.node.repository }}:{{ .Values.cluster.images.node.tag }}"
-  {{- end }}
-
   csi:
     enable: {{ .Values.cluster.csi.enable }}
     deploymentStrategy: {{ .Values.cluster.csi.deploymentStrategy }}

proposed/storageos-operator/v0.2.19/templates/storageoscluster_crd.yaml

@@ -139,6 +139,8 @@ spec:
                   type: string
                 initContainer:
                   type: string
+                kubeSchedulerContainer:
+                  type: string
                 nfsContainer:
                   type: string
                 nodeContainer:

proposed/storageos-operator/v0.2.19/values.yaml

@@ -27,7 +27,7 @@ operator:
 
   image:
     repository: storageos/cluster-operator
-    tag: 1.5.2
+    tag: 1.5.3
     pullPolicy: IfNotPresent
 
 # cluster-specific configuation parameters.
@@ -87,8 +87,44 @@ cluster:
     # nodeContainer is the StorageOS node image to use, available from the
     # [Docker Hub](https://hub.docker.com/r/storageos/node/).
     node:
-      repository: storageos/node
-      tag: 1.5.2
+      repository:
+      tag:
+    init:
+      repository:
+      tag:
+    csiV1ClusterDriverRegistrar:
+      repository:
+      tag:
+    csiV1NodeDriverRegistrar:
+      repository:
+      tag:
+    csiV1ExternalProvisioner:
+      repository:
+      tag:
+    csiV1ExternalAttacher:
+      repository:
+      tag:
+    csiV1ExternalAttacherV2:
+      repository:
+      tag:
+    csiV1LivenessProbe:
+      repository:
+      tag:
+    csiV0DriverRegistrar:
+      repository:
+      tag:
+    csiV0ExternalProvisioner:
+      repository:
+      tag:
+    csiV0ExternalAttacher:
+      repository:
+      tag:
+    nfs:
+      repository:
+      tag:
+    kubeScheduler:
+      repository:
+      tag:
 
   csi:
     enable: true
@@ -97,6 +133,11 @@ cluster:
 # The following is used for cleaning up unmanaged cluster resources when
 # auto-install is enabled.
 cleanup:
+  images:
+    kubectl:
+      repository: bitnami/kubectl
+      tag: 1.14.1
+  resources:
     - name: daemonset
       command:
         - "daemonset"