Rename sparkDependencies to dependencies

Signed-off-by: Pavol Loffay <[email protected]>
jaegertracing · Dec 4, 2018 · ce78f19 · ce78f19
1 parent e07a7ca
commit ce78f19
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/deploy/examples/simple-prod.yaml b/deploy/examples/simple-prod.yaml
@@ -12,5 +12,5 @@ spec:
         server-urls: http://elasticsearch:9200
         username: elastic
         password: changeme
-    sparkDependencies:
+    dependencies:
       enabled: true
diff --git a/pkg/apis/io/v1alpha1/jaeger_types.go b/pkg/apis/io/v1alpha1/jaeger_types.go
@@ -125,7 +125,7 @@ type JaegerStorageSpec struct {
 	SecretName            string                          `json:"secretName"`
 	Options               Options                         `json:"options"`
 	CassandraCreateSchema JaegerCassandraCreateSchemaSpec `json:"cassandraCreateSchema"`
-	SparkDependencies     JaegerSparkDependenciesSpec     `json:"sparkDependencies"`
+	SparkDependencies     JaegerDependenciesSpec          `json:"dependencies"`
 }
 
 // JaegerCassandraCreateSchemaSpec holds the options related to the create-schema batch job
@@ -136,8 +136,8 @@ type JaegerCassandraCreateSchemaSpec struct {
 	Mode       string `json:"mode"`
 }
 
-// JaegerSparkDependenciesSpec defined options for running spark-dependencies.
-type JaegerSparkDependenciesSpec struct {
+// JaegerDependenciesSpec defined options for running spark-dependencies.
+type JaegerDependenciesSpec struct {
 	Enabled                     bool   `json:"enabled"`
 	SparkMaster                 string `json:"sparkMaster"`
 	Schedule                    string `json:"schedule"`

diff --git a/pkg/apis/io/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/io/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/cronjob/spark_dependencies_test.go b/pkg/cronjob/spark_dependencies_test.go
@@ -13,11 +13,11 @@ func TestApplyDefaults(t *testing.T) {
 		expected  *v1alpha1.Jaeger
 	}{
 		{underTest: &v1alpha1.Jaeger{}, expected: &v1alpha1.Jaeger{Spec: v1alpha1.JaegerSpec{Storage: v1alpha1.JaegerStorageSpec{
-			SparkDependencies: v1alpha1.JaegerSparkDependenciesSpec{Schedule: "55 23 * * *"}}}}},
+			SparkDependencies: v1alpha1.JaegerDependenciesSpec{Schedule: "55 23 * * *"}}}}},
 		{underTest: &v1alpha1.Jaeger{Spec: v1alpha1.JaegerSpec{Storage: v1alpha1.JaegerStorageSpec{
-			SparkDependencies: v1alpha1.JaegerSparkDependenciesSpec{Schedule: "foo"}}}},
+			SparkDependencies: v1alpha1.JaegerDependenciesSpec{Schedule: "foo"}}}},
 			expected: &v1alpha1.Jaeger{Spec: v1alpha1.JaegerSpec{Storage: v1alpha1.JaegerStorageSpec{
-				SparkDependencies: v1alpha1.JaegerSparkDependenciesSpec{Schedule: "foo"}}}}},
+				SparkDependencies: v1alpha1.JaegerDependenciesSpec{Schedule: "foo"}}}}},
 	}
 	for _, test := range tests {
 		applyDefaults(test.underTest)

diff --git a/pkg/strategy/all-in-one_test.go b/pkg/strategy/all-in-one_test.go
@@ -147,15 +147,15 @@ func testSparkDependencies(t *testing.T, fce func(jaeger *v1alpha1.Jaeger) S) {
 	}{
 		{jaeger: &v1alpha1.Jaeger{Spec: v1alpha1.JaegerSpec{
 			Storage: v1alpha1.JaegerStorageSpec{Type: "elasticsearch",
-				SparkDependencies: v1alpha1.JaegerSparkDependenciesSpec{Enabled: true}},
+				SparkDependencies: v1alpha1.JaegerDependenciesSpec{Enabled: true}},
 		}}, sparkCronJobEnabled: true},
 		{jaeger: &v1alpha1.Jaeger{Spec: v1alpha1.JaegerSpec{
 			Storage: v1alpha1.JaegerStorageSpec{Type: "cassandra",
-				SparkDependencies: v1alpha1.JaegerSparkDependenciesSpec{Enabled: true}},
+				SparkDependencies: v1alpha1.JaegerDependenciesSpec{Enabled: true}},
 		}}, sparkCronJobEnabled: true},
 		{jaeger: &v1alpha1.Jaeger{Spec: v1alpha1.JaegerSpec{
 			Storage: v1alpha1.JaegerStorageSpec{Type: "kafka",
-				SparkDependencies: v1alpha1.JaegerSparkDependenciesSpec{Enabled: true}},
+				SparkDependencies: v1alpha1.JaegerDependenciesSpec{Enabled: true}},
 		}}, sparkCronJobEnabled: false},
 		{jaeger: &v1alpha1.Jaeger{Spec: v1alpha1.JaegerSpec{
 			Storage: v1alpha1.JaegerStorageSpec{Type: "elasticsearch"},

diff --git a/test/e2e/spark_dependencies_test.go b/test/e2e/spark_dependencies_test.go
@@ -45,7 +45,7 @@ func sparkTest(t *testing.T, f *framework.Framework, testCtx *framework.TestCtx,
 		return fmt.Errorf("could not get namespace: %v", err)
 	}
 
-	storage.SparkDependencies = v1alpha1.JaegerSparkDependenciesSpec{
+	storage.SparkDependencies = v1alpha1.JaegerDependenciesSpec{
 		Enabled: true,
 		// run immediately
 		Schedule: "*/1 * * * *",