Created
October 20, 2016 20:17
-
-
Save zinuzoid/621dc94e848f8f390c787c307e848ed2 to your computer and use it in GitHub Desktop.
Remove Deis registry proxy due to coreos bug
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/workflow-dev/tpl/deis-builder-deployment.yaml b/workflow-dev/tpl/deis-builder-deployment.yaml | |
index 3ae3502..5b02a77 100644 | |
--- a/workflow-dev/tpl/deis-builder-deployment.yaml | |
+++ b/workflow-dev/tpl/deis-builder-deployment.yaml | |
@@ -45,11 +45,6 @@ spec: | |
{{- end}} | |
{{- end}} | |
env: | |
- # NOTE(bacongobbler): use deis/registry-proxy to work around Docker --insecure-registry requirements | |
- - name: "DEIS_REGISTRY_SERVICE_HOST" | |
- value: "localhost" | |
- - name: "DEIS_REGISTRY_SERVICE_PORT" | |
- value: "{{.registry_proxy.hostPort}}" | |
- name: "HEALTH_SERVER_PORT" | |
value: "8092" | |
- name: "EXTERNAL_PORT" | |
diff --git a/workflow-dev/tpl/deis-controller-deployment.yaml b/workflow-dev/tpl/deis-controller-deployment.yaml | |
index 0fd4594..1acc868 100644 | |
--- a/workflow-dev/tpl/deis-controller-deployment.yaml | |
+++ b/workflow-dev/tpl/deis-controller-deployment.yaml | |
@@ -59,11 +59,6 @@ spec: | |
# NOTE(jchauncey): see tpl/generate_params.toml for possible values | |
- name: REGISTRATION_MODE | |
value: {{ .controller.registrationMode }} | |
- # NOTE(bacongobbler): use deis/registry-proxy to work around Docker --insecure-registry requirements | |
- - name: "DEIS_REGISTRY_SERVICE_HOST" | |
- value: "localhost" | |
- - name: "DEIS_REGISTRY_SERVICE_PORT" | |
- value: "{{.registry_proxy.hostPort}}" | |
- name: KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS | |
value: "5" | |
- name: "APP_STORAGE" | |
diff --git a/workflow-dev/tpl/deis-registry-proxy-daemon.yaml b/workflow-dev/tpl/deis-registry-proxy-daemon.yaml | |
deleted file mode 100644 | |
index 643c272..0000000 | |
--- a/workflow-dev/tpl/deis-registry-proxy-daemon.yaml | |
+++ /dev/null | |
@@ -1,43 +0,0 @@ | |
-apiVersion: extensions/v1beta1 | |
-kind: DaemonSet | |
-metadata: | |
- name: deis-registry-proxy | |
- namespace: deis | |
- labels: | |
- heritage: deis | |
- annotations: | |
- component.deis.io/version: {{env "REGISTRY_PROXY_GIT_TAG" | default .registry_proxy.dockerTag}} | |
-spec: | |
- selector: | |
- matchLabels: | |
- app: deis-registry-proxy | |
- heritage: deis | |
- template: | |
- metadata: | |
- name: deis-registry-proxy | |
- labels: | |
- heritage: deis | |
- app: deis-registry-proxy | |
- spec: | |
- containers: | |
- - name: deis-registry-proxy | |
- image: quay.io/{{.registry_proxy.org}}/registry-proxy:{{env "REGISTRY_PROXY_GIT_TAG" | default .registry_proxy.dockerTag}} | |
- imagePullPolicy: {{.registry_proxy.pullPolicy}} | |
-{{- if or (.registry_proxy.limits_cpu) (.registry_proxy.limits_memory)}} | |
- resources: | |
- limits: | |
-{{- if (.registry_proxy.limits_cpu) }} | |
- cpu: {{.registry_proxy.limits_cpu }} | |
-{{- end}} | |
-{{- if (.registry_proxy.limits_memory) }} | |
- memory: {{.registry_proxy.limits_memory }} | |
-{{- end}} | |
-{{- end}} | |
- env: | |
- - name: REGISTRY_HOST | |
- value: $(DEIS_REGISTRY_SERVICE_HOST) | |
- - name: REGISTRY_PORT | |
- value: $(DEIS_REGISTRY_SERVICE_PORT) | |
- ports: | |
- - containerPort: 80 | |
- hostPort: {{.registry_proxy.hostPort}} | |
diff --git a/workflow-dev/tpl/storage.sh b/workflow-dev/tpl/storage.sh | |
index 010ceb4..b080895 100755 | |
--- a/workflow-dev/tpl/storage.sh | |
+++ b/workflow-dev/tpl/storage.sh | |
@@ -30,7 +30,6 @@ rm -rf $HELM_GENERATE_DIR/manifests/deis-registry-* | |
if [ "$REGISTRY_LOCATION" = "on-cluster" ] || ( [ -z "$REGISTRY_LOCATION" ] && [ "$registry_location" = "on-cluster" ] ); then | |
helmc tpl -d $HELM_GENERATE_DIR/tpl/generate_params.toml -o $HELM_GENERATE_DIR/manifests/deis-registry-rc.yaml $HELM_GENERATE_DIR/tpl/deis-registry-rc.yaml | |
helmc tpl -d $HELM_GENERATE_DIR/tpl/generate_params.toml -o $HELM_GENERATE_DIR/manifests/deis-registry-deployment.yaml $HELM_GENERATE_DIR/tpl/deis-registry-deployment.yaml | |
- helmc tpl -d $HELM_GENERATE_DIR/tpl/generate_params.toml -o $HELM_GENERATE_DIR/manifests/deis-registry-proxy.yaml $HELM_GENERATE_DIR/tpl/deis-registry-proxy-daemon.yaml | |
cp $HELM_GENERATE_DIR/tpl/deis-registry-service* $HELM_GENERATE_DIR/manifests/ | |
else | |
helmc tpl -d $HELM_GENERATE_DIR/tpl/generate_params.toml -o $HELM_GENERATE_DIR/manifests/deis-registry-secret.yaml $HELM_GENERATE_DIR/tpl/deis-registry-secret.yaml |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment