From 509ab6e29a77ff54e05bea0aa8b1024b74f8f4e9 Mon Sep 17 00:00:00 2001
From: Serge Bazanski <q3k@hackerspace.pl>
Date: Thu, 30 Jul 2020 22:43:20 +0200
Subject: [PATCH] k0/cockroach: add public DNS entry for cockroach

Change-Id: I934bf348e2165148b515b709e853ab67f039a402
---
 cluster/kube/k0.libsonnet              | 4 ++++
 cluster/kube/lib/cockroachdb.libsonnet | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cluster/kube/k0.libsonnet b/cluster/kube/k0.libsonnet
index 06671b47..df539209 100644
--- a/cluster/kube/k0.libsonnet
+++ b/cluster/kube/k0.libsonnet
@@ -67,6 +67,9 @@ local rook = import "lib/rook.libsonnet";
                     ],
                     // Host path on SSD.
                     hostPath: "/var/db/crdb-waw1",
+                    extraDNS: [
+                        "crdb-waw1.hswaw.net",
+                    ],
                 },
             },
             clients: {
@@ -74,6 +77,7 @@ local rook = import "lib/rook.libsonnet";
                 cccampixDev: k0.cockroach.waw2.Client("cccampix-dev"),
                 buglessDev: k0.cockroach.waw2.Client("bugless-dev"),
                 sso: k0.cockroach.waw2.Client("sso"),
+                herpDev: k0.cockroach.waw2.Client("herp-dev"),
             },
         },
 
diff --git a/cluster/kube/lib/cockroachdb.libsonnet b/cluster/kube/lib/cockroachdb.libsonnet
index 0b581800..8ebad52c 100644
--- a/cluster/kube/lib/cockroachdb.libsonnet
+++ b/cluster/kube/lib/cockroachdb.libsonnet
@@ -53,6 +53,7 @@ local policies = import "../../../kube/policies.libsonnet";
 
             namespace: null,
             ownNamespace: cluster.cfg.namespace == null,
+            extraDNS: [],
         },
 
         namespaceName:: if cluster.cfg.namespace != null then cluster.cfg.namespace else name,
@@ -122,7 +123,7 @@ local policies = import "../../../kube/policies.libsonnet";
                     ] + [
                         "%s.cluster.local" % s.service.host
                         for s in cluster.servers
-                    ],
+                    ] + cluster.cfg.extraDNS,
                 },
             },