Update image assignment logic in SentryContainerConverter and SentryCleanupConverter

kanadaj · kanadaj · commit d7cd416ca377 · 2025-09-11T17:34:57.000+01:00
diff --git a/Docker/Converters/SentryCleanupConverter.cs b/Docker/Converters/SentryCleanupConverter.cs
@@ -11,7 +11,9 @@ public class SentryCleanupConverter : SentryContainerConverter
 
     protected override V1Container GetBaseContainer(string name, DockerService service, SentryDeployment sentryDeployment)
     {
-        service.Image = $"getsentry/sentry:{sentryDeployment.Spec.GetVersion()}";
+        var image = sentryDeployment.Spec.Config?.Image ??
+                    $"{sentryDeployment.Spec.Config?.Registry + (sentryDeployment.Spec.Config?.Registry == null || sentryDeployment.Spec.Config.Registry.EndsWith('/') ? "" : "/")}getsentry/sentry:{sentryDeployment.Spec.GetVersion()}";
+        service.Image = image;
         
         var container = base.GetBaseContainer(name, service, sentryDeployment);
         
diff --git a/Docker/Converters/SentryContainerConverter.cs b/Docker/Converters/SentryContainerConverter.cs
@@ -13,7 +13,9 @@ public override bool CanConvert(string name, DockerService service)
 
     protected override V1Container GetBaseContainer(string name, DockerService service, SentryDeployment sentryDeployment)
     {
-        service.Image = $"getsentry/sentry:{sentryDeployment.Spec.GetVersion()}";
+        var image = sentryDeployment.Spec.Config?.Image ??
+                    $"{sentryDeployment.Spec.Config?.Registry + (sentryDeployment.Spec.Config?.Registry == null || sentryDeployment.Spec.Config.Registry.EndsWith('/') ? "" : "/")}getsentry/sentry:{sentryDeployment.Spec.GetVersion()}";
+        service.Image = image;
         var container = base.GetBaseContainer(name, service, sentryDeployment);
         
         if (sentryDeployment.Spec.Environment != null)

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,9 @@ public class SentryCleanupConverter : SentryContainerConverter`
`11`	`11`
`12`	`12`	`protected override V1Container GetBaseContainer(string name, DockerService service, SentryDeployment sentryDeployment)`
`13`	`13`	`{`
`14`		`- service.Image = $"getsentry/sentry:{sentryDeployment.Spec.GetVersion()}";`
	`14`	`+ var image = sentryDeployment.Spec.Config?.Image ??`
	`15`	`+ $"{sentryDeployment.Spec.Config?.Registry + (sentryDeployment.Spec.Config?.Registry == null \|\| sentryDeployment.Spec.Config.Registry.EndsWith('/') ? "" : "/")}getsentry/sentry:{sentryDeployment.Spec.GetVersion()}";`
	`16`	`+ service.Image = image;`
`15`	`17`
`16`	`18`	`var container = base.GetBaseContainer(name, service, sentryDeployment);`
`17`	`19`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@ public override bool CanConvert(string name, DockerService service)`
`13`	`13`
`14`	`14`	`protected override V1Container GetBaseContainer(string name, DockerService service, SentryDeployment sentryDeployment)`
`15`	`15`	`{`
`16`		`- service.Image = $"getsentry/sentry:{sentryDeployment.Spec.GetVersion()}";`
	`16`	`+ var image = sentryDeployment.Spec.Config?.Image ??`
	`17`	`+ $"{sentryDeployment.Spec.Config?.Registry + (sentryDeployment.Spec.Config?.Registry == null \|\| sentryDeployment.Spec.Config.Registry.EndsWith('/') ? "" : "/")}getsentry/sentry:{sentryDeployment.Spec.GetVersion()}";`
	`18`	`+ service.Image = image;`
`17`	`19`	`var container = base.GetBaseContainer(name, service, sentryDeployment);`
`18`	`20`
`19`	`21`	`if (sentryDeployment.Spec.Environment != null)`