1 Commits

Author SHA1 Message Date
d0a454eaba Update grafana/promtail Docker tag to v3 2025-06-06 03:03:01 +00:00
54 changed files with 226 additions and 519 deletions

View File

@@ -22,4 +22,7 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image

View File

@@ -22,5 +22,8 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image
--- ---

View File

@@ -22,4 +22,7 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image

View File

@@ -22,4 +22,7 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image

View File

@@ -22,5 +22,8 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image
--- ---

View File

@@ -22,5 +22,8 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image
--- ---

View File

@@ -22,4 +22,7 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image

View File

@@ -22,4 +22,8 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image
--- ---

View File

@@ -22,5 +22,8 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image
--- ---

View File

@@ -22,4 +22,8 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image
--- ---

View File

@@ -22,4 +22,8 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image
--- ---

View File

@@ -22,4 +22,7 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image

View File

@@ -22,4 +22,7 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image

View File

@@ -22,4 +22,8 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image
--- ---

View File

@@ -1,17 +1,17 @@
apiVersion: argoproj.io/v1alpha1 apiVersion: argoproj.io/v1alpha1
kind: Application kind: Application
metadata: metadata:
name: bsky-screenshot name: social-to-grist
namespace: argocd namespace: argocd
finalizers: finalizers:
- resources-finalizer.argocd.argoproj.io - resources-finalizer.argocd.argoproj.io
spec: spec:
project: cluster.fun project: cluster.fun
destination: destination:
namespace: bsky-screenshot namespace: social-to-grist
name: civo name: civo
source: source:
path: manifests/bsky-screenshot path: manifests/social-to-grist
repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git" repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
targetRevision: HEAD targetRevision: HEAD
syncPolicy: syncPolicy:
@@ -22,3 +22,7 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image

View File

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

View File

@@ -1,17 +1,17 @@
apiVersion: argoproj.io/v1alpha1 apiVersion: argoproj.io/v1alpha1
kind: Application kind: Application
metadata: metadata:
name: cors-proxy name: cluster-fun-starling
namespace: argocd namespace: argocd
finalizers: finalizers:
- resources-finalizer.argocd.argoproj.io - resources-finalizer.argocd.argoproj.io
spec: spec:
project: cluster.fun project: cluster.fun
destination: destination:
namespace: cors-proxy namespace: starling
name: cluster-fun (v2) name: cluster-fun (v2)
source: source:
path: manifests/cors-proxy path: manifests/starling
repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git" repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
targetRevision: HEAD targetRevision: HEAD
syncPolicy: syncPolicy:

View File

@@ -22,4 +22,7 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image

View File

@@ -22,4 +22,7 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image

View File

@@ -22,5 +22,8 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image
--- ---

View File

@@ -22,4 +22,7 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image

View File

@@ -22,4 +22,7 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image

View File

@@ -22,4 +22,7 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image

View File

@@ -22,5 +22,8 @@ spec:
- kind: Secret - kind: Secret
jsonPointers: jsonPointers:
- /data - /data
- group: apps
kind: Deployment
jqPathExpressions:
- .spec.template.spec.containers[]?.image
--- ---

View File

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

View File

@@ -29,7 +29,6 @@ spec:
- changedetection.cluster.fun - changedetection.cluster.fun
- grafana.cluster.fun - grafana.cluster.fun
- podgrab.cluster.fun - podgrab.cluster.fun
- stablediffusion.cluster.fun
secretName: auth-proxy-ingress secretName: auth-proxy-ingress
rules: rules:
- host: downloads.cluster.fun - host: downloads.cluster.fun
@@ -222,13 +221,3 @@ spec:
name: tailscale-proxy name: tailscale-proxy
port: port:
name: auth name: auth
- host: stablediffusion.cluster.fun
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
service:
name: tailscale-proxy
port:
name: auth

View File

