fix kubectl stuff

.gitlab-ci.yml

@@ -1,4 +1,5 @@
 variables:
+  CI_PROJECT_NAME: "homer"
   CI_PROJECT_DIR: "."
   CI_REGISTRY_IMAGE: hub.ducoterra.net/ducoterra/homer
 
@@ -30,10 +31,8 @@ deploy_to_prod:
     name: debian:10
     entrypoint: [""]
   script:
-    - apt -qq update >> /dev/null && apt -qq install -y curl gettext >> /dev/null
+    - apt -qq update >> /dev/null && apt -qq install -y curl >> /dev/null
-    - curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl
+    - curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl
-    - chmod +x ./kubectl
+    - chmod +x /usr/local/bin/kubectl
-    - mkdir /deploy
+    - curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
-    - for f in $(find k8s -regex '.*\.ya*ml'); do envsubst < $f > "/deploy/$(basename $f)"; done
+    - helm install --set tag=$CI_COMMIT_TAG $CI_PROJECT_NAME ./helm
-    - for f in $(find k8s/prod -regex '.*\.ya*ml'); do envsubst < $f > "/deploy/$(basename $f)"; done
-    - ./kubectl apply -f /deploy

config.yml

@@ -58,7 +58,7 @@ services:
         logo: "assets/tools/jellyfin.png"
         url: "https://jellyfin.ducoterra.net"
         tag: "Entertainment"
-        target: "_blank"
+        target: '_blank'
   - name: "Monitoring"
     icon: "fas fa-heartbeat"
     items:
@@ -66,12 +66,17 @@ services:
         logo: "assets/tools/grafana.png"
         url: "https://grafana.ducoterra.net/"
         tag: "Monitoring"
-        target: "_blank"
+        target: '_blank'
       - name: "Graphite"
         logo: "assets/tools/graphite.png"
         url: "https://graphite.ducoterra.net/"
         tag: "Monitoring"
-        target: "_blank"
+        target: '_blank'
+      - name: "Zipkin"
+        logo: "assets/tools/zipkin.png"
+        url: "https://zipkin.ducoterra.net/"
+        tag: "Monitoring"
+        target: '_blank'
   - name: "Network"
     icon: "fas fa-server"
     items:

helm/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

helm/Chart.yaml

@@ -0,0 +1,23 @@
+apiVersion: v2
+name: helm
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+appVersion: 1.16.0

helm/templates/deploy.yaml

@@ -1,19 +1,19 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: dashboard
+  name: {{ .Release.Name }}
 spec:
   selector:
     matchLabels:
-      app: dashboard
+      app: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: dashboard
+        app: {{ .Release.Name }}
     spec:
       containers:
-      - name: dashboard
+      - name: {{ .Release.Name }}
-        image: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
+        image: {{ .Values.image }}:{{ .Values.tag }}
         resources:
           limits:
             memory: "128Mi"

helm/templates/ingress.yaml

@@ -1,7 +1,7 @@
 apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRoute
 metadata:
-  name: dashboard-internal-tls
+  name: {{ .Release.Name }}-internal-tls
   annotations:
     kubernetes.io/ingress.class: traefik-internal
 spec:
@@ -12,10 +12,10 @@ spec:
     domains:
     - main: "*.ducoterra.net"
   routes:
-  - match: Host(`dashboard.ducoterra.net`)
+  - match: Host(`{{ .Release.Name }}.ducoterra.net`)
     kind: Rule
     services:
-    - name: dashboard
+    - name: {{ .Release.Name }}
       port: 8080
 
 ---
@@ -23,17 +23,17 @@ spec:
 apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRoute
 metadata:
-  name: dashboard-internal-web
+  name: {{ .Release.Name }}-internal-web
   annotations:
     kubernetes.io/ingress.class: traefik-internal
 spec:
   entryPoints:
     - web
   routes:
-  - match: Host(`dashboard.ducoterra.net`)
+  - match: Host(`{{ .Release.Name }}.ducoterra.net`)
     kind: Rule
     services:
-    - name: dashboard
+    - name: {{ .Release.Name }}
       port: 8080
     middlewares:
       - name: httpsredirect

helm/templates/service.yaml

@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: dashboard
+  name: {{ .Release.Name }}
 spec:
   selector:
-    app: dashboard
+    app: {{ .Release.Name }}
   ports:
   - port: 8080
     targetPort: 8080

helm/values.yaml

@@ -0,0 +1 @@
+image: hub.ducoterra.net/ducoterra/homer