Merge pull request #290 from vshn/fix/nextcloud_image_registry

Add image repository parameter, to be able to override the registry
vshn · Jan 10, 2025 · 25d65f1 · 25d65f1
2 parents 789e16f + 000c5a8
commit 25d65f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pkg/comp-functions/functions/vshnnextcloud/collabora.go b/pkg/comp-functions/functions/vshnnextcloud/collabora.go
@@ -536,7 +536,7 @@ func createInstallCollaboraJob(comp *vshnv1.VSHNNextcloud, svc *runtime.ServiceR
 					Containers: []corev1.Container{
 						{
 							Name:  comp.GetName() + "-install-collabora",
-							Image: "quay.io/appuio/oc:v4.13",
+							Image: svc.Config.Data["oc_image"],
 							Command: []string{
 								"bash",
 								"-cefx",

diff --git a/pkg/comp-functions/functions/vshnnextcloud/deploy.go b/pkg/comp-functions/functions/vshnnextcloud/deploy.go
@@ -225,7 +225,7 @@ func newValues(ctx context.Context, svc *runtime.ServiceRuntime, comp *vshnv1.VS
 		extraInitContainers = []map[string]any{
 			{
 				"name":  "dbchecker",
-				"image": "docker.io/busybox",
+				"image": svc.Config.Data["busybox_image"],
 				"command": []string{
 					"sh",
 					"-c",
@@ -266,6 +266,9 @@ func newValues(ctx context.Context, svc *runtime.ServiceRuntime, comp *vshnv1.VS
 
 	updatedNextcloudConfig := setBackgroundJobMaintenance(*comp.GetMaintenanceTimeOfDay(), nextcloudConfig)
 	values = map[string]any{
+		"image": map[string]any{
+			"repository": svc.Config.Data["nextcloud_image"],
+		},
 		"nextcloud": map[string]any{
 			"host":           comp.Spec.Parameters.Service.FQDN[0],
 			"trustedDomains": trustedDomain,