Merge pull request #67 from nycmeshnet/james/admin-helm

Helm + deploy for admin map

.github/workflows/helm-deploy.yaml

@@ -0,0 +1,53 @@
+name: Deploy Helm Chart
+permissions: read-all
+
+on:
+  workflow_call:
+    inputs:
+      environment:
+        required: true
+        type: string
+
+jobs:
+  helm_deploy:
+      name: Deploy helm chart
+      environment: ${{ inputs.environment }}
+      runs-on: ubuntu-latest
+      steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Install SSH key
+        uses: shimataro/ssh-key-action@d4fffb50872869abe2d9a9098a6d9c5aa7d16be4 # v2
+        with:
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          name: id_ed25519 # optional
+          known_hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
+          if_key_exists: fail # replace / ignore / fail; optional (defaults to fail)
+
+      - name: Setup WireGuard
+        run:  |
+          sudo apt install wireguard
+          echo "${{ secrets.WIREGUARD_PRIVATE_KEY }}" > privatekey
+          sudo ip link add dev wg1 type wireguard
+          sudo ip address add dev wg1 ${{ secrets.WIREGUARD_OVERLAY_NETWORK_IP }} peer ${{ secrets.SSH_TARGET_IP }}
+          sudo wg set wg1 listen-port 48123 private-key privatekey peer ${{ secrets.WIREGUARD_PEER_PUBLIC_KEY }} allowed-ips 0.0.0.0/0 endpoint ${{ secrets.WIREGUARD_ENDPOINT }}
+          sudo ip link set up dev wg1
+
+      - name: Install Helm Chart
+        run: |
+          scp ${{ secrets.SSH_USER }}@${{ secrets.SSH_TARGET_IP }}:~/.kube/config ./
+          helm upgrade \
+            adminmap \
+            ./infra/admin-map \
+            --install \
+            --kubeconfig ./config \
+            --kube-apiserver https://${{ secrets.SSH_TARGET_IP }}:6443 \
+            -n ${{ vars.APP_NAMESPACE }} \
+            --create-namespace \
+            -f ./infra/admin-map/values.yaml \
+            --set adminmap.fqdn.legacy="${{ vars.ADMIN_FQDN_LEGACY }}" \
+            --set adminmap.fqdn="${{ vars.ADMIN_FQDN }}"
+          
+          # Rolling restart
+          kubectl --kubeconfig ./config --server https://${{ secrets.SSH_TARGET_IP }}:6443 -n ${{ vars.APP_NAMESPACE }} rollout restart deploy

.github/workflows/publish-and-deploy.yaml

@@ -10,6 +10,7 @@ jobs:
   push_to_registry:
     name: Push Docker Image to Docker Hub
     runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/meshdb-admin'
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
@@ -32,22 +33,32 @@ jobs:
           context: .
           file: ./Dockerfile
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: "willnilges/network-map:admin-helm"
           labels: ${{ steps.meta.outputs.labels }}
 
-  deploy_to_grandsvc:
-    name: Deploy to grandsvc
+  deploy_to_dev3:
+    name: Deploy to dev 3
+    uses: ./.github/workflows/helm-deploy.yaml
+    with:
+      environment: dev3
+    secrets: inherit
+    if: github.ref == 'refs/heads/meshdb-admin'
     needs: push_to_registry
-    runs-on: ubuntu-latest
-    steps:
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@d4fffb50872869abe2d9a9098a6d9c5aa7d16be4 # v2
-      with:
-        key: ${{ secrets.GRANDSVC_KEY }}
-        name: id_ed25519 # optional
-        known_hosts: ${{ secrets.GRANDSVC_KNOWN_HOSTS }}
-        #config: ${{ secrets.CONFIG }} # ssh_config; optional
-        if_key_exists: fail # replace / ignore / fail; optional (defaults to fail)
-    - name: Pull new Docker image
-      # Not a huge fan of this GITHUB_REF shenanigans
-      run: ssh ${{ secrets.GRANDSVC_SSH_TARGET }} "cd network-map-${{ github.ref_name }} && git pull && docker compose pull && docker compose up -d"
+
+  deploy_to_prod1:
+    name: Deploy to prod 1
+    uses: ./.github/workflows/helm-deploy.yaml
+    needs: deploy_to_dev3
+    with:
+      environment: prod1
+    secrets: inherit
+    if: github.ref == 'refs/heads/meshdb-admin'
+
+  deploy_to_prod2:
+    name: Deploy to prod 2
+    uses: ./.github/workflows/helm-deploy.yaml
+    needs: deploy_to_prod1
+    with:
+      environment: prod2
+    secrets: inherit
+    if: github.ref == 'refs/heads/meshdb-admin'

infra/admin-map/.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/

infra/admin-map/Chart.yaml

