Update grafana/promtail Docker tag to v3

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

manifests/_apps/mastodon-to-airtable.yaml

@@ -1,28 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: mastodon-to-airtable
-  namespace: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: cluster.fun
-  destination:
-    namespace: mastodon-to-airtable
-    name: civo
-  source:
-    path: manifests/mastodon-to-airtable
-    repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
-    targetRevision: HEAD
-  syncPolicy:
-    automated: {}
-    syncOptions:
-      - CreateNamespace=true
-  ignoreDifferences:
-  - kind: Secret
-    jsonPointers:
-    - /data
-  - group: apps
-    kind: Deployment
-    jqPathExpressions:
-    - .spec.template.spec.containers[]?.image

manifests/_apps/social-to-grist.yaml

@@ -1,17 +1,17 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: twitter-to-airtable
+  name: social-to-grist
   namespace: argocd
   finalizers:
   - resources-finalizer.argocd.argoproj.io
 spec:
   project: cluster.fun
   destination:
-    namespace: twitter-to-airtable
+    namespace: social-to-grist
     name: civo
   source:
-    path: manifests/twitter-to-airtable
+    path: manifests/social-to-grist
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
     targetRevision: HEAD
   syncPolicy:

manifests/mastodon-to-airtable/twitter-to-airtable.yaml

@@ -1,151 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: docker-config
-  namespace: mastodon-to-airtable
-  annotations:
-    kube-1password: i6ngbk5zf4k52xgwdwnfup5bby
-    kube-1password/vault: Kubernetes
-    kube-1password/secret-text-key: .dockerconfigjson
-type: kubernetes.io/dockerconfigjson
-data:
-  .dockerconfigjson: e30=
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: mastodon-to-airtable-auth
-  namespace: mastodon-to-airtable
-  annotations:
-    kube-1password: mr6spkkx7n3memkbute6ojaarm
-    kube-1password/vault: Kubernetes
-type: Opaque
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: mastodon-to-airtable
-  namespace: mastodon-to-airtable
-  annotations:
-    kube-1password: kizmkmbndgu3ryrox3csev4mim
-    kube-1password/vault: Kubernetes
-    kube-1password/secret-text-parse: "true"
-type: Opaque
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: mastodon-to-airtable
-  namespace: mastodon-to-airtable
-spec:
-  type: ClusterIP
-  ports:
-  - port: 80
-    targetPort: auth
-    name: web
-  selector:
-    app: mastodon-to-airtable
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: mastodon-to-airtable
-  namespace: mastodon-to-airtable
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: mastodon-to-airtable
-  template:
-    metadata:
-      labels:
-        app: mastodon-to-airtable
-    spec:
-      imagePullSecrets:
-        - name: docker-config
-      containers:
-      - args:
-        - --cookie-secure=false
-        - --provider=oidc
-        - --provider-display-name=Auth0
-        - --upstream=http://localhost:8080
-        - --http-address=$(HOST_IP):8000
-        - --redirect-url=https://mastodon-to-airtable.cluster.fun/oauth2/callback
-        - --email-domain=marcusnoble.co.uk
-        - --pass-basic-auth=false
-        - --pass-access-token=false
-        - --oidc-issuer-url=https://marcusnoble.eu.auth0.com/
-        - --cookie-secret=KDGD6rrK6cBmryyZ4wcJ9xAUNW9AQNFT
-        env:
-        - name: HOST_IP
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: status.podIP
-        - name: OAUTH2_PROXY_CLIENT_ID
-          valueFrom:
-            secretKeyRef:
-              key: username
-              name: mastodon-to-airtable-auth
-        - name: OAUTH2_PROXY_CLIENT_SECRET
-          valueFrom:
-            secretKeyRef:
-              key: password
-              name: mastodon-to-airtable-auth
-        image: quay.io/oauth2-proxy/oauth2-proxy:v7.7.1
-        name: oauth-proxy
-        ports:
-        - containerPort: 8000
-          protocol: TCP
-          name: auth
-        resources:
-          limits:
-            memory: 50Mi
-          requests:
-            memory: 50Mi
-      - name: web
-        image: rg.fr-par.scw.cloud/averagemarcus-private/mastodon-to-airtable:latest
-        imagePullPolicy: Always
-        env:
-        - name: PORT
-          value: "8080"
-        envFrom:
-        - secretRef:
-            name: "mastodon-to-airtable"
-        ports:
-        - containerPort: 8080
-          name: web
-        resources:
-          limits:
-            memory: 50Mi
-          requests:
-            memory: 50Mi
-
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: mastodon-to-airtable
-  namespace: mastodon-to-airtable
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt
-    kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.tls: "true"
-    ingress.kubernetes.io/ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
-spec:
-  tls:
-  - hosts:
-    - mastodon-to-airtable.cluster.fun
-    secretName: mastodon-to-airtable-ingress
-  rules:
-  - host: mastodon-to-airtable.cluster.fun
-    http:
-      paths:
-      - path: /
-        pathType: ImplementationSpecific
-        backend:
-          service:
-            name: mastodon-to-airtable
-            port:
-              number: 80

