Skip to content

Commit a9918dc

Browse files
author
Simon Emms
committed
sss
1 parent 0a62df0 commit a9918dc

File tree

28 files changed

+58
-51
lines changed

28 files changed

+58
-51
lines changed

‎install/installer/pkg/components/agent-smith/daemonset.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
5151
TerminationGracePeriodSeconds: pointer.Int64(30),
5252
Containers: []corev1.Container{{
5353
Name: Component,
54-
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.AgentSmith.Version),
54+
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.AgentSmith.Version, &ctx.Config),
5555
ImagePullPolicy: corev1.PullIfNotPresent,
5656
Args: []string{"run", "--config", "/config/config.json"},
5757
Resources: corev1.ResourceRequirements{

‎install/installer/pkg/components/blobserve/configmap.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
3535
Port: ContainerPort,
3636
Timeout: util.Duration(time.Second * 5),
3737
Repos: map[string]blobserve.Repo{
38-
common.RepoName(ctx.Config.Repository, ide.CodeIDEImage): {
38+
common.RepoName(ctx.Config.Repository, ide.CodeIDEImage, &ctx.Config): {
3939
PrePull: []string{},
4040
Workdir: "/ide",
4141
Replacements: []blobserve.StringReplacement{{
@@ -88,7 +88,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
8888
Replacement: "${supervisor}",
8989
}},
9090
},
91-
common.RepoName(ctx.Config.Repository, workspace.SupervisorImage): {
91+
common.RepoName(ctx.Config.Repository, workspace.SupervisorImage, &ctx.Config): {
9292
PrePull: []string{},
9393
Workdir: "/.supervisor/frontend",
9494
},

‎install/installer/pkg/components/blobserve/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
9494
Containers: []corev1.Container{{
9595
Name: Component,
9696
Args: []string{"run", "/mnt/config/config.json"},
97-
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.Blobserve.Version),
97+
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.Blobserve.Version, &ctx.Config),
9898
ImagePullPolicy: corev1.PullIfNotPresent,
9999
Ports: []corev1.ContainerPort{{
100100
Name: ServicePortName,

‎install/installer/pkg/components/content-service/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
4141
}},
4242
Containers: []corev1.Container{{
4343
Name: Component,
44-
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.ContentService.Version),
44+
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.ContentService.Version, &ctx.Config),
4545
ImagePullPolicy: corev1.PullIfNotPresent,
4646
Args: []string{
4747
"run",

‎install/installer/pkg/components/dashboard/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
4848
TerminationGracePeriodSeconds: pointer.Int64(30),
4949
Containers: []corev1.Container{{
5050
Name: Component,
51-
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.Dashboard.Version),
51+
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.Dashboard.Version, &ctx.Config),
5252
ImagePullPolicy: corev1.PullIfNotPresent,
5353
Resources: corev1.ResourceRequirements{
5454
Requests: corev1.ResourceList{

‎install/installer/pkg/components/database/cloudsql/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
6565
Privileged: pointer.Bool(false),
6666
RunAsNonRoot: pointer.Bool(false),
6767
},
68-
Image: common.ImageName(ImageRepo, ImageName, ImageVersion),
68+
Image: common.ImageName(ImageRepo, ImageName, ImageVersion, &ctx.Config),
6969
Command: []string{
7070
"/cloud_sql_proxy",
7171
"-dir=/cloudsql",

‎install/installer/pkg/components/database/incluster/helm.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,15 @@ var Helm = common.CompositeHelmFunc(
3434
helm.KeyValue("mysql.initdbScriptsConfigMap", SQLInitScripts),
3535
helm.KeyValue("mysql.serviceAccount.name", Component),
3636
helm.ImagePullSecrets("mysql.image.pullSecrets", cfg),
37-
helm.KeyValue("mysql.image.registry", common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL)),
37+
helm.KeyValue("mysql.image.registry", ""),
38+
helm.KeyValue("mysql.image.repository", common.RepoName(common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL), "bitnami/mysql", &cfg.Config)),
3839
helm.ImagePullSecrets("mysql.metrics.image.pullSecrets", cfg),
39-
helm.KeyValue("mysql.metrics.image.registry", common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL)),
40+
helm.KeyValue("mysql.metrics.image.registry", ""),
41+
helm.KeyValue("mysql.metrics.image.repository", common.RepoName(common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL), "bitnami/bitnami-shell", &cfg.Config)),
4042
helm.ImagePullSecrets("mysql.volumePermissions.image.pullSecrets", cfg),
4143
helm.KeyValue("mysql.volumePermissions.image.pullPolicy", "IfNotPresent"),
42-
helm.KeyValue("mysql.volumePermissions.image.registry", common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL)),
44+
helm.KeyValue("mysql.volumePermissions.image.registry", ""),
45+
helm.KeyValue("mysql.volumePermissions.image.repository", common.RepoName(common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL), "bitnami/mysqld-exporter", &cfg.Config)),
4346

4447
// improve start time
4548
helm.KeyValue("mysql.primary.startupProbe.enabled", "false"),

‎install/installer/pkg/components/database/init/job.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func job(ctx *common.RenderContext) ([]runtime.Object, error) {
4747
InitContainers: []corev1.Container{*common.DatabaseWaiterContainer(ctx)},
4848
Containers: []corev1.Container{{
4949
Name: fmt.Sprintf("%s-session", Component),
50-
Image: common.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, ""), dbSessionsImage, dbSessionsTag),
50+
Image: common.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, ""), dbSessionsImage, dbSessionsTag, &ctx.Config),
5151
ImagePullPolicy: corev1.PullIfNotPresent,
5252
Env: common.MergeEnv(
5353
common.DatabaseEnv(&ctx.Config),

‎install/installer/pkg/components/docker-registry/helm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var Helm = common.CompositeHelmFunc(
2323
return nil, err
2424
}
2525

26-
repository := fmt.Sprintf("%s/library/registry", common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL))
26+
repository := common.RepoName(common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL), "library/registry", &cfg.Config)
2727

