From de8f539982b838086af37aefd5b3b8714cccedb2 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Sat, 14 May 2022 20:42:37 +0200 Subject: [PATCH] =?UTF-8?q?Fancy=20new=20jsonnet=20deployment=20?= =?UTF-8?q?=F0=9F=94=A5=F0=9F=94=A5=F0=9F=94=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubernetes/simple_website-jsonnet/dns.jsonnet | 21 +++++++++++++++++++ .../simple_website-jsonnet/ingress.jsonnet | 10 ++++----- .../simple_website-jsonnet/params.libsonnet | 8 +++---- .../simple_website-jsonnet/service.jsonnet | 2 +- 4 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 kubernetes/simple_website-jsonnet/dns.jsonnet diff --git a/kubernetes/simple_website-jsonnet/dns.jsonnet b/kubernetes/simple_website-jsonnet/dns.jsonnet new file mode 100644 index 0000000..12d7485 --- /dev/null +++ b/kubernetes/simple_website-jsonnet/dns.jsonnet @@ -0,0 +1,21 @@ +local params = import 'params.libsonnet'; +[ + { + apiVersion: 'externaldns.k8s.io/v1alpha1', + kind: 'DNSEndpoint', + metadata: { + name: params.name+"-dns", + }, + spec: { + endpoints: [ + { + dnsName: params.domain, + recordType: 'CNAME', + targets: [ + 'k.odit.services', + ], + }, + ], + }, + }, +] \ No newline at end of file diff --git a/kubernetes/simple_website-jsonnet/ingress.jsonnet b/kubernetes/simple_website-jsonnet/ingress.jsonnet index 2148c18..5fed87a 100644 --- a/kubernetes/simple_website-jsonnet/ingress.jsonnet +++ b/kubernetes/simple_website-jsonnet/ingress.jsonnet @@ -14,7 +14,7 @@ local params = import 'params.libsonnet'; routes: [ { kind: 'Rule', - match: std.strReplace("Host(`domain`)", "domain", params.domain), + match: std.strReplace('Host(`domain`)', 'domain', params.domain), services: [ { name: params.name, @@ -24,7 +24,7 @@ local params = import 'params.libsonnet'; }, ], tls: { - secretName: params.name + "-cert", + secretName: params.name + '-cert', }, }, }, @@ -32,11 +32,11 @@ local params = import 'params.libsonnet'; apiVersion: 'cert-manager.io/v1', kind: 'Certificate', metadata: { - name: params.name + "-cert", + name: params.name + '-cert', }, spec: { commonName: params.domain, - secretName: params.name + "-cert", + secretName: params.name + '-cert', dnsNames: [ params.domain, ], @@ -46,4 +46,4 @@ local params = import 'params.libsonnet'; }, }, }, -] \ No newline at end of file +] diff --git a/kubernetes/simple_website-jsonnet/params.libsonnet b/kubernetes/simple_website-jsonnet/params.libsonnet index 07012ef..2b2779a 100644 --- a/kubernetes/simple_website-jsonnet/params.libsonnet +++ b/kubernetes/simple_website-jsonnet/params.libsonnet @@ -1,6 +1,6 @@ { - image: "traefik/whoami", - name: "w-dev-odit-services", + image: 'registry.odit.services/customers/elisabeth-ort.de', + name: 'w-dev-odit-services', containerPort: 80, - domain: "w.dev.odit.services" -} \ No newline at end of file + domain: 'w.dev.odit.services', +} diff --git a/kubernetes/simple_website-jsonnet/service.jsonnet b/kubernetes/simple_website-jsonnet/service.jsonnet index 2f8cba8..d07efd7 100644 --- a/kubernetes/simple_website-jsonnet/service.jsonnet +++ b/kubernetes/simple_website-jsonnet/service.jsonnet @@ -19,4 +19,4 @@ local params = import 'params.libsonnet'; }, }, }, -] \ No newline at end of file +]