@@ -6,10 +6,6 @@ metadata:
annotations: annotations:
cert-manager.io/cluster-issuer: letsencrypt cert-manager.io/cluster-issuer: letsencrypt
nginx.ingress.kubernetes.io/force-ssl-redirect: "true" nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
nginx.ingress.kubernetes.io/proxy-body-size: 25m
nginx.ingress.kubernetes.io/client-body-buffer-size: 25m
spec: spec:
ingressClassName: nginx ingressClassName: nginx
tls: tls:
@@ -17,7 +13,6 @@ spec:
- hello-world.cluster.fun - hello-world.cluster.fun
- ombi.cluster.fun - ombi.cluster.fun
- bsky-feeds.cluster.fun - bsky-feeds.cluster.fun
- ai.cluster.fun
secretName: non-auth-proxy-ingress secretName: non-auth-proxy-ingress
rules: rules:
- host: hello-world.cluster.fun - host: hello-world.cluster.fun
@@ -50,13 +45,3 @@ spec:
name: tailscale-proxy name: tailscale-proxy
port: port:
name: non-auth name: non-auth
- host: ai.cluster.fun
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
service:
name: tailscale-proxy
port:
name: non-auth

View File

@@ -67,7 +67,7 @@ spec:
mountPath: /config/ mountPath: /config/
- name: oauth-proxy - name: oauth-proxy
image: quay.io/oauth2-proxy/oauth2-proxy:v7.12.0 image: quay.io/oauth2-proxy/oauth2-proxy:v7.9.0
args: args:
- --cookie-secure=false - --cookie-secure=false
- --provider=oidc - --provider=oidc

View File

@@ -1,70 +0,0 @@
apiVersion: v1
kind: Service
metadata:
name: bsky-screenshot
namespace: bsky-screenshot
spec:
type: ClusterIP
ports:
- port: 80
targetPort: web
name: web
selector:
app: bsky-screenshot
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: bsky-screenshot
namespace: bsky-screenshot
spec:
replicas: 1
selector:
matchLabels:
app: bsky-screenshot
template:
metadata:
labels:
app: bsky-screenshot
spec:
containers:
- name: web
image: rg.fr-par.scw.cloud/averagemarcus/bsky-screenshot:latest
imagePullPolicy: Always
ports:
- containerPort: 80
name: web
resources:
limits:
memory: 20Mi
requests:
memory: 20Mi
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: bsky-screenshot
namespace: bsky-screenshot
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:
- bsky-screenshot.cluster.fun
secretName: bsky-screenshot-ingress
rules:
- host: bsky-screenshot.cluster.fun
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
service:
name: bsky-screenshot
port:
number: 80

View File

@@ -1,76 +0,0 @@
apiVersion: v1
kind: Service
metadata:
name: cors-proxy
namespace: cors-proxy
spec:
type: ClusterIP
ports:
- port: 80
targetPort: 8000
name: web
selector:
app: cors-proxy
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: cors-proxy
namespace: cors-proxy
spec:
replicas: 2
selector:
matchLabels:
app: cors-proxy
template:
metadata:
labels:
app: cors-proxy
spec:
containers:
- name: web
image: rg.fr-par.scw.cloud/averagemarcus/cors-proxy:latest
imagePullPolicy: Always
ports:
- containerPort: 8000
name: web
env:
- name: ALLOWLIST
value: cdn.bsky.app
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: cors-proxy
namespace: cors-proxy
annotations:
cert-manager.io/cluster-issuer: letsencrypt
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
spec:
ingressClassName: nginx
tls:
- hosts:
- cors-proxy.cluster.fun
- cors-proxy.marcusnoble.co.uk
secretName: cors-proxy-ingress
rules:
- host: cors-proxy.cluster.fun
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
service:
name: cors-proxy
port:
number: 80
- host: cors-proxy.marcusnoble.co.uk
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
service:
name: cors-proxy
port:
number: 80

View File

@@ -81,7 +81,7 @@ spec:
secretKeyRef: secretKeyRef:
key: password key: password
name: dashboard-auth name: dashboard-auth
image: quay.io/oauth2-proxy/oauth2-proxy:v7.12.0 image: quay.io/oauth2-proxy/oauth2-proxy:v7.9.0
name: oauth-proxy name: oauth-proxy
ports: ports:
- containerPort: 8000 - containerPort: 8000