@@ -0,0 +1,9 @@
+apiVersion: v2
+name: admin-map
+description: A Helm chart for Kubernetes
+
+type: application
+
+version: 0.1.0
+
+appVersion: "1.16.0"

infra/admin-map/templates/_helpers.tpl

@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "admin-map.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "admin-map.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "admin-map.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "admin-map.labels" -}}
+helm.sh/chart: {{ include "admin-map.chart" . }}
+{{ include "admin-map.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "admin-map.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "admin-map.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "admin-map.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "admin-map.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}

infra/admin-map/templates/deployment.yaml

@@ -0,0 +1,53 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "admin-map.fullname" . }}
+  namespace: {{ .Values.adminmap_namespace }}
+  labels:
+    {{- include "admin-map.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "admin-map.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        app: adminmap
+        {{- include "admin-map.labels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.adminmap.image.repository }}:{{ .Values.adminmap.image.tag }}"
+          imagePullPolicy: {{ .Values.adminmap.image.pullPolicy }}
+          env:
+            - name: NODE_ENV
+              value: production
+          ports:
+            - name: http
+              containerPort: {{ .Values.adminmap.port }}
+              protocol: TCP
+          # livenessProbe:
+          #   {{/* - toYaml .Values.livenessProbe | nindent 12 */}}
+          # readinessProbe:
+          #   {{/* - toYaml .Values.readinessProbe | nindent 12 */}}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}

infra/admin-map/templates/ingress.yaml

@@ -0,0 +1,19 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "admin-map.fullname" . }}
+  namespace: {{ .Values.adminmap_namespace }}
+  labels:
+    {{- include "admin-map.labels" . | nindent 4 }}
+spec:
+  rules:
+    - host: {{ .Values.adminmap.fqdn }}
+      http:
+        paths:
+          - path: "/"
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: {{ include "admin-map.fullname" . }}
+                port:
+                  number: {{ .Values.adminmap.port }}

infra/admin-map/templates/service.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "admin-map.fullname" . }}
+  namespace: {{ .Values.adminmap_namespace }}
+  labels:
+    {{- include "admin-map.labels" . | nindent 4 }}
+spec:
+  type: ClusterIP
+  ports:
+    - port: {{ .Values.adminmap.port }}
+      targetPort: {{ .Values.adminmap.port }}
+      protocol: TCP
+      name: http
+  selector:
+    app: adminmap

infra/admin-map/values.yaml

@@ -0,0 +1,43 @@
+# Default values for admin-map.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+adminmap_namespace: "adminmap"
+
+adminmap:
+  image:
+    repository: willnilges/network-map
+    tag: admin-helm
+    pullPolicy: Always
+  port: 3000
+
+nameOverride: ""
+fullnameOverride: ""
+
+podAnnotations: {}
+podLabels: {}
+
+resources:
+  limits:
+    cpu: 512m
+    memory: 256Mi
+  requests:
+    cpu: 256m
+    memory: 128Mi
+
+livenessProbe:
+  httpGet:
+    path: /
+    port: http
+readinessProbe:
+  httpGet:
+    path: /
+    port: http
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}

src/actions/index.js

@@ -1,5 +1,5 @@
 export function fetchNodes(dispatch) {
-	fetch("/api/v1/mapdata/nodes?format=json")
+	fetch("https://db.nycmesh.net/api/v1/mapdata/nodes/?format=json")
 		.then(res => res.json())
 		.then(json => {
 			dispatch({ type: "FETCH_NODES_SUCCESS", nodes: json });
@@ -8,7 +8,7 @@ export function fetchNodes(dispatch) {
 }
 
 export function fetchLinks(dispatch) {
-	fetch("/api/v1/mapdata/links?format=json")
+	fetch("https://db.nycmesh.net/api/v1/mapdata/links/?format=json")
 		.then(res => res.json())
 		.then(json => {
 			dispatch({ type: "FETCH_LINKS_SUCCESS", links: json });
@@ -17,7 +17,7 @@ export function fetchLinks(dispatch) {
 }
 
 export function fetchSectors(dispatch) {
-	fetch("/api/v1/mapdata/sectors?format=json")
+	fetch("https://db.nycmesh.net/api/v1/mapdata/sectors/?format=json")
 		.then(res => res.json())
 		.then(json => {
 			dispatch({ type: "FETCH_SECTORS_SUCCESS", sectors: json });
@@ -26,7 +26,7 @@ export function fetchSectors(dispatch) {
 }
 
 export function fetchKiosks(dispatch) {
-	fetch("https://node-db.netlify.com/kiosks.json")
+	fetch("https://db.nycmesh.net/api/v1/mapdata/kiosks/?format=json")
 		.then(res => res.json())
 		.then(json => {
 			dispatch({ type: "FETCH_KIOSKS_SUCCESS", kiosks: json });