Support for additional mesh and edge configurations and other maintenance

Author: MrMatAP

.idea/misc.xml

@@ -15,8 +15,18 @@ CONTAINER_SOURCES := $(shell find var/container)
 HELM_SOURCES := $(shell find var/helm)
 HELM_TARGET := dist/mrmat-python-api-fastapi-$(VERSION).tgz
 
-# Can be either 'sidecar' or 'ambient'
-ISTIO := ambient
+# My cluster names default to the hostname they run on
+CLUSTER_NAME := $(shell hostname -s)
+# Can be either 'istio-sidecar' or 'istio-ambient'
+MESH := istio-ambient
+# Can be 'ingress', 'gateway-api' or 'istio'
+EDGE := gateway-api
+
+# How the container then connects to its datastore
+API_DB_URL="sqlite:////data/db.sqlite3"
+
+# All of this can be overridden by the include in ~/etc/api-secrets.mk
+-include ~/etc/secrets.mk
 
 all: python container helm
 python: $(PYTHON_TARGET)
@@ -27,32 +37,37 @@ $(PYTHON_TARGET): $(PYTHON_SOURCES)
 
 $(HELM_TARGET): $(HELM_SOURCES) container
 	helm package \
-		--app-version "$(VERSION)" \
 		--version $(VERSION) \
+		--app-version "$(VERSION)" \
 		--destination dist/ \
 		var/helm
+	helm push dist/mrmat-python-api-fastapi-$(VERSION).tgz oci://localhost:5001/charts
 
-container: $(PYTHON_TARGET) $(CONTAINER_SOURCES)
+container: $(CONTAINER_SOURCES) $(PYTHON_TARGET)
 	docker build \
 		-f var/container/Dockerfile \
 		-t localhost:5001/mrmat-python-api-fastapi:$(VERSION) \
+		--build-arg GIT_SHA=$(GIT_SHA) \
 		--build-arg MRMAT_VERSION=$(VERSION) \
 		--build-arg WHEEL=$(PYTHON_TARGET) \
 		$(ROOT_PATH)
 	docker push localhost:5001/mrmat-python-api-fastapi:$(VERSION)
 
 helm-install: $(HELM_TARGET)
 	kubectl create ns mpafastapi || true
-	if test "$(ISTIO)" == "sidecar"; then kubectl label --overwrite ns mpafastapi istio-injection=true; fi
-	if test "$(ISTIO)" == "ambient"; then kubectl label --overwrite ns mpafastapi istio.io/dataplane-mode=ambient; fi
+	if test "$(MESH)" == "istio-sidecar"; then kubectl label --overwrite ns mpafastapi istio-injection=true; fi
+	if test "$(MESH)" == "istio-ambient"; then kubectl label --overwrite ns mpafastapi istio.io/dataplane-mode=ambient; fi
 	helm upgrade \
 		mrmat-python-api-fastapi \
 		${HELM_TARGET} \
 		--install \
 		--wait \
 		--force \
 		--namespace mpafastapi \
-		--set istio=$(ISTIO)
+		--set cluster.name=$(CLUSTER_NAME) \
+		--set cluster.mesh=$(MESH) \
+		--set edge.kind=$(EDGE) \
+		--set config.db_url=$(API_DB_URL)
 
 helm-uninstall:
 	helm delete -n mpafastapi mrmat-python-api-fastapi

Makefile

@@ -1,11 +1,11 @@
 ### GET Owners
-GET https://mpafastapi.covenant.local/api/platform/v1/owners
+GET https://mpafastapi.covenant.k8s/api/platform/v1/owners
 
 ### GET resources
-GET https://mpafastapi.covenant.local/api/platform/v1/resources
+GET https://mpafastapi.covenant.k8s/api/platform/v1/resources
 
 ### Create Owner