View File

@@ -42,7 +42,7 @@ spec:
spec: spec:
containers: containers:
- name: git - name: git
image: gitea/gitea:1.24.5 image: gitea/gitea:1.23.8
env: env:
- name: APP_NAME - name: APP_NAME
value: "Git" value: "Git"

View File

@@ -72,7 +72,7 @@ spec:
serviceAccountName: grist serviceAccountName: grist
containers: containers:
- name: grist - name: grist
image: gristlabs/grist-oss:1.7.3 image: gristlabs/grist-oss:1.6.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http

View File

@@ -32,9 +32,6 @@ data:
kcdbudapest: https://speaking.marcusnoble.co.uk/43QLpx/the-future-of-kubernetes-admission-logic kcdbudapest: https://speaking.marcusnoble.co.uk/43QLpx/the-future-of-kubernetes-admission-logic
kcdczechslovak: https://speaking.marcusnoble.co.uk/Np2xUv/pod-deep-dive-the-interesting-bits kcdczechslovak: https://speaking.marcusnoble.co.uk/Np2xUv/pod-deep-dive-the-interesting-bits
cnsmunich: https://speaking.marcusnoble.co.uk/HqYcp2/pod-deep-dive-the-interesting-bits cnsmunich: https://speaking.marcusnoble.co.uk/HqYcp2/pod-deep-dive-the-interesting-bits
cnsmunich-feedback: https://yay-or-nay.cluster.fun/feedback/20UETBI0
containerdays25: https://speaking.marcusnoble.co.uk/HARSlE/the-future-of-kubernetes-admission-logic
containerdays25-feedback: https://yay-or-nay.cluster.fun/feedback/F8P351QK
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service

View File

@@ -152,7 +152,7 @@ spec:
secretKeyRef: secretKeyRef:
key: password key: password
name: mastodon-digest-auth name: mastodon-digest-auth
image: quay.io/oauth2-proxy/oauth2-proxy:v7.12.0 image: quay.io/oauth2-proxy/oauth2-proxy:v7.9.0
name: oauth-proxy name: oauth-proxy
ports: ports:
- containerPort: 8000 - containerPort: 8000

View File

@@ -363,7 +363,7 @@ spec:
fsGroup: 1000 fsGroup: 1000
containers: containers:
- name: "riot" - name: "riot"
image: "vectorim/element-web:v1.11.110" image: "vectorim/element-web:v1.11.102"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -444,7 +444,7 @@ spec:
fsGroup: 1000 fsGroup: 1000
initContainers: initContainers:
- name: generate-signing-key - name: generate-signing-key
image: "ghcr.io/element-hq/synapse:v1.137.0" image: "ghcr.io/element-hq/synapse:v1.131.0"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: SYNAPSE_SERVER_NAME - name: SYNAPSE_SERVER_NAME
@@ -471,7 +471,7 @@ spec:
mountPath: /data/keys mountPath: /data/keys
containers: containers:
- name: "synapse" - name: "synapse"
image: "ghcr.io/element-hq/synapse:v1.137.0" image: "ghcr.io/element-hq/synapse:v1.131.0"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http

View File

@@ -30,7 +30,7 @@ spec:
spec: spec:
containers: containers:
- name: frontend - name: frontend
image: ghcr.io/mealie-recipes/mealie:v3.1.2 image: ghcr.io/mealie-recipes/mealie:v2.8.0
imagePullPolicy: Always imagePullPolicy: Always
envFrom: envFrom:
- secretRef: - secretRef:

View File

@@ -237,7 +237,7 @@ spec:
- --resources=validatingwebhookconfigurations - --resources=validatingwebhookconfigurations
#- --resources=volumeattachments #- --resources=volumeattachments
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
image: "registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.17.0" image: "registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0"
ports: ports:
- containerPort: 8080 - containerPort: 8080
livenessProbe: livenessProbe:

