From 1be143c3ae8deebc2d6ff201bd8f9e80056e30ae Mon Sep 17 00:00:00 2001 From: Piotr Dobrowolski Date: Fri, 27 Mar 2020 13:18:32 +0100 Subject: [PATCH 1/2] app/covid-formity: image update, add /qr1, /manual, /video redirect Change-Id: I0bda7f6e219404aeb47ea0712e06b974723e5341 --- app/covid-formity/prod.jsonnet | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/covid-formity/prod.jsonnet b/app/covid-formity/prod.jsonnet index a6ca8ab9..f8825ce6 100644 --- a/app/covid-formity/prod.jsonnet +++ b/app/covid-formity/prod.jsonnet @@ -10,9 +10,9 @@ local postgres = import "../../kube/postgres.libsonnet"; local cfg = app.cfg, cfg:: { namespace: "covid-formity", - image: "registry.k0.hswaw.net/informatic/covid-formity@sha256:8295f5b6d71266fb758c103210f12380f15903ba2467ead0e48ae0df16b6d608", + image: "registry.k0.hswaw.net/informatic/covid-formity@sha256:1401e9759ce9385c7b54d6df937324f397993257d6e117ac4bb60ab9794c49c0", domain: "covid19.hackerspace.pl", - altDomains: ["covid.hackerspace.pl"], + altDomains: ["covid.hackerspace.pl", "www.covid.hackerspace.pl"], }, metadata(component):: { @@ -81,6 +81,11 @@ local postgres = import "../../kube/postgres.libsonnet"; "kubernetes.io/tls-acme": "true", "certmanager.k8s.io/cluster-issuer": "letsencrypt-prod", "nginx.ingress.kubernetes.io/proxy-body-size": "0", + "nginx.ingress.kubernetes.io/configuration-snippet": " + location /qr1 { rewrite ^/qr1(.*)$ https://covid.hackerspace.pl$1 redirect; } + location /video { return 302 https://youtu.be/eC19w2NFO0E; } + location /manual { return 302 https://wiki.hackerspace.pl/_media/projects:covid-19:przylbica-instrukcja-v1.0.pdf; } + ", }, }, spec+: { From e60250c4eb86dc69ad938bb8551881dfd6303069 Mon Sep 17 00:00:00 2001 From: Piotr Dobrowolski Date: Sun, 17 May 2020 10:06:49 +0200 Subject: [PATCH 2/2] app/covid-formity: add kurjerzy integration Change-Id: Ie974e7e83849a0886cd51ba14fe76da10ce8718e --- app/covid-formity/prod.jsonnet | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/covid-formity/prod.jsonnet b/app/covid-formity/prod.jsonnet index f8825ce6..25235b94 100644 --- a/app/covid-formity/prod.jsonnet +++ b/app/covid-formity/prod.jsonnet @@ -3,6 +3,7 @@ # kubectl -n covid-formity create secret generic covid-formity --from-literal=postgres_password=$(pwgen 24 1) --from-literal=secret_key=$(pwgen 24 1) --from-literal=oauth2_secret=... local kube = import "../../kube/kube.libsonnet"; +local redis = import "../../kube/redis.libsonnet"; local postgres = import "../../kube/postgres.libsonnet"; { @@ -10,7 +11,7 @@ local postgres = import "../../kube/postgres.libsonnet"; local cfg = app.cfg, cfg:: { namespace: "covid-formity", - image: "registry.k0.hswaw.net/informatic/covid-formity@sha256:1401e9759ce9385c7b54d6df937324f397993257d6e117ac4bb60ab9794c49c0", + image: "registry.k0.hswaw.net/informatic/covid-formity@sha256:53c5fb0dbc4a6660ab47e39869a516f1e3f833dee5a03867386771bd9ffaf7b8", domain: "covid19.hackerspace.pl", altDomains: ["covid.hackerspace.pl", "www.covid.hackerspace.pl"], }, @@ -36,6 +37,14 @@ local postgres = import "../../kube/postgres.libsonnet"; }, }, + redis: redis { + cfg+: { + namespace: cfg.namespace, + appName: "covid-formity", + storageClassName: app.postgres.cfg.storageClassName, + }, + }, + deployment: kube.Deployment("covid-formity") { metadata+: app.metadata("covid-formity"), spec+: { @@ -56,6 +65,8 @@ local postgres = import "../../kube/postgres.libsonnet"; SPACEAUTH_CONSUMER_KEY: "covid-formity", SPACEAUTH_CONSUMER_SECRET: { secretKeyRef: { name: "covid-formity", key: "oauth2_secret" } }, SECRET_KEY: { secretKeyRef: { name: "covid-formity", key: "secret_key" } }, + SHIPPING_KURJERZY_EMAIL: "qrde@hackerspace.pl", + SHIPPING_KURJERZY_PASSWORD: { secretKeyRef: { name: "covid-formity-shipping", key: "kurjerzy_password" } }, }, }, },