Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change spark-dependencies image to GHCR #1701

Merged
merged 1 commit into from
Jan 7, 2022
+3 −3
Merged

Change spark-dependencies image to GHCR #1701

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Change spark-dependencies image to GHCR 
Signed-off-by: Pavol Loffay <[email protected]>
@pavolloffay
pavolloffay committed Jan 6, 2022
commit 99f4bb9f4f2acc880e5c244915d447df184c4796
2 changes: 1 addition & 1 deletion pkg/cmd/start/main.go
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ func AddFlags(cmd *cobra.Command) {
cmd.Flags().String("jaeger-ingester-image", "jaegertracing/jaeger-ingester", "The Docker image for the Jaeger Ingester")
cmd.Flags().String("jaeger-all-in-one-image", "jaegertracing/all-in-one", "The Docker image for the Jaeger all-in-one")
cmd.Flags().String("jaeger-cassandra-schema-image", "jaegertracing/jaeger-cassandra-schema", "The Docker image for the Jaeger Cassandra Schema")
cmd.Flags().String("jaeger-spark-dependencies-image", "jaegertracing/spark-dependencies", "The Docker image for the Spark Dependencies Job")
cmd.Flags().String("jaeger-spark-dependencies-image", "ghcr.io/jaegertracing/spark-dependencies/spark-dependencies", "The Docker image for the Spark Dependencies Job")
cmd.Flags().String("jaeger-es-index-cleaner-image", "jaegertracing/jaeger-es-index-cleaner", "The Docker image for the Jaeger Elasticsearch Index Cleaner")
cmd.Flags().String("jaeger-es-rollover-image", "jaegertracing/jaeger-es-rollover", "The Docker image for the Jaeger Elasticsearch Rollover")
cmd.Flags().String("openshift-oauth-proxy-image", "openshift/oauth-proxy:latest", "The Docker image location definition for the OpenShift OAuth Proxy")
4 changes: 2 additions & 2 deletions pkg/cronjob/spark_dependencies_test.go
View file
Original file line number Diff line number Diff line change
@@ -228,13 +228,13 @@ func TestSparkDependenciesResources(t *testing.T) {
}

func TestDefaultSparkDependenciesImage(t *testing.T) {
viper.SetDefault("jaeger-spark-dependencies-image", "jaegertracing/spark-dependencies")
viper.SetDefault("jaeger-spark-dependencies-image", "ghcr.io/jaegertracing/spark-dependencies/spark-dependencies")

jaeger := v1.NewJaeger(types.NamespacedName{Name: "TestDefaultSparkDependenciesImage"})

cjob := CreateSparkDependencies(jaeger)
assert.Empty(t, jaeger.Spec.Storage.Dependencies.Image)
assert.Equal(t, "jaegertracing/spark-dependencies", cjob.Spec.JobTemplate.Spec.Template.Spec.Containers[0].Image)
assert.Equal(t, "ghcr.io/jaegertracing/spark-dependencies/spark-dependencies", cjob.Spec.JobTemplate.Spec.Template.Spec.Containers[0].Image)
}

func TestCustomSparkDependenciesImage(t *testing.T) {