View File

@@ -236,7 +236,7 @@ spec:
serviceAccountName: promtail serviceAccountName: promtail
containers: containers:
- name: promtail - name: promtail
image: "grafana/promtail:3.5.3" image: "grafana/promtail:3.5.1"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- "-config.file=/etc/promtail/promtail.yaml" - "-config.file=/etc/promtail/promtail.yaml"

View File

@@ -147,7 +147,7 @@ spec:
serviceAccountName: prometheus-server serviceAccountName: prometheus-server
containers: containers:
- name: vmagent - name: vmagent
image: "victoriametrics/vmagent:v1.125.0" image: "victoriametrics/vmagent:v1.118.0"
imagePullPolicy: "IfNotPresent" imagePullPolicy: "IfNotPresent"
args: args:
- -remoteWrite.url=http://vmcluster.proxy-civo.svc/insert/0/prometheus/ - -remoteWrite.url=http://vmcluster.proxy-civo.svc/insert/0/prometheus/

View File

@@ -237,7 +237,7 @@ spec:
- --resources=validatingwebhookconfigurations - --resources=validatingwebhookconfigurations
#- --resources=volumeattachments #- --resources=volumeattachments
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
image: "registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.17.0" image: "registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0"
ports: ports:
- containerPort: 8080 - containerPort: 8080
livenessProbe: livenessProbe:

View File

@@ -215,7 +215,7 @@ spec:
serviceAccountName: promtail serviceAccountName: promtail
containers: containers:
- name: promtail - name: promtail
image: "grafana/promtail:3.5.3" image: "grafana/promtail:3.5.1"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- "-config.file=/etc/promtail/promtail.yaml" - "-config.file=/etc/promtail/promtail.yaml"

View File

@@ -153,7 +153,7 @@ spec:
serviceAccountName: prometheus-server serviceAccountName: prometheus-server
containers: containers:
- name: vmagent - name: vmagent
image: "victoriametrics/vmagent:v1.125.0" image: "victoriametrics/vmagent:v1.118.0"
imagePullPolicy: "IfNotPresent" imagePullPolicy: "IfNotPresent"
args: args:
- -remoteWrite.url=http://vmcluster.auth-proxy.svc/insert/0/prometheus/ - -remoteWrite.url=http://vmcluster.auth-proxy.svc/insert/0/prometheus/

View File

@@ -203,7 +203,7 @@ spec:
spec: spec:
containers: containers:
- name: nextcloud - name: nextcloud
image: "nextcloud:31.0.8-apache" image: "nextcloud:31.0.5-apache"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: SQLITE_DATABASE - name: SQLITE_DATABASE
@@ -374,7 +374,7 @@ spec:
restartPolicy: Never restartPolicy: Never
containers: containers:
- name: nextcloud - name: nextcloud
image: "nextcloud:31.0.8-apache" image: "nextcloud:31.0.5-apache"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: [ "curl" ] command: [ "curl" ]
args: args:

View File

@@ -491,7 +491,7 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: LD_PRELOAD - name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so value: /usr/local/lib/libmimalloc.so
image: registry.k8s.io/ingress-nginx/controller:v1.13.2@sha256:1f7eaeb01933e719c8a9f4acd8181e555e582330c7d50f24484fb64d2ba9b2ef image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
lifecycle: lifecycle:
preStop: preStop:

View File

@@ -57,7 +57,7 @@ spec:
- name: data - name: data
mountPath: /data mountPath: /data
- name: update-native-modules - name: update-native-modules
image: nodered/node-red:4.1.0-18 image: nodered/node-red:4.0.9-18
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: command:
- bash - bash
@@ -73,7 +73,7 @@ spec:
mountPath: /data mountPath: /data
containers: containers:
- name: web - name: web
image: nodered/node-red:4.1.0-18 image: nodered/node-red:4.0.9-18
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 1880 - containerPort: 1880

View File