2828
registryValues := []string{
2929
helm.KeyValue(fmt.Sprintf("docker-registry.podAnnotations.%s", strings.Replace(common.AnnotationConfigChecksum, ".", "\\.", -1)), secretHash),

‎install/installer/pkg/components/gitpod/cronjob.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func cronjob(ctx *common.RenderContext) ([]runtime.Object, error) {
5353
Containers: []v1.Container{
5454
{
5555
Name: installationTelemetryComponent,
56-
Image: common.ImageName(ctx.Config.Repository, "installation-telemetry", ctx.VersionManifest.Components.InstallationTelemetry.Version),
56+
Image: common.ImageName(ctx.Config.Repository, "installation-telemetry", ctx.VersionManifest.Components.InstallationTelemetry.Version, &ctx.Config),
5757
ImagePullPolicy: v1.PullIfNotPresent,
5858
Args: []string{
5959
"send",

‎install/installer/pkg/components/ide-proxy/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
4848
TerminationGracePeriodSeconds: pointer.Int64(30),
4949
Containers: []corev1.Container{{
5050
Name: Component,
51-
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.IDEProxy.Version),
51+
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.IDEProxy.Version, &ctx.Config),
5252
ImagePullPolicy: corev1.PullIfNotPresent,
5353
Resources: corev1.ResourceRequirements{
5454
Requests: corev1.ResourceList{

‎install/installer/pkg/components/image-builder-mk3/configmap.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
4949
PullSecret: secretName,
5050
PullSecretFile: PullSecretFile,
5151
BaseImageRepository: fmt.Sprintf("%s/base-images", registryName),
52-
BuilderImage: common.ImageName(ctx.Config.Repository, BuilderImage, ctx.VersionManifest.Components.ImageBuilderMk3.BuilderImage.Version),
52+
BuilderImage: common.ImageName(ctx.Config.Repository, BuilderImage, ctx.VersionManifest.Components.ImageBuilderMk3.BuilderImage.Version, &ctx.Config),
5353
WorkspaceImageRepository: fmt.Sprintf("%s/workspace-images", registryName),
5454
}
5555

@@ -58,7 +58,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
5858
RefCache: config.RefCacheConfig{
5959
Interval: util.Duration(time.Hour * 6).String(),
6060
Refs: []string{
61-
common.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, ""), workspace.DefaultWorkspaceImage, workspace.DefaultWorkspaceImageVersion),
61+
common.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, ""), workspace.DefaultWorkspaceImage, workspace.DefaultWorkspaceImageVersion, &ctx.Config),
6262
},
6363
},
6464
Service: config.Service{

‎install/installer/pkg/components/image-builder-mk3/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
118118
},
119119
Containers: []corev1.Container{{
120120
Name: Component,
121-
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.ImageBuilderMk3.Version),
121+
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.ImageBuilderMk3.Version, &ctx.Config),
122122
ImagePullPolicy: corev1.PullIfNotPresent,
123123
Args: []string{
124124
"run",

‎install/installer/pkg/components/migrations/job.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func job(ctx *common.RenderContext) ([]runtime.Object, error) {
3737
InitContainers: []corev1.Container{*common.DatabaseWaiterContainer(ctx)},
3838
Containers: []corev1.Container{{
3939
Name: Component,
40-
Image: common.ImageName(ctx.Config.Repository, "db-migrations", ctx.VersionManifest.Components.DBMigrations.Version),
40+
Image: common.ImageName(ctx.Config.Repository, "db-migrations", ctx.VersionManifest.Components.DBMigrations.Version, &ctx.Config),
4141
ImagePullPolicy: corev1.PullIfNotPresent,
4242
Env: common.MergeEnv(
4343
common.DatabaseEnv(&ctx.Config),

‎install/installer/pkg/components/minio/helm.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ var Helm = common.CompositeHelmFunc(
1818
func(cfg *common.RenderContext) ([]string, error) {
1919
commonHelmValues := []string{
2020
helm.ImagePullSecrets("minio.image.pullSecrets", cfg),
21-
helm.KeyValue("minio.image.registry", common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL)),
21+
helm.KeyValue("minio.image.registry", ""),
22+
helm.KeyValue("minio.image.repository", common.RepoName(common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL), "bitnami/minio", &cfg.Config)),
2223
helm.ImagePullSecrets("minio.volumePermissions.image.pullSecrets", cfg),
23-
helm.KeyValue("minio.volumePermissions.image.registry", common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL)),
24+
helm.KeyValue("minio.volumePermissions.image.registry", ""),
25+
helm.KeyValue("minio.volumePermissions.image.repository", common.RepoName(common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL), "bitnami/bitnami-shell", &cfg.Config)),
2426
}
2527

2628
if pointer.BoolDeref(cfg.Config.ObjectStorage.InCluster, false) {

‎install/installer/pkg/components/openvsx-proxy/statefulset.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func statefulset(ctx *common.RenderContext) ([]runtime.Object, error) {
6868
}},
6969
Containers: []v1.Container{{
7070
Name: Component,
71-
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.OpenVSXProxy.Version),
71+
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.OpenVSXProxy.Version, &ctx.Config),
7272
Args: []string{"/config/config.json"},
7373
ReadinessProbe: &v1.Probe{
7474
ProbeHandler: v1.ProbeHandler{

‎install/installer/pkg/components/proxy/deployment.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
130130
Volumes: volumes,
131131
InitContainers: []corev1.Container{{
132132
Name: "sysctl",
133-
Image: common.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, common.DockerRegistryURL), InitContainerImage, InitContainerTag),
133+
Image: common.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, common.DockerRegistryURL), InitContainerImage, InitContainerTag, &ctx.Config),
134134
ImagePullPolicy: corev1.PullIfNotPresent,
135135
SecurityContext: &corev1.SecurityContext{
136136
Privileged: pointer.Bool(true),
@@ -143,7 +143,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
143143
}},
144144
Containers: []corev1.Container{{
145145
Name: "kube-rbac-proxy",
146-
Image: common.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, KubeRBACProxyRepo), KubeRBACProxyImage, KubeRBACProxyTag),
146+
Image: common.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, KubeRBACProxyRepo), KubeRBACProxyImage, KubeRBACProxyTag, &ctx.Config),
147147
ImagePullPolicy: corev1.PullIfNotPresent,
148148
Args: []string{
149149
"--v=10",
@@ -178,7 +178,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
178178
},
179179
}, {
180180
Name: Component,
181-
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.Proxy.Version),
181+
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.Proxy.Version, &ctx.Config),
182182
ImagePullPolicy: corev1.PullIfNotPresent,
183183
Resources: corev1.ResourceRequirements{
184184
Requests: corev1.ResourceList{

‎install/installer/pkg/components/rabbitmq/helm.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,11 @@ var Helm = common.CompositeHelmFunc(
196196
helm.KeyValue(fmt.Sprintf("rabbitmq.extraSecrets.%s.username", InClusterDbSecret), username),
197197
helm.KeyValue(fmt.Sprintf("rabbitmq.extraSecrets.%s.password", InClusterDbSecret), password),
198198
helm.ImagePullSecrets("rabbitmq.image.pullSecrets", cfg),
199-
helm.KeyValue("rabbitmq.image.registry", common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL)),
199+
helm.KeyValue("rabbitmq.image.registry", ""),
200+
helm.KeyValue("rabbitmq.image.repository", common.RepoName(common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL), "bitnami/rabbitmq", &cfg.Config)),
200201
helm.ImagePullSecrets("volumePermissions.image.pullSecrets", cfg),
201-
helm.KeyValue("rabbitmq.volumePermissions.image.registry", common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL)),
202+
helm.KeyValue("rabbitmq.volumePermissions.image.registry", ""),
203+
helm.KeyValue("rabbitmq.volumePermissions.image.repository", common.RepoName(common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL), "bitnami/bitnami-shell", &cfg.Config)),
202204

