Allow user to specify the storage class for the Redis PVC

* Add field to custom resource definition * Add display information to csv * Update pvc template fixes #8877 https://pulp.plan.io/issues/8877
pulp · Jun 10, 2021 · ee975d0 · ee975d0
1 parent e31304c
commit ee975d0
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 0 deletions.
diff --git a/CHANGES/8877.feature b/CHANGES/8877.feature
@@ -0,0 +1 @@
+Allow user to specify the storage class for the Redis PVC
diff --git a/deploy/crds/pulpproject_v1beta1_pulp_crd.yaml b/deploy/crds/pulpproject_v1beta1_pulp_crd.yaml
@@ -43,6 +43,12 @@ spec:
                 description: The image name (repo name) for the pulp webserver image.
                 type: string
                 default: pulp-web
+              redis_image:
+                description: The image name for the redis image.
+                type: string
+              redis_storage_class:
+                description: Storage class to use for the Redis PVC
+                type: string
               tag:
                 description: The image tag for the pulp image.
                 type: string

diff --git a/deploy/olm-catalog/pulp-operator/manifests/pulp-operator.clusterserviceversion.yaml b/deploy/olm-catalog/pulp-operator/manifests/pulp-operator.clusterserviceversion.yaml
@@ -239,6 +239,11 @@ spec:
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:advanced
         - urn:alm:descriptor:com.tectonic.ui:hidden
+      - displayName: Reids storage class
+        path: redis_storage_class
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:advanced
+        - urn:alm:descriptor:com.tectonic.ui:hidden
       - displayName: API server configuration
         path: api
         x-descriptors:

diff --git a/deploy/olm-catalog/pulp-operator/manifests/pulp.pulpproject.org_pulps_crd.yml b/deploy/olm-catalog/pulp-operator/manifests/pulp.pulpproject.org_pulps_crd.yml
@@ -49,6 +49,9 @@ spec:
               redis_image:
                 description: The image name for the redis image.
                 type: string
+              redis_storage_class:
+                description: Storage class to use for the Redis PVC
+                type: string
               tag:
                 description: The image tag for the pulp image.
                 type: string

diff --git a/roles/redis/templates/redis.pvc.yaml.j2 b/roles/redis/templates/redis.pvc.yaml.j2
@@ -16,3 +16,6 @@ spec:
       storage: 1Gi
   accessModes:
     - ReadWriteOnce
+{% if redis_storage_class is defined %}
+  storageClassName: '{{ redis_storage_class }}'
+{% endif %}