Adds support for building and testing mysql helm charts in Shared Clu…

…ster This can be merged as soon as sclorg/container-ci-suite#86 is merged. Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
sclorg · Oct 18, 2024 · 2e31034 · 2e31034
1 parent cccfea6
commit 2e31034
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 4 deletions.
diff --git a/charts/redhat/mysql-persistent/src/templates/persistentvolumeclaim.yaml b/charts/redhat/mysql-persistent/src/templates/persistentvolumeclaim.yaml
@@ -1,12 +1,23 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
+  {{ if .Values.pvc.netapp_nfs }}
+  annotations:
+    trident.netapp.io/reclaimPolicy: Delete
+  {{ end }}
   labels:
     template: mysql-persistent-template
+    {{ if .Values.pvc.netapp_nfs }}
+    paas.redhat.com/appcode: {{ .Values.pvc.app_code }}
+    {{ end }}
   name: {{ .Values.database_service_name }}
 spec:
   accessModes:
   - ReadWriteOnce
   resources:
     requests:
-      storage: {{ .Values.volume_capacity }}
+      storage: {{ .Values.pvc.volume_capacity }}
+  {{ if .Values.pvc.netapp_nfs }}
+  storageClassName: netapp-nfs
+  volumeMode: Filesystem
+  {{ end }}
diff --git a/charts/redhat/mysql-persistent/src/values.schema.json b/charts/redhat/mysql-persistent/src/values.schema.json
@@ -43,6 +43,26 @@
             "type": "string",
             "description": "Specify mysql imagestream tag",
             "enum": [ "latest", "8.0-el9", "8.0-el8" ]
+        },
+        "pvc": {
+            "type": "object",
+            "properties": {
+                "volume_capacity": {
+                    "type": "string",
+                    "title": "Persistent Volume Size",
+                    "form": true,
+                    "render": "slider",
+                    "sliderMin": 1,
+                    "sliderMax": 100,
+                    "sliderUnit": "Gi"
+                },
+                "netapp_nfs": {
+                    "type": "boolean"
+                },
+                "app_code": {
+                    "type": "string"
+                }
+            }
         }
     }
 }

diff --git a/charts/redhat/mysql-persistent/src/values.yaml b/charts/redhat/mysql-persistent/src/values.yaml
@@ -6,4 +6,7 @@ mysql_root_password: testur # TODO: must define a default value for .mysql_root_
 mysql_user: testu # TODO: must define a default value for .mysql_user'
 mysql_version: 8.0-el8
 namespace: openshift
-volume_capacity: 1Gi
+pvc:
+  volume_capacity: 1Gi
+  app_code: "something"
+  netapp_nfs: false
diff --git a/tests/test_mysql_template.py b/tests/test_mysql_template.py
@@ -18,12 +18,19 @@ def setup_method(self):
     def teardown_method(self):
         self.hc_api.delete_project()
 
-    def test_package_persistent(self):
+    @pytest.mark.parametrize(
+        "version",
+        [
+            "8.0-el9",
+            "8.0-el8",
+        ],
+    )
+    def test_package_persistent(self, version):
         self.hc_api.package_name = "mysql-imagestreams"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
         self.hc_api.package_name = "mysql-persistent"
         assert self.hc_api.helm_package()
-        assert self.hc_api.helm_installation(values={".mysql_version": "8.0-el8", ".namespace": self.hc_api.namespace})
+        assert self.hc_api.helm_installation(values={".mysql_version": version, ".namespace": self.hc_api.namespace})
         assert self.hc_api.is_pod_running(pod_name_prefix="mysql")
         assert self.hc_api.test_helm_chart(expected_str=["42", "testval"])