manifests/social-to-grist/social-to-grist.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: docker-config
-  namespace: twitter-to-airtable
+  namespace: social-to-grist
   annotations:
     kube-1password: i6ngbk5zf4k52xgwdwnfup5bby
     kube-1password/vault: Kubernetes
@@ -14,8 +14,8 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: twitter-to-airtable-auth
-  namespace: twitter-to-airtable
+  name: social-to-grist-auth
+  namespace: social-to-grist
   annotations:
     kube-1password: mr6spkkx7n3memkbute6ojaarm
     kube-1password/vault: Kubernetes
@@ -24,10 +24,10 @@ type: Opaque
 apiVersion: v1
 kind: Secret
 metadata:
-  name: twitter-to-airtable
-  namespace: twitter-to-airtable
+  name: social-to-grist
+  namespace: social-to-grist
   annotations:
-    kube-1password: 2fjbfe2titvezdh2ktsyhugatq
+    kube-1password: oa3ycnui3ji4lc665bifaao63q
     kube-1password/vault: Kubernetes
     kube-1password/secret-text-parse: "true"
 type: Opaque
@@ -35,8 +35,8 @@ type: Opaque
 apiVersion: v1
 kind: Service
 metadata:
-  name: twitter-to-airtable
-  namespace: twitter-to-airtable
+  name: social-to-grist
+  namespace: social-to-grist
 spec:
   type: ClusterIP
   ports:
@@ -44,22 +44,22 @@ spec:
     targetPort: auth
     name: web
   selector:
-    app: twitter-to-airtable
+    app: social-to-grist
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: twitter-to-airtable
-  namespace: twitter-to-airtable
+  name: social-to-grist
+  namespace: social-to-grist
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: twitter-to-airtable
+      app: social-to-grist
   template:
     metadata:
       labels:
-        app: twitter-to-airtable
+        app: social-to-grist
     spec:
       imagePullSecrets:
         - name: docker-config
@@ -70,7 +70,7 @@ spec:
         - --provider-display-name=Auth0
         - --upstream=http://localhost:8080
         - --http-address=$(HOST_IP):8000
-        - --redirect-url=https://twitter-to-airtable.cluster.fun/oauth2/callback
+        - --redirect-url=https://social-to-grist.cluster.fun/oauth2/callback
         - --email-domain=marcusnoble.co.uk
         - --pass-basic-auth=false
         - --pass-access-token=false
@@ -86,12 +86,12 @@ spec:
           valueFrom:
             secretKeyRef:
               key: username
-              name: twitter-to-airtable-auth
+              name: social-to-grist-auth
         - name: OAUTH2_PROXY_CLIENT_SECRET
           valueFrom:
             secretKeyRef:
               key: password
-              name: twitter-to-airtable-auth
+              name: social-to-grist-auth
         image: quay.io/oauth2-proxy/oauth2-proxy:v7.7.1
         name: oauth-proxy
         ports:
@@ -104,14 +104,14 @@ spec:
           requests:
             memory: 50Mi
       - name: web
-        image: rg.fr-par.scw.cloud/averagemarcus-private/twitter-to-airtable:latest
+        image: rg.fr-par.scw.cloud/averagemarcus-private/social-to-grist:latest
         imagePullPolicy: Always
         env:
         - name: PORT
           value: "8080"
         envFrom:
         - secretRef:
-            name: "twitter-to-airtable"
+            name: "social-to-grist"
         ports:
         - containerPort: 8080
           name: web
@@ -125,8 +125,8 @@ spec:
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: twitter-to-airtable
-  namespace: twitter-to-airtable
+  name: social-to-grist
+  namespace: social-to-grist
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
     kubernetes.io/ingress.class: traefik
@@ -136,16 +136,16 @@ metadata:
 spec:
   tls:
   - hosts:
-    - twitter-to-airtable.cluster.fun
-    secretName: twitter-to-airtable-ingress
+    - social-to-grist.cluster.fun
+    secretName: social-to-grist-ingress
   rules:
-  - host: twitter-to-airtable.cluster.fun
+  - host: social-to-grist.cluster.fun
     http:
       paths:
       - path: /
         pathType: ImplementationSpecific
         backend:
           service:
-            name: twitter-to-airtable
+            name: social-to-grist
             port:
               number: 80