Skip to content

Commit

Permalink
feat(workflow-dev): re-introduce registry-proxy
Browse files Browse the repository at this point in the history
This re-introduces registry-proxy to the workflow components, though this time we are using
Docker's recommendations in docker/distribution's `contrib/` section.

See https://github.com/deis/registry-proxy
  • Loading branch information
Matthew Fisher committed Jul 28, 2016
1 parent 4e089ad commit 78e77cb
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 1 deletion.
7 changes: 6 additions & 1 deletion workflow-dev/tpl/deis-builder-deployment.yaml
Expand Up @@ -32,13 +32,18 @@ spec:
- containerPort: 8092
name: healthsrv
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: "5555"
- name: "HEALTH_SERVER_PORT"
value: "8092"
- name: "EXTERNAL_PORT"
value: "2223"
- name: BUILDER_STORAGE
value: "{{ or (env "STORAGE_TYPE") (.storage)}}"
# Set GIT_LOCK_TIMEOUT to number of minutes you want to wait to git push again to the same repository
# Set GIT_LOCK_TIMEOUT to number of minutes you want to wait to git push again to the same repository
- name: "GIT_LOCK_TIMEOUT"
value: "10"
- name: "SLUGBUILDER_IMAGE_NAME"
Expand Down
5 changes: 5 additions & 0 deletions workflow-dev/tpl/deis-controller-deployment.yaml
Expand Up @@ -43,6 +43,11 @@ spec:
- containerPort: 8000
name: http
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: "5555"
- name: KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS
value: "5"
- name: "APP_STORAGE"
Expand Down
36 changes: 36 additions & 0 deletions workflow-dev/tpl/deis-registry-proxy-daemon.yaml
@@ -0,0 +1,36 @@
#helm:generate helm tpl -d $HELM_GENERATE_DIR/tpl/generate_params.toml -o $HELM_GENERATE_DIR/manifests/deis-registry-proxy.yaml $HELM_GENERATE_FILE
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
name: deis-registry-proxy
namespace: deis
labels:
heritage: deis
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}}
resources:
limits:
cpu: 100m
memory: 50Mi
env:
- name: REGISTRY_HOST
value: $(DEIS_REGISTRY_SERVICE_HOST)
- name: REGISTRY_PORT
value: $(DEIS_REGISTRY_SERVICE_PORT)
ports:
- containerPort: 80
hostPort: 5555
5 changes: 5 additions & 0 deletions workflow-dev/tpl/generate_params.toml
Expand Up @@ -120,6 +120,11 @@ org = "deisci"
pullPolicy = "Always"
dockerTag = "canary"

[registry_proxy]
org = "deisci"
pullPolicy = "Always"
dockerTag = "canary"

[workflowManager]
org = "deisci"
pullPolicy = "Always"
Expand Down

0 comments on commit 78e77cb

Please sign in to comment.