Rename SparkApp

deliahu · deliahu · commit 87720705b181 · 2019-07-17T15:18:43.000-07:00
diff --git a/pkg/lib/spark/spark.go b/pkg/lib/spark/spark.go
@@ -53,14 +53,14 @@ var sparkAppTypeMeta = kmeta.TypeMeta{
 	Kind:       "SparkApplication",
 }
 
-type SparkAppSpec struct {
+type Spec struct {
 	Name      string
 	Namespace string
 	Spec      sparkop.SparkApplicationSpec
 	Labels    map[string]string
 }
 
-func Spark(spec *SparkAppSpec) *sparkop.SparkApplication {
+func App(spec *Spec) *sparkop.SparkApplication {
 	if spec.Namespace == "" {
 		spec.Namespace = "default"
 	}
diff --git a/pkg/operator/workloads/spark_workload.go b/pkg/operator/workloads/spark_workload.go
@@ -180,7 +180,7 @@ func sparkSpec(
 		memOverheadFactor = pointer.String(s.Float64(*sparkCompute.MemOverheadFactor))
 	}
 
-	return spark.Spark(&spark.SparkAppSpec{
+	return spark.App(&spark.Spec{
 		Name:      workloadID,
 		Namespace: config.Cortex.Namespace,
 		Labels: map[string]string{

Original file line number	Diff line number	Diff line change
`@@ -53,14 +53,14 @@ var sparkAppTypeMeta = kmeta.TypeMeta{`
`53`	`53`	`Kind: "SparkApplication",`
`54`	`54`	`}`
`55`	`55`
`56`		`-type SparkAppSpec struct {`
	`56`	`+type Spec struct {`
`57`	`57`	`Name string`
`58`	`58`	`Namespace string`
`59`	`59`	`Spec sparkop.SparkApplicationSpec`
`60`	`60`	`Labels map[string]string`
`61`	`61`	`}`
`62`	`62`
`63`		`-func Spark(spec SparkAppSpec) sparkop.SparkApplication {`
	`63`	`+func App(spec Spec) sparkop.SparkApplication {`
`64`	`64`	`if spec.Namespace == "" {`
`65`	`65`	`spec.Namespace = "default"`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ func sparkSpec(`
`180`	`180`	`memOverheadFactor = pointer.String(s.Float64(*sparkCompute.MemOverheadFactor))`
`181`	`181`	`}`
`182`	`182`
`183`		`- return spark.Spark(&spark.SparkAppSpec{`
	`183`	`+ return spark.App(&spark.Spec{`
`184`	`184`	`Name: workloadID,`
`185`	`185`	`Namespace: config.Cortex.Namespace,`
`186`	`186`	`Labels: map[string]string{`