203205
helm.KeyValue("rabbitmq.livenessProbe.initialDelaySeconds", "30"),
204206
},

‎install/installer/pkg/components/registry-facade/configmap.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
6060
RequireAuth: false,
6161
StaticLayer: []regfac.StaticLayerCfg{
6262
{
63-
Ref: common.ImageName(ctx.Config.Repository, SupervisorImage, ctx.VersionManifest.Components.Workspace.Supervisor.Version),
63+
Ref: common.ImageName(ctx.Config.Repository, SupervisorImage, ctx.VersionManifest.Components.Workspace.Supervisor.Version, &ctx.Config),
6464
Type: "image",
6565
},
6666
{
67-
Ref: common.ImageName(ctx.Config.Repository, WorkspacekitImage, ctx.VersionManifest.Components.Workspace.Workspacekit.Version),
67+
Ref: common.ImageName(ctx.Config.Repository, WorkspacekitImage, ctx.VersionManifest.Components.Workspace.Workspacekit.Version, &ctx.Config),
6868
Type: "image",
6969
},
7070
{
71-
Ref: common.ImageName(ctx.Config.Repository, DockerUpImage, ctx.VersionManifest.Components.Workspace.DockerUp.Version),
71+
Ref: common.ImageName(ctx.Config.Repository, DockerUpImage, ctx.VersionManifest.Components.Workspace.DockerUp.Version, &ctx.Config),
7272
Type: "image",
7373
},
7474
},

