Update grafana/promtail Docker tag to v3

Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>

manifests/_apps/airtrail.yaml

@@ -0,0 +1,25 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: airtrail
+  namespace: argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  project: cluster.fun
+  destination:
+    namespace: airtrail
+    name: cluster-fun (v2)
+  source:
+    path: manifests/airtrail
+    repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
+    targetRevision: HEAD
+  syncPolicy:
+    automated: {}
+    syncOptions:
+      - CreateNamespace=true
+  ignoreDifferences:
+  - kind: Secret
+    jsonPointers:
+    - /data
+

manifests/airtrail/airtrail.yaml

@@ -0,0 +1,145 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: airtrail
+  namespace: airtrail
+  labels:
+    app: airtrail
+    app.kubernetes.io/name: airtrail
+  annotations:
+    kube-1password: 2322tcm3p5v6ql7oy2efrn4jse
+    kube-1password/vault: Kubernetes
+    kube-1password/secret-text-parse: "true"
+type: Opaque
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: airtrail
+  namespace: airtrail
+  labels:
+    app: airtrail
+    app.kubernetes.io/name: airtrail
+  annotations:
+    reloader.stakater.com/match: "true"
+data:
+  ORIGIN: https://airtrail.cluster.fun
+  UPLOAD_LOCATION: /app/uploads
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: airtrail
+  namespace: airtrail
+  labels:
+    app: airtrail
+    app.kubernetes.io/name: airtrail
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      app: airtrail
+  template:
+    metadata:
+      labels:
+        app: airtrail
+        app.kubernetes.io/name: airtrail
+    spec:
+      securityContext:
+        runAsUser: 1000
+        runAsGroup: 1000
+        fsGroup: 1000
+      containers:
+      - name: airtrail
+        image: johly/airtrail:v3.11.1
+        imagePullPolicy: IfNotPresent
+        envFrom:
+        - configMapRef:
+            name: airtrail
+        - secretRef:
+            name: airtrail
+        ports:
+        - containerPort: 3000
+          name: web
+        volumeMounts:
+          - mountPath: /app/uploads
+            name: uploads
+        livenessProbe:
+          httpGet:
+            path: /api/ping
+            port: 3000
+          initialDelaySeconds: 5
+          periodSeconds: 30
+        readinessProbe:
+          httpGet:
+            path: /api/ping
+            port: 3000
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        resources:
+          requests:
+            cpu: 100m
+            memory: 150Mi
+          limits:
+            cpu: 200m
+            memory: 300Mi
+      volumes:
+      - name: uploads
+        persistentVolumeClaim:
+          claimName: airtrail-uploads
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: airtrail
+  namespace: airtrail
+  labels:
+    app: airtrail
+    app.kubernetes.io/name: airtrail
+spec:
+  type: ClusterIP
+  ports:
+  - port: 80
+    targetPort: web
+    name: web
+  selector:
+    app: airtrail
+---
+
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: airtrail
+  namespace: airtrail
+  labels:
+    app: airtrail
+    app.kubernetes.io/name: airtrail
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/proxy-body-size: "0"
+    nginx.ingress.kubernetes.io/client-body-buffer-size: 25m
+    nginx.ingress.kubernetes.io/proxy-connect-timeout: "300"
+    nginx.ingress.kubernetes.io/proxy-send-timeout: "300"
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "300"
+    nginx.ingress.kubernetes.io/proxy-next-upstream: "300"
+    nginx.ingress.kubernetes.io/proxy-next-upstream-timeout: "300"
+spec:
+  ingressClassName: nginx
+  tls:
+  - hosts:
+    - airtrail.cluster.fun
+    secretName: airtrail-ingress
+  rules:
+  - host: airtrail.cluster.fun
+    http:
+      paths:
+      - path: /
+        pathType: ImplementationSpecific
+        backend:
+          service:
+            name: airtrail
+            port:
+              name: web

manifests/airtrail/pvs.yaml

@@ -0,0 +1,13 @@
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: airtrail-uploads
+  namespace: airtrail
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
+  storageClassName: sbs-default-retain
+---

manifests/auth-proxy/internal-services.yaml

@@ -100,3 +100,20 @@ spec:
     app: internal-proxy
   type: ClusterIP
 ---
+apiVersion: v1
+kind: Service
+metadata:
+  name: ollama
+  namespace: auth-proxy
+  labels:
+    app: internal-proxy
+spec:
+  ports:
+  - name: http
+    port: 80
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: internal-proxy
+  type: ClusterIP
+---

manifests/auth-proxy/proxy.yaml

@@ -15,7 +15,9 @@ data:
       "loki-distributed.auth-proxy.svc": "loki-loki.cluster.local",
       "loki-distributed.auth-proxy.svc:80": "loki-loki.cluster.local",
       "hermes.auth-proxy.svc": "hermes.cluster.local",
-      "hermes.auth-proxy.svc:80": "hermes.cluster.local"
+      "hermes.auth-proxy.svc:80": "hermes.cluster.local",
+      "ollama.auth-proxy.svc": "ollama.cluster.local",
+      "ollama.auth-proxy.svc:11434": "ollama.cluster.local"
     }
 ---
 apiVersion: apps/v1

manifests/blog/blog.yaml

@@ -27,6 +27,15 @@ spec:
       labels:
         app: blog
     spec:
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchLabels:
+                    app: blog
+                topologyKey: kubernetes.io/hostname
       containers:
       - name: web
         image: rg.fr-par.scw.cloud/averagemarcus/blog:latest

manifests/trek/trek.yaml

@@ -58,7 +58,7 @@ spec:
     spec:
       containers:
       - name: trek
-        image: mauriceboe/trek:3.1.4
+        image: mauriceboe/trek:3.2.0
         imagePullPolicy: IfNotPresent
         envFrom:
         - configMapRef:
@@ -87,11 +87,11 @@ spec:
           periodSeconds: 10
         resources:
           requests:
-            cpu: 100m
+            cpu: 300m
-            memory: 256Mi
+            memory: 400Mi
           limits:
-            cpu: 500m
+            cpu: 700m
-            memory: 512Mi
+            memory: 800Mi
       volumes:
       - name: data
         persistentVolumeClaim: