Skip to content

Update template to use v1beta3 spec #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
noonien wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update template to use v1beta3 spec #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc875aa
Update template to use v1beta3 spec
noonien Apr 28, 2015
a57716b
Update confd version
noonien Apr 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ FROM ubuntu:latest

ENV DEBIAN_FRONTEND noninteractive

# Prepare requirements
# Prepare requirements
RUN apt-get update -qy && \
apt-get install --no-install-recommends -qy software-properties-common

# setup confd
ADD https://github.com/kelseyhightower/confd/releases/download/v0.6.3/confd-0.6.3-linux-amd64 /usr/local/bin/confd
ADD https://github.com/kelseyhightower/confd/releases/download/v0.9.0/confd-0.9.0-linux-amd64 /usr/local/bin/confd
RUN chmod u+x /usr/local/bin/confd && \
mkdir -p /etc/confd/conf.d && \
mkdir -p /etc/confd/templates
Expand Down
16 changes: 12 additions & 4 deletions src/confd/templates/nginx.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ http {

{{range $spec := getvs "/registry/services/specs/*/*"}}
{{$data := json $spec}}
{{ if $data.annotations.kubernetesReverseproxy }}
{{$p := json $data.annotations.kubernetesReverseproxy }}
{{ if $data.metadata.annotations.kubernetesReverseproxy }}
{{$p := json $data.metadata.annotations.kubernetesReverseproxy }}
{{range $proxy := $p.hosts}}
{{if $proxy.host }}
server {
Expand Down Expand Up @@ -98,7 +98,11 @@ http {
proxy_set_header Connection "upgrade";
{{ end }}

proxy_pass http://{{$data.portalIP}}:{{$data.port}};
{{ if $proxy.targetPort }}
proxy_pass http://{{$data.spec.portalIP}}:{{$proxy.targetPort}};
{{ else }}
proxy_pass http://{{$data.spec.portalIP}};
{{ end }}
}
{{ end }}

Expand Down Expand Up @@ -127,7 +131,11 @@ http {
proxy_set_header Connection "upgrade";
{{ end }}

proxy_pass http://{{$data.portalIP}}:{{$data.port}};
{{ if $proxy.targetPort }}
proxy_pass http://{{$data.spec.portalIP}}:{{$proxy.targetPort}};
{{ else }}
proxy_pass http://{{$data.spec.portalIP}};
{{ end }}
}
{{ end }}

Expand Down