Relax schema for openshifter mode (#156)

Signed-off-by: Tamal Saha <[email protected]>
voyagermesh · Nov 27, 2024 · d780007 · d780007
1 parent 4a789b8
commit d780007
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 31 deletions.
diff --git a/apis/installer/v1alpha1/voyager_gateway_types.go b/apis/installer/v1alpha1/voyager_gateway_types.go
@@ -139,15 +139,19 @@ type LoggingLevel struct {
 }
 
 type CertgenSpec struct {
-	Job  CertgenJobSpec      `json:"job"`
+	Job CertgenJobSpec `json:"job"`
+	// +optional
 	Rbac CertgenRbacMetadata `json:"rbac"`
 }
 
 type CertgenJobSpec struct {
-	Annotations             map[string]string         `json:"annotations"`
-	Resources               core.ResourceRequirements `json:"resources"`
-	TtlSecondsAfterFinished int                       `json:"ttlSecondsAfterFinished"`
-	SecurityContext         *core.SecurityContext     `json:"securityContext,omitempty"`
+	// +optional
+	Annotations map[string]string `json:"annotations"`
+	// +optional
+	Resources core.ResourceRequirements `json:"resources"`
+	// +optional
+	TtlSecondsAfterFinished int                   `json:"ttlSecondsAfterFinished"`
+	SecurityContext         *core.SecurityContext `json:"securityContext,omitempty"`
 }
 
 type CertgenRbacMetadata struct {

diff --git a/apis/installer/v1alpha1/voyager_types.go b/apis/installer/v1alpha1/voyager_types.go
@@ -89,9 +89,12 @@ type VoyagerSpec struct {
 }
 
 type ImageRef struct {
-	Registry   string `json:"registry"`
+	// +optional
+	Registry string `json:"registry"`
+	// +optional
 	Repository string `json:"repository"`
-	Tag        string `json:"tag"`
+	// +optional
+	Tag string `json:"tag"`
 }
 
 type CleanerRef struct {

diff --git a/charts/gateway-converter/values.openapiv3_schema.yaml b/charts/gateway-converter/values.openapiv3_schema.yaml
@@ -1393,10 +1393,6 @@ properties:
         type: object
       tag:
         type: string
-    required:
-    - registry
-    - repository
-    - tag
     type: object
   serviceAccount:
     properties:

diff --git a/charts/voyager-gateway/values.openapiv3_schema.yaml b/charts/voyager-gateway/values.openapiv3_schema.yaml
@@ -236,10 +236,6 @@ properties:
             type: object
           ttlSecondsAfterFinished:
             type: integer
-        required:
-        - annotations
-        - resources
-        - ttlSecondsAfterFinished
         type: object
       rbac:
         properties:
@@ -257,7 +253,6 @@ properties:
         type: object
     required:
     - job
-    - rbac
     type: object
   config:
     properties:
@@ -3200,10 +3195,6 @@ properties:
             type: object
           tag:
             type: string
-        required:
-        - registry
-        - repository
-        - tag
         type: object
       serviceAccount:
         properties:

diff --git a/charts/voyager/values.openapiv3_schema.yaml b/charts/voyager/values.openapiv3_schema.yaml
@@ -973,10 +973,7 @@ properties:
       tag:
         type: string
     required:
-    - registry
-    - repository
     - skip
-    - tag
     type: object
   cloudConfig:
     type: string
@@ -994,10 +991,6 @@ properties:
         type: string
       tag:
         type: string
-    required:
-    - registry
-    - repository
-    - tag
     type: object
   imagePullPolicy:
     type: string
@@ -1240,10 +1233,6 @@ properties:
         type: object
       tag:
         type: string
-    required:
-    - registry
-    - repository
-    - tag
     type: object
   persistence:
     properties: