Update nginx ingress schema

Signed-off-by: Tamal Saha <[email protected]>
appscode-cloud · Oct 26, 2023 · defdae4 · defdae4
1 parent a5dbbbe
commit defdae4
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 4 deletions.
diff --git a/apis/installer/v1alpha1/ace_options_helpers.go b/apis/installer/v1alpha1/ace_options_helpers.go
@@ -18,10 +18,6 @@ package v1alpha1
 
 import "strings"
 
-func (r RegistrySpec) Configured() bool {
-	return r.RegistryFQDN != ""
-}
-
 func (r RegistrySpec) DockerHubProxy() string {
 	addr := r.Proxies.DockerHub
 	if addr == "" {

diff --git a/apis/installer/v1alpha1/ingress_nginx_types.go b/apis/installer/v1alpha1/ingress_nginx_types.go
@@ -47,6 +47,18 @@ type IngressNginxSpec struct {
 	Controller IngressNginxController `json:"controller"`
 	// +optional
 	TCP map[string]string `json:"tcp,omitempty"`
+	// +optional
+	DefaultBackend IngressNginxDefaultBackend `json:"defaultBackend"`
+}
+
+type IngressNginxDefaultBackend struct {
+	Enabled bool                            `json:"enabled"`
+	Name    string                          `json:"name"`
+	Image   IngressNginxDefaultBackendImage `json:"image"`
+}
+
+type IngressNginxDefaultBackendImage struct {
+	Registry string `json:"registry"`
 }
 
 type IngressNginxController struct {

diff --git a/apis/installer/v1alpha1/zz_generated.deepcopy.go b/apis/installer/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/ace/values.openapiv3_schema.yaml b/charts/ace/values.openapiv3_schema.yaml
@@ -5219,6 +5219,24 @@ properties:
         - ingressClassResource
         - networkPolicy
         type: object
+      defaultBackend:
+        properties:
+          enabled:
+            type: boolean
+          image:
+            properties:
+              registry:
+                type: string
+            required:
+            - registry
+            type: object
+          name:
+            type: string
+        required:
+        - enabled
+        - image
+        - name
+        type: object
       enabled:
         type: boolean
       tcp:

diff --git a/schema/ingress-nginx/values.openapiv3_schema.yaml b/schema/ingress-nginx/values.openapiv3_schema.yaml
@@ -146,6 +146,24 @@ properties:
     - ingressClassResource
     - networkPolicy
     type: object
+  defaultBackend:
+    properties:
+      enabled:
+        type: boolean
+      image:
+        properties:
+          registry:
+            type: string
+        required:
+        - registry
+        type: object
+      name:
+        type: string
+    required:
+    - enabled
+    - image
+    - name
+    type: object
   tcp:
     additionalProperties:
       type: string