From dd1c545412ff33d1880ebb43306122b447f5be8c Mon Sep 17 00:00:00 2001
From: Jannis Pohlmann <jannis@thegraph.com>
Date: Tue, 22 Dec 2020 15:26:13 +0100
Subject: [PATCH] k8s, terraform: Remove Docker config for private images

---
 k8s/base/indexer-agent/deployment.yaml   |  3 ---
 k8s/base/indexer-service/deployment.yaml |  3 ---
 terraform/docker-config.json             | 10 --------
 terraform/main.tf                        | 29 ------------------------
 4 files changed, 45 deletions(-)
 delete mode 100644 terraform/docker-config.json

diff --git a/k8s/base/indexer-agent/deployment.yaml b/k8s/base/indexer-agent/deployment.yaml
index 434330697..93d5c7225 100644
--- a/k8s/base/indexer-agent/deployment.yaml
+++ b/k8s/base/indexer-agent/deployment.yaml
@@ -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
diff --git a/k8s/base/indexer-service/deployment.yaml b/k8s/base/indexer-service/deployment.yaml
index 50128e83b..50ffdb018 100644
--- a/k8s/base/indexer-service/deployment.yaml
+++ b/k8s/base/indexer-service/deployment.yaml
@@ -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
diff --git a/terraform/docker-config.json b/terraform/docker-config.json
deleted file mode 100644
index 8e858a15c..000000000
--- a/terraform/docker-config.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "auths": {
-    "${docker-server}": {
-      "username": "${docker-username}",
-      "password": "${docker-password}",
-      "email": "${docker-email}",
-      "auth": "${auth}"
-    }
-  }
-}
diff --git a/terraform/main.tf b/terraform/main.tf
index 7d47b9902..30426fde7 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -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
 #