fix cd

deploy/k8s/00-config.yaml

@@ -109,15 +109,3 @@ data:
     log:
       level: info
       format: json
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: fancy-dns-tls
-  namespace: dns
-type: kubernetes.io/tls
-# Replace with a real cert-manager managed secret in production:
-#   cert-manager.io/v1 -> Certificate -> CertificateRequest -> Secret
-stringData:
-  tls.crt: ""
-  tls.key: ""

deploy/k8s/10-deployment.yaml

@@ -5,6 +5,9 @@ metadata:
   namespace: dns
   labels:
     app.kubernetes.io/name: fancy-dns
+  annotations:
+    k8s-helper.io/git-url: "https://git.k6n.net/mats/fancy-dns"
+    k8s-helper.io/git-ssh: "git@git.k6n.net:mats/fancy-dns.git"
 spec:
   serviceName: fancy-dns
   # A StatefulSet rather than a Deployment because each pod owns a PVC (the
@@ -22,6 +25,8 @@ spec:
       labels:
         app.kubernetes.io/name: fancy-dns
       annotations:
+        k8s-helper.io/git-url: "https://git.k6n.net/mats/fancy-dns"
+        k8s-helper.io/git-ssh: "git@git.k6n.net:mats/fancy-dns.git"
         # A config change is a SIGHUP, not a restart: the server re-reads the
         # file and hot-swaps every component. This annotation is for
         # stakater/reloader-class controllers; without one, `kubectl rollout
@@ -53,7 +58,7 @@ spec:
       containers:
         - name: fancy-dns
           image: fancydns/fancy-dns:latest
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: Always
           args:
             - -config
             - /etc/fancy-dns/config.yaml

deploy/k8s/30-ingress.yaml

@@ -7,6 +7,10 @@ metadata:
   labels:
     app.kubernetes.io/name: fancy-dns
   annotations:
+    k8s-helper.io/name: "fancy-dns"
+    k8s-helper.io/description: "Recursive DNS resolver and admin dashboard"
+    k8s-helper.io/group: "Infrastructure"
+    k8s-helper.io/icon: "network"
     nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
     # SSE (the live query log) is the reason for these three. With response
     # buffering on, nginx holds events until the buffer fills and the log page

deploy/k8s/90-secret-tls.example.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: fancy-dns-tls
+  namespace: dns
+type: kubernetes.io/tls
+# Replace with a real cert-manager managed secret in production:
+#   cert-manager.io/v1 -> Certificate -> CertificateRequest -> Secret
+stringData:
+  tls.crt: ""
+  tls.key: ""

deploy/k8s/kustomization.yaml

@@ -11,7 +11,6 @@ namespace: dns
 resources:
   - 00-config.yaml
   - 05-serviceaccount.yaml
-  - 08-secret-apikey.yaml
   - 10-deployment.yaml
   - 20-service.yaml
   - 30-ingress.yaml