Skip to content

Commit 2c40a53

Browse files
author
Simon Emms
committed
[installer]: add image pull secrets to third-party container images
1 parent a1901c9 commit 2c40a53

File tree

14 files changed

+25
-16
lines changed

14 files changed

+25
-16
lines changed

‎installer/pkg/common/common.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,10 @@ func MessageBusWaiterContainer(ctx *RenderContext) *corev1.Container {
264264
}
265265
}
266266

267-
func KubeRBACProxyContainer() *corev1.Container {
267+
func KubeRBACProxyContainer(ctx *RenderContext) *corev1.Container {
268268
return &corev1.Container{
269269
Name: "kube-rbac-proxy",
270-
Image: "quay.io/brancz/kube-rbac-proxy:v0.11.0",
270+
Image: ImageName(ThirdPartyContainerRepo(ctx.Config.Repository, KubeRBACProxyRepo), KubeRBACProxyImage, KubeRBACProxyTag),
271271
Args: []string{
272272
"--v=5",
273273
"--logtostderr",

‎installer/pkg/common/constants.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,13 @@ const (
1616
BlobServeServicePort = 4000
1717
CertManagerCAIssuer = "ca-issuer"
1818
DockerRegistryName = "registry"
19+
GitpodContainerRegistry = "eu.gcr.io/gitpod-core-dev/build"
1920
InClusterDbSecret = "mysql"
2021
InClusterMessageQueueName = "rabbitmq"
2122
InClusterMessageQueueTLS = "messagebus-certificates-secret-core"
23+
KubeRBACProxyRepo = "quay.io/brancz"
24+
KubeRBACProxyImage = "kube-rbac-proxy"
25+
KubeRBACProxyTag = "v0.11.0"
2226
MinioServiceAPIPort = 9000
2327
MonitoringChart = "monitoring"
2428
ProxyComponent = "proxy"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
7878
Privileged: pointer.Bool(true),
7979
ProcMount: func() *corev1.ProcMountType { r := corev1.DefaultProcMount; return &r }(),
8080
},
81-
}, *common.KubeRBACProxyContainer()},
81+
}, *common.KubeRBACProxyContainer(ctx)},
8282
Volumes: []corev1.Volume{{
8383
Name: "config",
8484
VolumeSource: corev1.VolumeSource{ConfigMap: &corev1.ConfigMapVolumeSource{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
125125
MountPath: "/mnt/pull-secret.json",
126126
SubPath: ".dockerconfigjson",
127127
}},
128-
}, *common.KubeRBACProxyContainer()},
128+
}, *common.KubeRBACProxyContainer(ctx)},
129129
},
130130
},
131131
},

‎installer/pkg/components/database/init/constants.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package init
66

77
const (
88
Component = "dbinit"
9+
dbSessionsRepo = "docker.io"
910
dbSessionsImage = "mysql"
1011
dbSessionsTag = "5.7.34"
1112
initScriptDir = "files"

‎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: fmt.Sprintf("%s:%s", dbSessionsImage, dbSessionsTag),
50+
Image: common.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, dbSessionsRepo), dbSessionsImage, dbSessionsTag),
5151
ImagePullPolicy: corev1.PullIfNotPresent,
5252
Env: common.MergeEnv(
5353
common.DatabaseEnv(&ctx.Config),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
162162
*common.InternalCAVolumeMount(),
163163
},
164164
},
165-
*common.KubeRBACProxyContainer(),
165+
*common.KubeRBACProxyContainer(ctx),
166166
},
167167
},
168168
},

‎installer/pkg/components/proxy/constants.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@ const (
1313
ContainerHTTPSPort = common.ProxyContainerHTTPSPort
1414
ContainerHTTPSName = common.ProxyContainerHTTPSName
1515
PrometheusPort = 9500
16-
InitContainerImage = "alpine:3.14"
17-
KubeRBACProxyImage = "quay.io/brancz/kube-rbac-proxy:v0.11.0"
16+
InitContainerRepo = "docker.io"
17+
InitContainerImage = "alpine"
18+
InitContainerTag = "3.14"
19+
KubeRBACProxyRepo = common.KubeRBACProxyRepo
20+
KubeRBACProxyImage = common.KubeRBACProxyImage
21+
KubeRBACProxyTag = common.KubeRBACProxyTag
1822
MetricsContainerName = "metrics"
1923
ReadinessPort = 8003
2024
RegistryAuthSecret = common.RegistryAuthSecret

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
129129
Volumes: volumes,
130130
InitContainers: []corev1.Container{{
131131
Name: "sysctl",
132-
Image: InitContainerImage,
132+
Image: common.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, InitContainerRepo), InitContainerImage, InitContainerTag),
133133
ImagePullPolicy: corev1.PullIfNotPresent,
134134
SecurityContext: &corev1.SecurityContext{
135135
Privileged: pointer.Bool(true),
@@ -142,7 +142,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
142142
}},
143143
Containers: []corev1.Container{{
144144
Name: "kube-rbac-proxy",
145-
Image: KubeRBACProxyImage,
145+
Image: common.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, KubeRBACProxyRepo), KubeRBACProxyImage, KubeRBACProxyTag),
146146
ImagePullPolicy: corev1.PullIfNotPresent,
147147
Args: []string{
148148
"--v=10",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
176176
}, volumeMounts...),
177177
},
178178

179-
*common.KubeRBACProxyContainer(),
179+
*common.KubeRBACProxyContainer(ctx),
180180
},
181181
Volumes: append([]corev1.Volume{{
182182
Name: "cache",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
149149
MountPath: "/ws-manager-client-tls-certs",
150150
ReadOnly: true,
151151
}},
152-
}, *common.KubeRBACProxyContainer()},
152+
}, *common.KubeRBACProxyContainer(ctx)},
153153
},
154154
},
155155
},

‎installer/pkg/components/ws-daemon/daemonset.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
3232
initContainers := []corev1.Container{
3333
{
3434
Name: "disable-kube-health-monitor",
35-
Image: "ubuntu:20.04",
35+
Image: common.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, "docker.io"), "ubuntu", "20.04"),
3636
Command: []string{
3737
"/usr/bin/nsenter",
3838
"-t",
@@ -281,7 +281,7 @@ fi
281281
Privileged: pointer.Bool(true),
282282
},
283283
},
284-
*common.KubeRBACProxyContainer(),
284+
*common.KubeRBACProxyContainer(ctx),
285285
},
286286
RestartPolicy: "Always",
287287
TerminationGracePeriodSeconds: pointer.Int64(30),

‎installer/pkg/components/ws-manager-bridge/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
121121
MountPath: "/ws-manager-client-tls-certs",
122122
ReadOnly: true,
123123
}},
124-
}, *common.KubeRBACProxyContainer()},
124+
}, *common.KubeRBACProxyContainer(ctx)},
125125
},
126126
},
127127
},

‎installer/pkg/components/ws-scheduler/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
9696
MountPath: "/ws-manager-client-tls-certs",
9797
ReadOnly: true,
9898
}},
99-
}, *common.KubeRBACProxyContainer()},
99+
}, *common.KubeRBACProxyContainer(ctx)},
100100
},
101101
},
102102
},

0 commit comments

Comments
 (0)