Skip to content

Commit 6146245

Browse files
committed
fix: allow cockroack to pull with docker creds
1 parent 54dcb8a commit 6146245

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

infra/tf/k8s_infra/cockroachdb.tf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,13 @@ resource "helm_release" "cockroachdb" {
7070
]
7171
}
7272
}
73-
73+
image = {
74+
credentials = var.authenticate_all_docker_hub_pulls ? {
75+
registry = "https://index.docker.io/v1/"
76+
username = module.docker_auth.docker_secrets[0].values["docker/registry/docker.io/read/username"]
77+
password = module.docker_auth.docker_secrets[0].values["docker/registry/docker.io/read/password"]
78+
} : null
79+
}
7480
serviceMonitor = {
7581
# TODO: Doesn't work without insecure TLS
7682
enabled = false

infra/tf/k8s_infra/init.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ module "docker_auth" {
2121
kubernetes_namespace.rivet_service,
2222
],
2323
var.imagor_enabled ? [kubernetes_namespace.imagor.0] : [],
24-
var.nsfw_api_enabled ? [kubernetes_namespace.nsfw_api.0] : []
24+
var.nsfw_api_enabled ? [kubernetes_namespace.nsfw_api.0] : [],
25+
local.cockroachdb_k8s ? [kubernetes_namespace.cockroachdb.0] : [],
2526
]) :
2627
x.metadata.0.name
2728
]

infra/tf/modules/k8s_auth/main.tf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ resource "kubernetes_secret" "docker_auth" {
3333
".dockerconfigjson" = jsonencode({
3434
auths = {
3535
"https://index.docker.io/v1/" = (
36-
var.authenticate_all_docker_hub_pulls ?
37-
{
38-
auth = base64encode(
39-
"${module.docker_secrets.values["docker/registry/docker.io/read/username"]}:${module.docker_secrets.values["docker/registry/docker.io/read/password"]}"
40-
)
41-
}
42-
: null
36+
var.authenticate_all_docker_hub_pulls ?
37+
{
38+
auth = base64encode(
39+
"${module.docker_secrets[0].values["docker/registry/docker.io/read/username"]}:${module.docker_secrets[0].values["docker/registry/docker.io/read/password"]}"
40+
)
41+
}
42+
: null
4343
)
4444
"ghcr.io" = (
4545
var.deploy_method_cluster ?

0 commit comments

Comments
 (0)