0001-Remove-proxy.patch

From d563089d05e75c71e3f62bbc031400a2c07012c7 Mon Sep 17 00:00:00 2001
From: Ilya Semenov <[email protected]>
Date: Tue, 13 Jun 2017 18:49:41 +0700
Subject: [PATCH] Remove proxy

---
 charts/builder/templates/builder-deployment.yaml   |  5 --
 .../templates/controller-deployment.yaml           |  5 --
 .../templates/registry-proxy-daemon.yaml           | 59 ----------------------
 requirements.lock                                  |  7 ---
 requirements.yaml                                  |  3 --
 5 files changed, 79 deletions(-)
 delete mode 100755 charts/registry-proxy/templates/registry-proxy-daemon.yaml

diff --git a/charts/builder/templates/builder-deployment.yaml b/charts/builder/templates/builder-deployment.yaml
index d5ea4a0..12c0a03 100755
--- a/charts/builder/templates/builder-deployment.yaml
+++ b/charts/builder/templates/builder-deployment.yaml
@@ -42,11 +42,6 @@ spec:
 {{- end}}
 {{- end}}
           env:
-            # NOTE(bacongobbler): use deis/registry_proxy to work around Docker --insecure-registry requirements
-            - name: "DEIS_REGISTRY_SERVICE_HOST"
-              value: "127.0.0.1"
-            - name: "DEIS_REGISTRY_SERVICE_PORT"
-              value: "{{ .Values.global.host_port }}"
             - name: "HEALTH_SERVER_PORT"
               value: "8092"
             - name: "EXTERNAL_PORT"
diff --git a/charts/controller/templates/controller-deployment.yaml b/charts/controller/templates/controller-deployment.yaml
index 82732ed..55c0d49 100755
--- a/charts/controller/templates/controller-deployment.yaml
+++ b/charts/controller/templates/controller-deployment.yaml
@@ -55,9 +55,6 @@ spec:
           env:
             - name: REGISTRATION_MODE
               value: {{ .Values.registration_mode }}
-            # NOTE(bacongobbler): use deis/registry_proxy to work around Docker --insecure-registry requirements
-            - name: "DEIS_REGISTRY_SERVICE_HOST"
-              value: "127.0.0.1"
             # Environmental variable value for $EXPERIMENTAL_NATIVE_INGRESS
             - name: "EXPERIMENTAL_NATIVE_INGRESS"
               value: "{{ .Values.global.experimental_native_ingress }}"
@@ -65,8 +62,6 @@ spec:
               value: "{{ .Values.platform_domain }}"
             - name: "K8S_API_VERIFY_TLS"
               value: "{{ .Values.k8s_api_verify_tls }}"
-            - name: "DEIS_REGISTRY_SERVICE_PORT"
-              value: "{{ .Values.global.host_port }}"
             - name: "APP_STORAGE"
               value: "{{ .Values.global.storage}}"
             - name: "DEIS_REGISTRY_LOCATION"
diff --git a/charts/registry-proxy/templates/registry-proxy-daemon.yaml b/charts/registry-proxy/templates/registry-proxy-daemon.yaml
deleted file mode 100755
index dbbcf17..0000000
--- a/charts/registry-proxy/templates/registry-proxy-daemon.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-{{- if eq .Values.global.registry_location "on-cluster" }}
-apiVersion: extensions/v1beta1
-kind: DaemonSet
-metadata:
-  name: deis-registry-proxy
-  labels:
-    heritage: deis
-  annotations:
-    component.deis.io/version: {{ .Values.docker_tag }}
-spec:
-  {{- if ge .Capabilities.KubeVersion.Minor "6" }}
-  updateStrategy:
-    type: RollingUpdate
-  {{- end }}
-  selector:
-    matchLabels:
-      app: deis-registry-proxy
-      heritage: deis
-  template:
-    metadata:
-      name: deis-registry-proxy
-      labels:
-        heritage: deis
-        app: deis-registry-proxy
-    spec:
-{{- if (.Values.global.use_cni) }}
-      hostNetwork: true
-{{- end}}
-      containers:
-      - name: deis-registry-proxy
-        image: quay.io/{{.Values.org}}/registry-proxy:{{.Values.docker_tag}}
-        imagePullPolicy: {{.Values.pull_policy}}
-{{- if or (.Values.limits_cpu) (.Values.limits_memory)}}
-        resources:
-          limits:
-{{- if (.Values.limits_cpu) }}
-            cpu: {{.Values.limits_cpu}}
-{{- end}}
-{{- if (.Values.limits_memory) }}
-            memory: {{.Values.limits_memory}}
-{{- end}}
-{{- end}}
-        env:
-        - name: REGISTRY_HOST
-          value: $(DEIS_REGISTRY_SERVICE_HOST)
-        - name: REGISTRY_PORT
-          value: $(DEIS_REGISTRY_SERVICE_PORT)
-        - name: BIND_ADDR
-{{- if (.Values.global.use_cni) }}
-          value: {{ default "127.0.0.1:5555" .Values.global.registry_proxy_bind_addr | quote }}
-{{- else }}
-          value: {{ default "80" .Values.global.registry_proxy_bind_addr | quote }}
-{{- end }}
-{{- if not (.Values.global.use_cni) }}
-        ports:
-        - containerPort: 80
-          hostPort: {{.Values.global.host_port}}
-{{- end }}
-{{- end }}
diff --git a/requirements.lock b/requirements.lock
index d7efb2a..b0f409f 100755
--- a/requirements.lock
+++ b/requirements.lock
@@ -93,13 +93,6 @@ dependencies:
 - condition: ""
   enabled: false
   import-values: null
-  name: registry-proxy
-  repository: https://charts.deis.com/registry-proxy
-  tags: null
-  version: v1.3.1
-- condition: ""
-  enabled: false
-  import-values: null
   name: registry-token-refresher
   repository: https://charts.deis.com/registry-token-refresher
   tags: null
diff --git a/requirements.yaml b/requirements.yaml
index bd270b0..858b4ee 100755
--- a/requirements.yaml
+++ b/requirements.yaml
@@ -38,9 +38,6 @@ dependencies:
   - name: registry
     version: "v2.4.2"
     repository: https://charts.deis.com/registry
-  - name: registry-proxy
-    version: "v1.3.1"
-    repository: https://charts.deis.com/registry-proxy
   - name: registry-token-refresher
     version: "v1.1.3"
     repository: https://charts.deis.com/registry-token-refresher
-- 
2.12.0