Modify ace options schema

Signed-off-by: Tamal Saha <[email protected]>
appscode-cloud · Oct 30, 2023 · 2fb0733 · 2fb0733
1 parent 38af0fe
commit 2fb0733
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 41 deletions.
diff --git a/apis/installer/v1alpha1/ace_options_types.go b/apis/installer/v1alpha1/ace_options_types.go
@@ -70,15 +70,21 @@ type AceOptionsSpec struct {
 }
 
 type RegistrySpec struct {
-	shared.ImageRegistrySpec `json:",inline,omitempty"`
 	//+optional
-	Repositories HelmRepositories `json:"repositories"`
+	Image shared.ImageRegistrySpec `json:"image"`
+	//+optional
+	Registry shared.RegistryInfo `json:"registry"`
+	//+optional
+	Helm HelmOptions `json:"helm"`
 	//+optional
 	AllowNondistributableArtifacts bool `json:"allowNondistributableArtifacts"`
 	//+optional
 	Insecure bool `json:"insecure"`
+}
+
+type HelmOptions struct {
 	//+optional
-	ImagePullSecrets []string `json:"imagePullSecrets"`
+	Repositories HelmRepositories `json:"repositories"`
 }
 
 type HelmRepositories struct {

diff --git a/apis/installer/v1alpha1/zz_generated.deepcopy.go b/apis/installer/v1alpha1/zz_generated.deepcopy.go
diff --git a/schema/ace-options/values.openapiv3_schema.yaml b/schema/ace-options/values.openapiv3_schema.yaml
@@ -1014,42 +1014,53 @@ properties:
     properties:
       allowNondistributableArtifacts:
         type: boolean
-      imagePullSecrets:
-        items:
-          type: string
-        type: array
-      insecure:
-        type: boolean
-      proxies:
+      helm:
         properties:
-          appscode:
-            description: r.appscode.com
-            type: string
-          dockerHub:
-            description: company/bin:1.23
-            type: string
-          dockerLibrary:
-            description: alpine, nginx etc.
-            type: string
-          ghcr:
-            description: ghcr.io
-            type: string
-          kubernetes:
-            description: registry.k8s.io
-            type: string
-          quay:
-            description: quay.io
-            type: string
+          repositories:
+            properties:
+              appscode-charts-legacy:
+                type: string
+              appscode-charts-oci:
+                type: string
+            type: object
         type: object
-      registryFQDN:
-        type: string
-      repositories:
+      image:
         properties:
-          appscode-charts-legacy:
-            type: string
-          appscode-charts-oci:
+          proxies:
+            properties:
+              appscode:
+                description: r.appscode.com
+                type: string
+              dockerHub:
+                description: company/bin:1.23
+                type: string
+              dockerLibrary:
+                description: alpine, nginx etc.
+                type: string
+              ghcr:
+                description: ghcr.io
+                type: string
+              kubernetes:
+                description: registry.k8s.io
+                type: string
+              quay:
+                description: quay.io
+                type: string
+            type: object
+          registryFQDN:
             type: string
         type: object
+      insecure:
+        type: boolean
+      registry:
+        properties:
+          credentials:
+            additionalProperties:
+              type: string
+            type: object
+        required:
+          - credentials
+        type: object
     type: object
   release:
     description: ObjectReference contains enough information to let you inspect or