Added missing omitempty tag for port (kubeflow#622)

questsul · Sep 17, 2019 · 522ae38 · 522ae38
1 parent a4f77b7
commit 522ae38
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/manifest/crds/sparkoperator.k8s.io_scheduledsparkapplications.yaml b/manifest/crds/sparkoperator.k8s.io_scheduledsparkapplications.yaml
@@ -9,9 +9,11 @@ spec:
   group: sparkoperator.k8s.io
   names:
     kind: ScheduledSparkApplication
+    listKind: ScheduledSparkApplicationList
     plural: scheduledsparkapplications
     shortNames:
     - scheduledsparkapp
+    singular: scheduledsparkapplication
   scope: Namespaced
   subresources:
     status: {}
@@ -1898,7 +1900,6 @@ spec:
                           type: integer
                       required:
                       - jmxExporterJar
-                      - port
                       type: object
                   required:
                   - exposeDriverMetrics
@@ -1949,6 +1950,9 @@ spec:
                   type: string
                 sparkVersion:
                   type: string
+                timeToLiveSeconds:
+                  format: int64
+                  type: integer
                 type:
                   enum:
                   - Java

diff --git a/manifest/crds/sparkoperator.k8s.io_sparkapplications.yaml b/manifest/crds/sparkoperator.k8s.io_sparkapplications.yaml
@@ -9,9 +9,11 @@ spec:
   group: sparkoperator.k8s.io
   names:
     kind: SparkApplication
+    listKind: SparkApplicationList
     plural: sparkapplications
     shortNames:
     - sparkapp
+    singular: sparkapplication
   scope: Namespaced
   subresources:
     status: {}
@@ -1884,7 +1886,6 @@ spec:
                       type: integer
                   required:
                   - jmxExporterJar
-                  - port
                   type: object
               required:
               - exposeDriverMetrics
@@ -1935,6 +1936,9 @@ spec:
               type: string
             sparkVersion:
               type: string
+            timeToLiveSeconds:
+              format: int64
+              type: integer
             type:
               enum:
               - Java

diff --git a/pkg/apis/sparkoperator.k8s.io/v1beta2/types.go b/pkg/apis/sparkoperator.k8s.io/v1beta2/types.go
@@ -533,7 +533,7 @@ type PrometheusSpec struct {
 	// If not specified, 8090 will be used as the default.
 	// +kubebuilder:validation:Minimum=1024
 	// +kubebuilder:validation:Minimum=49151
-	Port *int32 `json:"port"`
+	Port *int32 `json:"port,omitempty"`
 	// ConfigFile is the path to the custom Prometheus configuration file provided in the Spark image.
 	// ConfigFile takes precedence over Configuration, which is shown below.
 	ConfigFile *string `json:"configFile,omitempty"`