Merge pull request #298 from vshn/update-appuio-registry

Set image registry and repository

Author: wejdross

pkg/comp-functions/functions/vshnkeycloak/deploy.go

@@ -332,9 +332,6 @@ func newValues(ctx context.Context, svc *runtime.ServiceRuntime, comp *vshnv1.VS
 			"--spi-events-listener-jboss-logging-success-level=info",
 			"--spi-events-listener-jboss-logging-error-level=warn",
 		},
-		"image": map[string]any{
-			"repository": "docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed",
-		},
 		"database": map[string]any{
 			"hostname": string(cd[vshnpostgres.PostgresqlHost]),
 			"port":     string(cd[vshnpostgres.PostgresqlPort]),
@@ -398,6 +395,12 @@ func newValues(ctx context.Context, svc *runtime.ServiceRuntime, comp *vshnv1.VS
 		"podAnnotations":     podAnnotations,
 	}
 
+	if svc.Config.Data["imageRegistry"] != "" {
+		values["image"] = map[string]interface{}{
+			"repository": svc.Config.Data["imageRegistry"],
+		}
+	}
+
 	jsonned, _ := json.Marshal(values)
 	fmt.Println(string(jsonned))
 

pkg/comp-functions/functions/vshnmariadb/mariadb_deploy.go

@@ -226,6 +226,12 @@ func newValues(ctx context.Context, svc *runtime.ServiceRuntime, comp *vshnv1.VS
 		},
 	}
 
+	if svc.Config.Data["imageRegistry"] != "" {
+		values["image"] = map[string]interface{}{
+			"registry": svc.Config.Data["imageRegistry"],
+		}
+	}
+
 	return values, nil
 }
 

pkg/comp-functions/functions/vshnminio/minio_deploy.go

@@ -139,6 +139,12 @@ func createObjectHelmRelease(ctx context.Context, comp *vshnv1.VSHNMinio, svc *r
 		},
 	}
 
+	if svc.Config.Data["imageRegistry"] != "" {
+		values["image"] = map[string]interface{}{
+			"registry": svc.Config.Data["imageRegistry"],
+		}
+	}
+
 	vb, err := json.Marshal(values)
 	if err != nil {
 		err = fmt.Errorf("cannot marshal helm values: %w", err)

pkg/comp-functions/functions/vshnnextcloud/deploy.go

@@ -369,6 +369,12 @@ func newValues(ctx context.Context, svc *runtime.ServiceRuntime, comp *vshnv1.VS
 		},
 	}
 
+	if svc.Config.Data["imageRegistry"] != "" {
+		values["image"] = map[string]interface{}{
+			"repository": svc.Config.Data["imageRegistry"],
+		}
+	}
+
 	return values, nil
 }