From e69e18bc27248aa255743e8dd122efcf04b2f93e Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Fri, 19 Feb 2021 13:24:54 +0500
Subject: [PATCH] Do not allow image variables to be configurable for nextcloud
 chart

---
 test/nextcloud/1.2.1/Chart.yaml               |  2 +-
 test/nextcloud/1.2.1/ix_values.yaml           |  4 +++
 .../{migrate => migrate_from_1.1.0}           |  0
 test/nextcloud/1.2.1/questions.yaml           | 36 -------------------
 4 files changed, 5 insertions(+), 37 deletions(-)
 create mode 100644 test/nextcloud/1.2.1/ix_values.yaml
 rename test/nextcloud/1.2.1/migrations/{migrate => migrate_from_1.1.0} (100%)

diff --git a/test/nextcloud/1.2.1/Chart.yaml b/test/nextcloud/1.2.1/Chart.yaml
index dcd23ef354..fd2668cd8f 100644
--- a/test/nextcloud/1.2.1/Chart.yaml
+++ b/test/nextcloud/1.2.1/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: nextcloud
 version: 1.2.1
-appVersion: 19.0.3
+appVersion: 20.0.7
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:
 - nextcloud
diff --git a/test/nextcloud/1.2.1/ix_values.yaml b/test/nextcloud/1.2.1/ix_values.yaml
new file mode 100644
index 0000000000..c709e4856b
--- /dev/null
+++ b/test/nextcloud/1.2.1/ix_values.yaml
@@ -0,0 +1,4 @@
+image:
+  repository: nextcloud
+  tag: 20.0.7
+  pullPolicy: IfNotPresent
diff --git a/test/nextcloud/1.2.1/migrations/migrate b/test/nextcloud/1.2.1/migrations/migrate_from_1.1.0
similarity index 100%
rename from test/nextcloud/1.2.1/migrations/migrate
rename to test/nextcloud/1.2.1/migrations/migrate_from_1.1.0
diff --git a/test/nextcloud/1.2.1/questions.yaml b/test/nextcloud/1.2.1/questions.yaml
index e8e485abce..497b55490d 100644
--- a/test/nextcloud/1.2.1/questions.yaml
+++ b/test/nextcloud/1.2.1/questions.yaml
@@ -22,42 +22,6 @@ portals:
       - "$variable-service.nodePort"
 
 questions:
-  # Image related
-  - variable: image
-    description: "Docker Image Details"
-    label: "Docker Image"
-    group: "Container Images"
-    schema:
-      type: dict
-      required: true
-      attrs:
-        - variable: repository
-          description: "Docker image repository"
-          label: "Image repository"
-          schema:
-            type: string
-            default: "nextcloud"
-            required: true
-        - variable: tag
-          description: "Tag to use for specified image"
-          label: "Image Tag"
-          schema:
-            type: string
-            default: "latest"
-        - variable: pullPolicy
-          description: "Docker Image Pull Policy"
-          label: "Image Pull Policy"
-          schema:
-            type: string
-            default: "IfNotPresent"
-            enum:
-              - value: "IfNotPresent"
-                description: "Only pull image if not present on host"
-              - value: "Always"
-                description: "Always pull image even if present on host"
-              - value: "Never"
-                description: "Never pull image even if it's not present on host"
-
   - variable: nextcloud
     description: "Nextcloud configuration details"
     label: "Nextcloud Configuration"