-POST https://mpafastapi.covenant.local/api/platform/v1/owners
+POST https://mpafastapi.covenant.k8s/api/platform/v1/owners
 Content-Type: application/json
 
 {

var/client-k8s.http

@@ -1,6 +1,18 @@
 apiVersion: v2
 name: mrmat-python-api-fastapi
 description: A Helm chart for MrMat Python API FastAPI
+home: https://github.com/MrMatAP/mrmat-python-api-fastapi
+sources:
+- https://github.com/MrMatAP/mrmat-python-api-fastapi
+maintainers:
+- name: MrMat
+  email: [email protected]
+  url: https://github.com/MrMatAP
+annotations:
+  org.opencontainers.image.title: "MrMat :: Python API :: FastAPI"
+  org.opencontainers.image.authors: "MrMat"
+  org.opencontainers.image.vendor: "The MrMat Organisation"
+  org.opencontainers.image.licenses: "MIT"
 type: application
 version: "0.0.0"
 appVersion: "0.0.0.dev0"

var/helm/Chart.yaml

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Mathieu Imfeld
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

var/helm/LICENSE

@@ -1,15 +1,14 @@
-{{- if eq .Values.edge.kind "istio-gateway-api" -}}
+{{- if eq .Values.edge.kind "gateway-api" -}}
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
-  name: {{ .Values.route.name }}
+  name: route-mpafastapi
   labels:
+    app.kubernetes.io/name: route-mpafastapi
     {{ include "common.labels" . | nindent 4 }}
 spec:
   hostnames:
-  {{- range .Values.route.hostnames }}
-  - {{ . | quote }}
-  {{- end }}
+  - {{ .Values.route.hostname }}.{{ .Values.cluster.name }}.{{ .Values.cluster.domain }}
   parentRefs:
   - group: gateway.networking.k8s.io
     kind: Gateway

…lm/templates/edge-istio-gateway-api.yaml var/helm/templates/edge-gateway-api.yamlvar/helm/templates/edge-istio-gateway-api.yaml renamed to var/helm/templates/edge-gateway-api.yaml var/helm/templates/edge-istio-gateway-api.yaml renamed to var/helm/templates/edge-gateway-api.yaml

@@ -11,7 +11,7 @@ metadata:
 spec:
   tls:
   - hosts:
-    - {{ .Values.ingress.hostname }}
+    - {{ .Values.ingress.hostname }}.{{ .Values.cluster.name }}.{{ .Values.cluster.domain }}
     secretName: mpafastapi-cert
   rules:
   - host: {{ .Values.ingress.hostname }}

var/helm/templates/edge-ingress.yaml

@@ -4,11 +4,30 @@ apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
   name: waypoint
-  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: waypoint
+    {{ include "common.labels" . | nindent 4 }}
 spec:
   gatewayClassName: istio-waypoint
   listeners:
   - name: mesh
     port: 15008
     protocol: HBONE
+---
+apiVersion: networking.istio.io/v1
+kind: VirtualService
+metadata:
+  name: vs
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: vs
+    {{ include "common.labels" . | nindent 4 }}
+spec:
+  hosts:
+  - mpafastapi.{{ .Release.Namespace }}.svc.cluster.local
+  http:
+  - name: "mpafastapi"
+    route:
+    - destination:
+        host: svc-mpafastapi.{{ .Release.Namespace }}.svc.cluster.local
 {{- end }}

var/helm/templates/edge-istio.yaml

@@ -1,6 +1,12 @@
 #
 # Default values for MrMat :: Python API FastAPI
 
+cluster:
+  mesh: istio
+  gateway_api: true
+  name: cluster
+  domain: k8s
+
 sa:
   name: sa-mpafastapi
 
@@ -21,19 +27,10 @@ edge:
   kind: istio-gateway-api
 
 route:
-  enabled: false
-  name: route-mpafastapi
-  hostnames:
-  - mpafastapi.nostromo.k8s
-  parents:
-  - name: edge-ingress
-    namespace: edge
-
-istio: ambient
+  hostname: mpafastapi
 
 ingress:
-  enabled: false
-  hostname: mpafastapi.nostromo.k8s
+  hostname: mpafastapi
 
 config:
   db_url: "sqlite:////data/db.sqlite3"