@@ -45,7 +45,7 @@ spec:
spec: spec:
containers: containers:
- name: outline - name: outline
image: outlinewiki/outline:0.87.3 image: outlinewiki/outline:0.84.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: ALLOWED_DOMAINS - name: ALLOWED_DOMAINS

View File

@@ -329,7 +329,7 @@ spec:
terminationGracePeriodSeconds: 30 terminationGracePeriodSeconds: 30
containers: containers:
- name: redis - name: redis
image: docker.io/bitnamilegacy/redis:7.2.4-debian-11-r11 image: docker.io/bitnami/redis:7.2.4-debian-11-r11
imagePullPolicy: "IfNotPresent" imagePullPolicy: "IfNotPresent"
securityContext: securityContext:
runAsUser: 1001 runAsUser: 1001
@@ -471,7 +471,7 @@ spec:
terminationGracePeriodSeconds: 30 terminationGracePeriodSeconds: 30
containers: containers:
- name: redis - name: redis
image: docker.io/bitnamilegacy/redis:7.2.4-debian-11-r11 image: docker.io/bitnami/redis:7.2.4-debian-11-r11
imagePullPolicy: "IfNotPresent" imagePullPolicy: "IfNotPresent"
securityContext: securityContext:
runAsUser: 1001 runAsUser: 1001

View File

@@ -66,7 +66,7 @@ spec:
spec: spec:
containers: containers:
- name: web - name: web
image: ghcr.io/miniflux/miniflux:2.2.12 image: ghcr.io/miniflux/miniflux:2.2.9
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
envFrom: envFrom:
- configMapRef: - configMapRef:

View File

@@ -92,7 +92,7 @@ spec:
secretKeyRef: secretKeyRef:
key: password key: password
name: social-to-grist-auth name: social-to-grist-auth
image: quay.io/oauth2-proxy/oauth2-proxy:v7.12.0 image: quay.io/oauth2-proxy/oauth2-proxy:v7.9.0
name: oauth-proxy name: oauth-proxy
ports: ports:
- containerPort: 8000 - containerPort: 8000

View File

@@ -1,151 +0,0 @@
apiVersion: v1
kind: Secret
metadata:
name: docker-config
namespace: social-to-rolodex
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: social-to-rolodex-auth
namespace: social-to-rolodex
annotations:
kube-1password: mr6spkkx7n3memkbute6ojaarm
kube-1password/vault: Kubernetes
type: Opaque
---
apiVersion: v1
kind: Secret
metadata:
name: social-to-rolodex
namespace: social-to-rolodex
annotations:
kube-1password: oa3ycnui3ji4lc665bifaao63q
kube-1password/vault: Kubernetes
kube-1password/secret-text-parse: "true"
type: Opaque
---
apiVersion: v1
kind: Service
metadata:
name: social-to-rolodex
namespace: social-to-rolodex
spec:
type: ClusterIP
ports:
- port: 80
targetPort: auth
name: web
selector:
app: social-to-rolodex
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: social-to-rolodex
namespace: social-to-rolodex
spec:
replicas: 1
selector:
matchLabels:
app: social-to-rolodex
template:
metadata:
labels:
app: social-to-rolodex
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://social-to-rolodex.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: social-to-rolodex-auth
- name: OAUTH2_PROXY_CLIENT_SECRET
valueFrom:
secretKeyRef:
key: password
name: social-to-rolodex-auth
image: quay.io/oauth2-proxy/oauth2-proxy:v7.12.0
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/social-to-rolodex:latest
imagePullPolicy: Always
env:
- name: PORT
value: "8080"
envFrom:
- secretRef:
name: "social-to-rolodex"
ports:
- containerPort: 8080
name: web
resources:
limits:
memory: 50Mi
requests:
memory: 50Mi
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: social-to-rolodex
namespace: social-to-rolodex
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:
- social-to-rolodex.cluster.fun
secretName: social-to-rolodex-ingress
rules:
- host: social-to-rolodex.cluster.fun
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
service:
name: social-to-rolodex
port:
number: 80

View File

