Skip to content

Commit

Permalink
k8s, terraform: Remove Docker config for private images
Browse files Browse the repository at this point in the history
  • Loading branch information
Jannis committed Dec 22, 2020
1 parent df8d58a commit dd1c545
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 45 deletions.
3 changes: 0 additions & 3 deletions k8s/base/indexer-agent/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ spec:
prometheus.io/path: "/metrics"
prometheus.io/port: "7300"
spec:
# Temporary: Allow to pull private Docker images
imagePullSecrets:
- name: docker-registry
containers:
- name: indexer-agent
image: indexer-agent-image
Expand Down
3 changes: 0 additions & 3 deletions k8s/base/indexer-service/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ spec:
prometheus.io/path: "/metrics"
prometheus.io/port: "7300"
spec:
# Temporary: Allow to pull private Docker images
imagePullSecrets:
- name: docker-registry
containers:
- name: indexer-service
image: indexer-service-image
Expand Down
10 changes: 0 additions & 10 deletions terraform/docker-config.json

This file was deleted.

29 changes: 0 additions & 29 deletions terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -262,35 +262,6 @@ resource "kubernetes_secret" "free-query-auth-token" {
}
}

#
# Temporary: Secret for pulling private Docker Hub images
#

resource "kubernetes_secret" "docker-registry" {
metadata {
name = "docker-registry"
}
data = {
".dockerconfigjson" = "${data.template_file.docker_config_script.rendered}"
}

type = "kubernetes.io/dockerconfigjson"
}

#
# Temporary: Docker config for pulling private Docker Hub images
#
data "template_file" "docker_config_script" {
template = "${file("${path.module}/docker-config.json")}"
vars = {
docker-server = "registry.hub.docker.com"
docker-username = var.dockerhub_username
docker-password = var.dockerhub_password
docker-email = var.dockerhub_email
auth = base64encode("${var.dockerhub_username}:${var.dockerhub_password}")
}
}

#
# Persistent disks
#
Expand Down

0 comments on commit dd1c545

Please sign in to comment.