‎install/installer/pkg/components/registry-facade/daemonset.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
167167
},
168168
Containers: []corev1.Container{{
169169
Name: Component,
170-
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.RegistryFacade.Version),
170+
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.RegistryFacade.Version, &ctx.Config),
171171
ImagePullPolicy: corev1.PullIfNotPresent,
172172
Args: []string{"run", "/mnt/config/config.json"},
173173
Resources: corev1.ResourceRequirements{

‎install/installer/pkg/components/server/configmap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
3737
TimeoutSeconds: 300,
3838
},
3939
WorkspaceDefaults: WorkspaceDefaults{
40-
WorkspaceImage: common.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, ""), workspace.DefaultWorkspaceImage, workspace.DefaultWorkspaceImageVersion),
40+
WorkspaceImage: common.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, ""), workspace.DefaultWorkspaceImage, workspace.DefaultWorkspaceImageVersion, &ctx.Config),
4141
PreviewFeatureFlags: []NamedWorkspaceFeatureFlag{},
4242
DefaultFeatureFlags: []NamedWorkspaceFeatureFlag{},
4343
TimeoutDefault: ctx.Config.Workspace.TimeoutDefault,

‎install/installer/pkg/components/server/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
169169
InitContainers: []corev1.Container{*common.DatabaseWaiterContainer(ctx), *common.MessageBusWaiterContainer(ctx)},
170170
Containers: []corev1.Container{{
171171
Name: Component,
172-
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.Server.Version),
172+
Image: common.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.Server.Version, &ctx.Config),
173173
ImagePullPolicy: corev1.PullIfNotPresent,
174174
Resources: corev1.ResourceRequirements{
175175
Requests: corev1.ResourceList{

0 commit comments

Comments
 (0)