@@ -0,0 +1,106 @@
apiVersion: v1
kind: Secret
metadata:
name: docker-config
namespace: starling
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: starling
namespace: starling
annotations:
kube-1password: ufxpki65ffgprn2upksirweeie
kube-1password/vault: Kubernetes
kube-1password/secret-text-parse: "true"
type: Opaque
---
apiVersion: v1
kind: Service
metadata:
name: starling
namespace: starling
spec:
type: ClusterIP
ports:
- port: 80
targetPort: web
name: web
selector:
app: starling
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: starling
namespace: starling
spec:
replicas: 1
selector:
matchLabels:
app: starling
template:
metadata:
labels:
app: starling
spec:
imagePullSecrets:
- name: docker-config
containers:
- name: web
image: rg.fr-par.scw.cloud/averagemarcus-private/starling:latest
imagePullPolicy: Always
env:
- name: PORT
value: "3000"
- name: SHARED_SECRET
valueFrom:
secretKeyRef:
name: starling
key: SHARED_SECRET
- name: ACCESS_TOKEN
valueFrom:
secretKeyRef:
name: starling
key: ACCESS_TOKEN
ports:
- containerPort: 3000
name: web
resources:
limits:
memory: 50Mi
requests:
memory: 50Mi
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: starling
namespace: starling
annotations:
cert-manager.io/cluster-issuer: letsencrypt
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
spec:
ingressClassName: nginx
tls:
- hosts:
- starling.marcusnoble.co.uk
secretName: starling-ingress
rules:
- host: starling.marcusnoble.co.uk
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
service:
name: starling
port:
number: 80

View File

@@ -45,7 +45,7 @@ spec:
- --entrypoints.websecure.http.tls=true - --entrypoints.websecure.http.tls=true
- --entrypoints.web.http.redirections.entrypoint.to=websecure - --entrypoints.web.http.redirections.entrypoint.to=websecure
- --entrypoints.web.http.redirections.entrypoint.scheme=https - --entrypoints.web.http.redirections.entrypoint.scheme=https
image: rancher/mirrored-library-traefik:2.11.29 image: rancher/mirrored-library-traefik:2.11.24
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
failureThreshold: 3 failureThreshold: 3

View File

@@ -1,94 +0,0 @@
apiVersion: v1
kind: Secret
metadata:
name: yay-or-nay
namespace: yay-or-nay
annotations:
kube-1password: vtnx2swze7r6qepxnlepufvcbi
kube-1password/vault: Kubernetes
kube-1password/secret-text-parse: "true"
type: Opaque
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: yay-or-nay
labels:
app: yay-or-nay
app.kubernetes.io/name: yay-or-nay
annotations:
reloader.stakater.com/search: "true"
spec:
replicas: 1
selector:
matchLabels:
app: yay-or-nay
template:
metadata:
labels:
app: yay-or-nay
app.kubernetes.io/name: yay-or-nay
spec:
containers:
- name: yay-or-nay
image: ghcr.io/mocdaniel/yay-or-nay:1.1.1
imagePullPolicy: IfNotPresent
ports:
- containerPort: 3000
name: web
envFrom:
- secretRef:
name: yay-or-nay
livenessProbe:
httpGet:
path: /
port: web
initialDelaySeconds: 10
readinessProbe:
httpGet:
path: /
port: web
initialDelaySeconds: 10
---
apiVersion: v1
kind: Service
metadata:
name: yay-or-nay
labels:
app.kubernetes.io/name: yay-or-nay
spec:
type: ClusterIP
ports:
- port: 80
targetPort: web
name: web
selector:
app: yay-or-nay
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: yay-or-nay
namespace: yay-or-nay
labels:
app.kubernetes.io/name: yay-or-nay
annotations:
cert-manager.io/cluster-issuer: letsencrypt
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
spec:
tls:
- hosts:
- "yay-or-nay.cluster.fun"
secretName: "yay-or-nay-ingress"
rules:
- host: "yay-or-nay.cluster.fun"
http:
paths:
- path: "/"
pathType: ImplementationSpecific
backend:
service:
name: yay-or-nay
port:
name: web