Skip to content

k8s-ingress
k8s-ingress
Commit e4ed5681 authored by Geoff Simmons's avatar Geoff Simmons
Browse files
Options

The viking-service chart requires that admin secrets are set. 

All of the tests that deploy the service generate secrets for the
test.
parent 82e0b42f
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 4 deletions
charts/viking-service/templates/admin-secret.yaml
View file @ e4ed5681
......@@ -10,5 +10,5 @@ metadata:
viking.uplex.de/secret: admin
type: Opaque
data:
admin: {{ .Values.vikingService.secrets.admin | b64enc | quote }}
dataplaneapi: {{ .Values.vikingService.secrets.dataplaneapi | b64enc | quote }}
admin: {{ required "vikingService.secrets.admin must be non-empty" .Values.vikingService.secrets.admin | b64enc | quote }}
dataplaneapi: {{ required "vikingService.secrets.dataplaneapi must be non-empty" .Values.vikingService.secrets.dataplaneapi | b64enc | quote }}
charts/viking-service/values.yaml
View file @ e4ed5681
......@@ -40,9 +40,10 @@ vikingService:
# minReadySeconds to avoid killing pods before we are ready
minReadySeconds: 0
# Values for these secrets MUST be set.
secrets:
admin: "21d0ac6c-83d5-11ea-8acc-1ff3820da75e"
dataplaneapi: "e24bb312-cb21-46d6-aaec-8ae676f06fea"
admin: ""
dataplaneapi: ""
# Optionally customize the pod dnsConfig.
dnsConfig: {}
......
deploy/Makefile
View file @ e4ed5681
......@@ -29,6 +29,8 @@
mkpath := $(abspath $(lastword $(MAKEFILE_LIST)))
mkdir := $(dir $(mkpath))
GEN_SECRET=head -c32 /dev/urandom | base64 | tr +/ -_
# For the klarlack image: make VARNISH=klarlack ...
ifndef VARNISH
VARNISH=varnish
......@@ -105,6 +107,8 @@ endif
deploy-service-helm:
@helm install viking-service $(mkdir)/../charts/viking-service \
--values values-varnish.yaml \
--set vikingService.secrets.admin=$(shell $(GEN_SECRET)) \
--set vikingService.secrets.dataplaneapi=$(shell $(GEN_SECRET)) \
--set vikingService.varnish.image.repository=$(VARNISH_IMAGE) \
--set vikingService.varnish.image.tag=$(VARNISH_TAG) \
--set vikingService.haproxy.image.repository=$(HAPROXY_IMAGE) \
......
examples/architectures/cluster-and-ns-wide/Makefile
View file @ e4ed5681
......@@ -31,6 +31,8 @@ mkdir := $(dir $(mkpath))
CHARTDIR=$(mkdir)/../../../charts
GEN_SECRET=head -c32 /dev/urandom | base64 | tr +/ -_
# For the klarlack image: make VARNISH=klarlack ...
ifndef VARNISH
VARNISH=varnish
......@@ -73,12 +75,16 @@ deploy-helm:
@kubectl apply -f namespace.yaml
@helm install viking-service-system $(CHARTDIR)/viking-service \
--values values-varnish.yaml --namespace kube-system \
--set vikingService.secrets.admin=$(shell $(GEN_SECRET)) \
--set vikingService.secrets.dataplaneapi=$(shell $(GEN_SECRET)) \
--set vikingService.varnish.image.repository=$(VARNISH_IMAGE) \
--set vikingService.varnish.image.tag=$(VARNISH_TAG) \
--set vikingService.haproxy.image.repository=$(HAPROXY_IMAGE) \
--set vikingService.haproxy.image.tag=$(HAPROXY_TAG)
@helm install viking-service-cafe $(CHARTDIR)/viking-service \
--values values-varnish.yaml --namespace cafe \
--set vikingService.secrets.admin=$(shell $(GEN_SECRET)) \
--set vikingService.secrets.dataplaneapi=$(shell $(GEN_SECRET)) \
--set vikingService.varnish.image.repository=$(VARNISH_IMAGE) \
--set vikingService.varnish.image.tag=$(VARNISH_TAG) \
--set vikingService.haproxy.image.repository=$(HAPROXY_IMAGE) \
......
examples/architectures/clusterwide/Makefile
View file @ e4ed5681
......@@ -31,6 +31,8 @@ mkdir := $(dir $(mkpath))
CHARTDIR=$(mkdir)/../../../charts
GEN_SECRET=head -c32 /dev/urandom | base64 | tr +/ -_
# For the klarlack image: make VARNISH=klarlack ...
ifndef VARNISH
VARNISH=varnish
......@@ -73,6 +75,8 @@ deploy-helm:
@kubectl apply -f namespace.yaml
@helm install viking-service-clusterwide $(CHARTDIR)/viking-service \
--values values-varnish.yaml --namespace kube-system \
--set vikingService.secrets.admin=$(shell $(GEN_SECRET)) \
--set vikingService.secrets.dataplaneapi=$(shell $(GEN_SECRET)) \
--set vikingService.varnish.image.repository=$(VARNISH_IMAGE) \
--set vikingService.varnish.image.tag=$(VARNISH_TAG) \
--set vikingService.haproxy.image.repository=$(HAPROXY_IMAGE) \
......
examples/architectures/multi-controller/Makefile
View file @ e4ed5681
......@@ -32,6 +32,8 @@ mkdir := $(dir $(mkpath))
CHARTDIR=$(mkdir)/../../../charts
TESTDIR=$(mkdir)/../../../test
GEN_SECRET=head -c32 /dev/urandom | base64 | tr +/ -_
# For the klarlack image: make VARNISH=klarlack ...
ifndef VARNISH
VARNISH=varnish
......@@ -90,6 +92,8 @@ deploy-helm:
--values values-varnish.yaml --namespace cafe \
--set nameOverride=varnish-tea \
--set fullnameOverride=varnish-tea \
--set vikingService.secrets.admin=$(shell $(GEN_SECRET)) \
--set vikingService.secrets.dataplaneapi=$(shell $(GEN_SECRET)) \
--set vikingService.varnish.image.repository=$(VARNISH_IMAGE) \
--set vikingService.varnish.image.tag=$(VARNISH_TAG) \
--set vikingService.haproxy.image.repository=$(HAPROXY_IMAGE) \
......@@ -98,6 +102,8 @@ deploy-helm:
--values values-varnish.yaml --namespace cafe \
--set nameOverride=varnish-coffee \
--set fullnameOverride=varnish-coffee \
--set vikingService.secrets.admin=$(shell $(GEN_SECRET)) \
--set vikingService.secrets.dataplaneapi=$(shell $(GEN_SECRET)) \
--set vikingService.varnish.image.repository=$(VARNISH_IMAGE) \
--set vikingService.varnish.image.tag=$(VARNISH_TAG) \
--set vikingService.haproxy.image.repository=$(HAPROXY_IMAGE) \
......
examples/architectures/multi-varnish-ns/Makefile
View file @ e4ed5681
......@@ -31,6 +31,8 @@ mkdir := $(dir $(mkpath))
CHARTDIR=$(mkdir)/../../../charts
GEN_SECRET=head -c32 /dev/urandom | base64 | tr +/ -_
# For the klarlack image: make VARNISH=klarlack ...
ifndef VARNISH
VARNISH=varnish
......@@ -75,6 +77,8 @@ deploy-helm:
--values values-varnish.yaml --namespace cafe \
--set nameOverride=varnish-tea \
--set fullnameOverride=varnish-tea \
--set vikingService.secrets.admin=$(shell $(GEN_SECRET)) \
--set vikingService.secrets.dataplaneapi=$(shell $(GEN_SECRET)) \
--set vikingService.varnish.image.repository=$(VARNISH_IMAGE) \
--set vikingService.varnish.image.tag=$(VARNISH_TAG) \
--set vikingService.haproxy.image.repository=$(HAPROXY_IMAGE) \
......@@ -83,6 +87,8 @@ deploy-helm:
--values values-varnish.yaml --namespace cafe \
--set nameOverride=varnish-coffee \
--set fullnameOverride=varnish-coffee \
--set vikingService.secrets.admin=$(shell $(GEN_SECRET)) \
--set vikingService.secrets.dataplaneapi=$(shell $(GEN_SECRET)) \
--set vikingService.varnish.image.repository=$(VARNISH_IMAGE) \
--set vikingService.varnish.image.tag=$(VARNISH_TAG) \
--set vikingService.haproxy.image.repository=$(HAPROXY_IMAGE) \
......
examples/file-cache/Makefile
View file @ e4ed5681
......@@ -32,6 +32,8 @@ mkdir := $(dir $(mkpath))
CHARTDIR=$(mkdir)/../../charts
TESTDIR=$(mkdir)/../../test
GEN_SECRET=head -c32 /dev/urandom | base64 | tr +/ -_
# For the klarlack image: make VARNISH=klarlack ...
ifndef VARNISH
VARNISH=varnish
......@@ -74,6 +76,8 @@ deploy-helm:
@kubectl apply -f pvc.yaml
@helm install viking-service-file-cache $(CHARTDIR)/viking-service \
--values values-varnish.yaml \
--set vikingService.secrets.admin=$(shell $(GEN_SECRET)) \
--set vikingService.secrets.dataplaneapi=$(shell $(GEN_SECRET)) \
--set vikingService.varnish.image.repository=$(VARNISH_IMAGE) \
--set vikingService.varnish.image.tag=$(VARNISH_TAG) \
--set vikingService.haproxy.image.repository=$(HAPROXY_IMAGE) \
......
examples/namespace/Makefile
View file @ e4ed5681
......@@ -31,6 +31,8 @@ mkdir := $(dir $(mkpath))
CHARTDIR=$(mkdir)/../../charts
GEN_SECRET=head -c32 /dev/urandom | base64 | tr +/ -_
# For the klarlack image: make VARNISH=klarlack ...
ifndef VARNISH
VARNISH=varnish
......@@ -87,6 +89,8 @@ deploy-helm:
--set vikingController.image.tag=$(CONTROLLER_TAG)
@helm install viking-service-ns $(CHARTDIR)/viking-service \
--values values-varnish.yaml --namespace varnish-ingress \
--set vikingService.secrets.admin=$(shell $(GEN_SECRET)) \
--set vikingService.secrets.dataplaneapi=$(shell $(GEN_SECRET)) \
--set vikingService.varnish.image.repository=$(VARNISH_IMAGE) \
--set vikingService.varnish.image.tag=$(VARNISH_TAG) \
--set vikingService.haproxy.image.repository=$(HAPROXY_IMAGE) \
......
examples/varnish_pod_template/Makefile
View file @ e4ed5681
......@@ -32,6 +32,8 @@ mkdir := $(dir $(mkpath))
CHARTDIR=$(mkdir)/../../charts
TESTDIR=$(mkdir)/../../test
GEN_SECRET=head -c32 /dev/urandom | base64 | tr +/ -_
# For the klarlack image: make VARNISH=klarlack ...
ifndef VARNISH
VARNISH=varnish
......@@ -83,6 +85,8 @@ all: deploy
deploy-cli-args-helm:
@helm install viking-service-cli-args $(CHARTDIR)/viking-service \
--values values-cli-args-varnish.yaml \
--set vikingService.secrets.admin=$(shell $(GEN_SECRET)) \
--set vikingService.secrets.dataplaneapi=$(shell $(GEN_SECRET)) \
--set vikingService.varnish.image.repository=$(VARNISH_IMAGE) \
--set vikingService.varnish.image.tag=$(VARNISH_TAG) \
--set vikingService.haproxy.image.repository=$(HAPROXY_IMAGE) \
......@@ -93,6 +97,8 @@ deploy-cli-args-helm:
deploy-proxy-helm:
@helm install viking-service-proxy $(CHARTDIR)/viking-service \
--values values-proxy-varnish.yaml \
--set vikingService.secrets.admin=$(shell $(GEN_SECRET)) \
--set vikingService.secrets.dataplaneapi=$(shell $(GEN_SECRET)) \
--set vikingService.varnish.image.repository=$(VARNISH_IMAGE) \
--set vikingService.varnish.image.tag=$(VARNISH_TAG) \
--set vikingService.haproxy.image.repository=$(HAPROXY_IMAGE) \
......@@ -103,6 +109,8 @@ deploy-proxy-helm:
deploy-env-helm:
@helm install viking-service-env $(CHARTDIR)/viking-service \
--values values-env-varnish.yaml \
--set vikingService.secrets.admin=$(shell $(GEN_SECRET)) \
--set vikingService.secrets.dataplaneapi=$(shell $(GEN_SECRET)) \
--set vikingService.varnish.image.repository=$(VARNISH_IMAGE) \
--set vikingService.varnish.image.tag=$(VARNISH_TAG) \
--set vikingService.haproxy.image.repository=$(HAPROXY_IMAGE) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment