mirror of
https://github.com/rubenhensen/k8scd.git
synced 2026-11-16 14:29:09 +01:00
Compare commits
48
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6b81033f70 | ||
|
|
e518e1368f | ||
|
|
9b9bd8bad0 | ||
|
|
7eb69b17e1 | ||
|
|
b0ed6fdad1 | ||
|
|
9cf0c7f9e9 | ||
|
|
8a409c6a5b | ||
|
|
8cb8b28cd9 | ||
|
|
bdbabde317 | ||
|
|
bd2606591e | ||
|
|
ce1115d4f9 | ||
|
|
f36b90557b | ||
|
|
629d137c1e | ||
|
|
1582f67cda | ||
|
|
b4d7845349 | ||
|
|
9d4c9c8296 | ||
|
|
822270d8b3 | ||
|
|
ce881ac7d7 | ||
|
|
0514a4248a | ||
|
|
d0b36b6542 | ||
|
|
7bb7813d1d | ||
|
|
53f01c65dc | ||
|
|
a73bdb8fb4 | ||
|
|
f390b3a70d | ||
|
|
fae03f3b8b | ||
|
|
f2c1b9ac06 | ||
|
|
119f7729f6 | ||
|
|
6da1b3e88e | ||
|
|
8aaf2ec8ec | ||
|
|
f2716e1169 | ||
|
|
a10dbecc94 | ||
|
|
2ce9c33dbd | ||
|
|
8a66913a54 | ||
|
|
1f736cd4c7 | ||
|
|
e5d82b69fd | ||
|
|
fe678d4b4b | ||
|
|
ff73f99d43 | ||
|
|
ea86611deb | ||
|
|
7820b8e0bf | ||
|
|
de7ca770a0 | ||
|
|
767facc5e2 | ||
|
|
746cd1283e | ||
|
|
345055e3e6 | ||
|
|
f52b6973e1 | ||
|
|
177dbef15b | ||
|
|
103aed46ed | ||
|
|
9a984c724c | ||
|
|
3e45ddaf4a |
No files matched your search
File diff suppressed because it is too large.
Load diff
@@ -1,7 +1,7 @@
|
||||
apiVersion: argoproj.io/v1alpha1
|
||||
kind: Application
|
||||
metadata:
|
||||
name: phocas-lustrum
|
||||
name: ca-bundle
|
||||
namespace: argocd
|
||||
finalizers:
|
||||
- resources-finalizer.argocd.argoproj.io
|
||||
@@ -10,12 +10,12 @@ spec:
|
||||
source:
|
||||
repoURL: https://github.com/rubenhensen/k8scd.git
|
||||
targetRevision: HEAD
|
||||
path: phocas-lustrum
|
||||
path: ca-bundle
|
||||
destination:
|
||||
server: https://kubernetes.default.svc
|
||||
namespace: phocas-lustrum
|
||||
# Every ConfigMap sets its own namespace.
|
||||
namespace: argocd
|
||||
syncPolicy:
|
||||
syncOptions:
|
||||
- CreateNamespace=true
|
||||
automated:
|
||||
selfHeal: true
|
||||
prune: true
|
||||
@@ -12,12 +12,23 @@ spec:
|
||||
project: default
|
||||
source:
|
||||
repoURL: https://charts.jetstack.io
|
||||
targetRevision: v1.15.5
|
||||
targetRevision: v1.20.4
|
||||
chart: cert-manager
|
||||
helm:
|
||||
parameters:
|
||||
- name: crds.enabled
|
||||
value: 'true'
|
||||
# The controller talks ACME to Let's Encrypt. Give it a trust store
|
||||
# without the compromised eMudhra intermediates, see ca-bundle/.
|
||||
values: |
|
||||
volumes:
|
||||
- name: patched-ca-bundle
|
||||
configMap:
|
||||
name: patched-ca-bundle
|
||||
volumeMounts:
|
||||
- name: patched-ca-bundle
|
||||
mountPath: /etc/ssl/certs
|
||||
readOnly: true
|
||||
syncPolicy:
|
||||
syncOptions:
|
||||
- CreateNamespace=true
|
||||
|
||||
@@ -10,10 +10,15 @@ spec:
|
||||
source:
|
||||
chart: cloudnative-pg
|
||||
repoURL: https://cloudnative-pg.github.io/charts
|
||||
targetRevision: 0.23.2
|
||||
targetRevision: 0.29.1
|
||||
helm:
|
||||
values: |
|
||||
# Default values are fine
|
||||
config:
|
||||
data:
|
||||
# Swap the instance manager inside running pods on operator
|
||||
# upgrades instead of restarting them. Both clusters have a
|
||||
# single instance, so a restart means downtime.
|
||||
ENABLE_INSTANCE_MANAGER_INPLACE_UPDATES: "true"
|
||||
destination:
|
||||
server: https://kubernetes.default.svc
|
||||
namespace: cnpg-system
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
apiVersion: argoproj.io/v1alpha1
|
||||
kind: Application
|
||||
metadata:
|
||||
name: ghost-blog
|
||||
namespace: argocd
|
||||
finalizers:
|
||||
- resources-finalizer.argocd.argoproj.io
|
||||
spec:
|
||||
project: default
|
||||
source:
|
||||
repoURL: https://github.com/rubenhensen/k8scd.git
|
||||
targetRevision: HEAD
|
||||
path: ghost-blog
|
||||
destination:
|
||||
server: https://kubernetes.default.svc
|
||||
namespace: ghost-blog
|
||||
syncPolicy:
|
||||
syncOptions:
|
||||
- CreateNamespace=true
|
||||
automated:
|
||||
selfHeal: true
|
||||
@@ -1,21 +0,0 @@
|
||||
apiVersion: argoproj.io/v1alpha1
|
||||
kind: Application
|
||||
metadata:
|
||||
name: lingo
|
||||
namespace: argocd
|
||||
finalizers:
|
||||
- resources-finalizer.argocd.argoproj.io
|
||||
spec:
|
||||
project: default
|
||||
source:
|
||||
repoURL: https://github.com/rubenhensen/k8scd.git
|
||||
targetRevision: HEAD
|
||||
path: lingo
|
||||
destination:
|
||||
server: https://kubernetes.default.svc
|
||||
namespace: lingo
|
||||
syncPolicy:
|
||||
syncOptions:
|
||||
- CreateNamespace=true
|
||||
automated:
|
||||
selfHeal: true
|
||||
@@ -16,13 +16,24 @@ spec:
|
||||
sources:
|
||||
- chart: longhorn
|
||||
repoURL: https://charts.longhorn.io/
|
||||
targetRevision: 1.7.3 # Replace with the Longhorn version you'd like to install or upgrade to
|
||||
# Stay on 1.11.2 while on Kubernetes 1.33: 1.11.3 and newer need 1.34,
|
||||
# see docs/upgrade-k8s-1.33.md
|
||||
targetRevision: 1.11.2
|
||||
helm:
|
||||
values: |
|
||||
persistence:
|
||||
defaultClassReplicaCount: 1
|
||||
preUpgradeChecker:
|
||||
jobEnabled: false
|
||||
# Since 1.8 the backup target is a BackupTarget resource instead of
|
||||
# the backup-target setting.
|
||||
defaultBackupStore:
|
||||
backupTarget: nfs://192.168.1.99:/volume1/microk8s-nfs
|
||||
pollInterval: 300
|
||||
defaultSettings:
|
||||
# Move volumes to the new engine image after each Longhorn
|
||||
# upgrade, one at a time. At 0 they stayed behind on 1.7.1/1.7.2.
|
||||
concurrentAutomaticEngineUpgradePerNodeLimit: 1
|
||||
parameters:
|
||||
- name: csi.kubeletRootDir
|
||||
value: "/var/snap/microk8s/common/var/lib/kubelet"
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
apiVersion: argoproj.io/v1alpha1
|
||||
kind: Application
|
||||
metadata:
|
||||
name: nas
|
||||
namespace: argocd
|
||||
finalizers:
|
||||
- resources-finalizer.argocd.argoproj.io
|
||||
spec:
|
||||
project: default
|
||||
source:
|
||||
repoURL: https://github.com/rubenhensen/k8scd.git
|
||||
targetRevision: HEAD
|
||||
path: nas
|
||||
destination:
|
||||
server: https://kubernetes.default.svc
|
||||
namespace: nas
|
||||
syncPolicy:
|
||||
syncOptions:
|
||||
- CreateNamespace=true
|
||||
automated:
|
||||
selfHeal: true
|
||||
@@ -1,22 +0,0 @@
|
||||
apiVersion: argoproj.io/v1alpha1
|
||||
kind: Application
|
||||
metadata:
|
||||
name: stalwart
|
||||
namespace: argocd
|
||||
spec:
|
||||
project: default
|
||||
source:
|
||||
repoURL: https://github.com/rubenhensen/k8scd.git
|
||||
targetRevision: HEAD
|
||||
path: stalwart
|
||||
destination:
|
||||
server: https://kubernetes.default.svc
|
||||
namespace: stalwart
|
||||
syncPolicy:
|
||||
automated:
|
||||
selfHeal: true
|
||||
prune: true
|
||||
syncOptions:
|
||||
- CreateNamespace=true
|
||||
automated:
|
||||
selfHeal: true
|
||||
@@ -1,21 +0,0 @@
|
||||
apiVersion: argoproj.io/v1alpha1
|
||||
kind: Application
|
||||
metadata:
|
||||
name: whisper
|
||||
namespace: argocd
|
||||
finalizers:
|
||||
- resources-finalizer.argocd.argoproj.io
|
||||
spec:
|
||||
project: default
|
||||
source:
|
||||
repoURL: https://github.com/rubenhensen/k8scd.git
|
||||
targetRevision: HEAD
|
||||
path: whishper
|
||||
destination:
|
||||
server: https://kubernetes.default.svc
|
||||
namespace: whisper
|
||||
syncPolicy:
|
||||
syncOptions:
|
||||
- CreateNamespace=true
|
||||
automated:
|
||||
selfHeal: true
|
||||
@@ -9,7 +9,6 @@ resources:
|
||||
- https://raw.githubusercontent.com/argoproj/argo-cd/refs/tags/v2.14.2/manifests/install.yaml
|
||||
- ingress.yaml
|
||||
- oidc-secret.yaml
|
||||
- patched-ca-bundle.yaml
|
||||
|
||||
patches:
|
||||
- target:
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
# Mount patched-ca-bundle over /etc/ssl/certs so git, helm and the Go
|
||||
# binaries stop trusting the compromised eMudhra intermediates. The whole
|
||||
# directory is replaced because OpenSSL and Go also read the per-root files
|
||||
# next to ca-certificates.crt. Drop this once Argo CD ships a fixed image.
|
||||
# Mount patched-ca-bundle (from ca-bundle/) over /etc/ssl/certs so git, helm
|
||||
# and the Go binaries stop trusting the compromised eMudhra intermediates.
|
||||
# The whole directory is replaced because OpenSSL and Go also read the
|
||||
# per-root files next to ca-certificates.crt. Drop this once Argo CD ships a
|
||||
# fixed image.
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -4,6 +4,9 @@ metadata:
|
||||
name: authentik-postgres
|
||||
spec:
|
||||
instances: 1
|
||||
# Pinned so a new operator default (PostgreSQL 18 since CNPG 1.26.3) can't
|
||||
# start an in-place major upgrade. CNPG filled this in at creation.
|
||||
imageName: ghcr.io/cloudnative-pg/postgresql:17.4
|
||||
primaryUpdateStrategy: unsupervised
|
||||
bootstrap:
|
||||
initdb:
|
||||
|
||||
@@ -69,6 +69,13 @@ spec:
|
||||
optional: true
|
||||
- name: VAPID_SUBJECT
|
||||
value: mailto:ruben.hensen@protonmail.com
|
||||
# Node trusts its built-in roots, which still include the ones
|
||||
# above the compromised eMudhra intermediates. Use
|
||||
# patched-ca-bundle through OpenSSL instead until Node ships a fix.
|
||||
- name: NODE_OPTIONS
|
||||
value: --use-openssl-ca
|
||||
- name: SSL_CERT_FILE
|
||||
value: /etc/ssl/certs/ca-certificates.crt
|
||||
resources:
|
||||
requests:
|
||||
memory: "128Mi"
|
||||
@@ -91,8 +98,14 @@ spec:
|
||||
volumeMounts:
|
||||
- mountPath: /app/data
|
||||
name: data
|
||||
- mountPath: /etc/ssl/certs
|
||||
name: patched-ca-bundle
|
||||
readOnly: true
|
||||
restartPolicy: Always
|
||||
volumes:
|
||||
- name: data
|
||||
persistentVolumeClaim:
|
||||
claimName: bolletjestrui-data
|
||||
- name: patched-ca-bundle
|
||||
configMap:
|
||||
name: patched-ca-bundle
|
||||
@@ -0,0 +1,5 @@
|
||||
apiVersion: v2
|
||||
name: ca-bundle
|
||||
description: Puts the patched-ca-bundle ConfigMap in every namespace listed in values.yaml
|
||||
type: application
|
||||
version: 0.1.0
|
||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,20 @@
|
||||
{{- /*
|
||||
Temporary CA bundle: ca-certificates.crt is /etc/ssl/certs/ca-certificates.crt
|
||||
from Alpine ca-certificates-bundle 20261020-r0, which drops the roots above
|
||||
the compromised eMudhra intermediates (https://emudhra.we-have-a-problem.com).
|
||||
Workloads mount it over /etc/ssl/certs until their images ship a fixed
|
||||
bundle. Server-side apply keeps the bundle out of the last-applied annotation.
|
||||
*/}}
|
||||
{{- range .Values.namespaces }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: patched-ca-bundle
|
||||
namespace: {{ . }}
|
||||
annotations:
|
||||
argocd.argoproj.io/sync-options: ServerSideApply=true
|
||||
data:
|
||||
ca-certificates.crt: |
|
||||
{{ $.Files.Get "ca-certificates.crt" | indent 4 }}
|
||||
{{- end }}
|
||||
@@ -0,0 +1,12 @@
|
||||
# Namespaces that get the patched-ca-bundle ConfigMap.
|
||||
namespaces:
|
||||
- actual-budget
|
||||
- argocd
|
||||
- authentik
|
||||
- bolletjestrui
|
||||
- cert-manager
|
||||
- gatus
|
||||
- gitea
|
||||
- immich
|
||||
- ntfy
|
||||
- serpbear
|
||||
@@ -7,10 +7,6 @@ records:
|
||||
expire: 300
|
||||
type: A
|
||||
content: "46.224.26.65"
|
||||
- name: "phocaslustrum"
|
||||
expire: 300
|
||||
type: A
|
||||
content: "62.41.86.27"
|
||||
- name: "ynab"
|
||||
expire: 300
|
||||
type: A
|
||||
@@ -43,14 +39,6 @@ records:
|
||||
expire: 300
|
||||
type: A
|
||||
content: "46.224.26.65"
|
||||
- name: "lingo"
|
||||
expire: 300
|
||||
type: A
|
||||
content: "46.224.26.65"
|
||||
- name: "blog"
|
||||
expire: 300
|
||||
type: A
|
||||
content: "46.224.26.65"
|
||||
- name: "serpbear"
|
||||
expire: 300
|
||||
type: A
|
||||
|
||||
@@ -0,0 +1,80 @@
|
||||
# Upgrade to Kubernetes 1.33
|
||||
|
||||
The cluster runs microk8s 1.32, which is out of upstream support, and Envoy
|
||||
Gateway v1.9 (the planned ingress-nginx replacement) needs 1.33 or newer.
|
||||
Several components are too old for 1.33 and have to move first, most of
|
||||
them one minor version at a time. Everything up to step 7 happens on 1.32.
|
||||
|
||||
Compatibility research from 2026-10-22. Recheck release notes before each
|
||||
step; versions move.
|
||||
|
||||
## 1. Preparation
|
||||
|
||||
- [x] Every Longhorn volume on engine image v1.7.3, old engine images deleted
|
||||
- [x] Longhorn system backup (`pre-upgrade-v1-7-3-20261022`)
|
||||
- [x] Renovate held at Longhorn 1.11.x (1.11.3 and 1.13 need k8s 1.34)
|
||||
|
||||
## 2. Longhorn 1.7.3 → 1.11.2
|
||||
|
||||
One minor per step, engine images upgraded after each one. Check volumes,
|
||||
the NFS backup target, the recurring backup job and the Velero `bak`
|
||||
snapshots after every step. Fresh Velero backup before starting.
|
||||
|
||||
- [x] 1.8.2: `backup-target` settings move to a `default` BackupTarget
|
||||
([notes](https://longhorn.io/docs/archives/1.8.2/important-notes/))
|
||||
- [x] 1.9.2
|
||||
- [x] Migrate every Longhorn CRD to `v1beta2` only in `storedVersions`.
|
||||
Already the case after 1.8.2/1.9.2; recheck right before 1.10.
|
||||
Mandatory before 1.10; skipping it leaves only a forced downgrade
|
||||
([notes](https://longhorn.io/docs/archives/1.10.2/important-notes/))
|
||||
- [x] 1.10.2: v1beta1 API removed, settings move to a v1/v2 JSON format.
|
||||
Engine images are now `docker.io/longhornio/...`
|
||||
- [x] 1.11.2. Not 1.11.3 or 1.12.x: those need k8s 1.34
|
||||
|
||||
## 3. Smaller components
|
||||
|
||||
- [ ] CloudNativePG 1.25.1 → 1.26 → 1.27 → 1.28.4 (each step restarts the
|
||||
single-instance databases)
|
||||
- [x] Velero 1.15.2 → 1.16.2 (chart 10.1.3), plugin-for-aws v1.12.2
|
||||
- [ ] Vault chart 0.28.1 → ≥0.30.1 (vault-k8s 1.7.0)
|
||||
- [x] cert-manager 1.15.5 → 1.16.5 → 1.17.4 → 1.18.6 → 1.19.6 → 1.20.4
|
||||
(1.18 changes the `rotationPolicy` default to Always)
|
||||
|
||||
## 4. External Secrets 0.10.7 → ≥0.17
|
||||
|
||||
- [ ] Move every ExternalSecret and SecretStore to `external-secrets.io/v1`
|
||||
- [ ] Upgrade one minor at a time; 0.16 needs v1alpha1 gone from
|
||||
`storedVersions`, 0.17 stops serving v1beta1, 0.19 needs server-side apply
|
||||
|
||||
## 5. Argo CD 2.14.2 → 3.4.12
|
||||
|
||||
- [ ] Read every upgrade note from
|
||||
[2.14→3.0](https://argo-cd.readthedocs.io/en/stable/operator-manual/upgrading/2.14-3.0/)
|
||||
onward. 3.0 switches to annotation tracking and excludes Endpoints and
|
||||
EndpointSlices by default (affects `home-assistant/service.yaml`); 3.3
|
||||
needs `kubectl apply --server-side --force-conflicts`
|
||||
|
||||
## 6. Calico 3.25.1 → 3.29.3
|
||||
|
||||
- [ ] Apply the manifest microk8s 1.33 ships
|
||||
(`/snap/microk8s/current/upgrade-scripts/000-switch-to-calico/resources/calico.yaml`
|
||||
after the refresh, or the 1.33 branch of canonical/microk8s before it).
|
||||
A snap refresh does not upgrade Calico.
|
||||
|
||||
## 7. microk8s 1.32 → 1.33
|
||||
|
||||
- [ ] Fresh Velero backup and `sudo microk8s dbctl backup`
|
||||
- [ ] `sudo snap refresh microk8s --channel=1.33/stable`
|
||||
- [ ] `sudo microk8s addons repo update core`
|
||||
- [ ] If kubelite panics with "Missing actuated resource record"
|
||||
([#5057](https://github.com/canonical/microk8s/issues/5057)):
|
||||
`sudo snap revert microk8s`
|
||||
|
||||
## 8. After 1.33
|
||||
|
||||
- [ ] cert-manager 1.21.2
|
||||
- [ ] Envoy Gateway v1.9 instead of ingress-nginx, Longhorn behind authentik
|
||||
OIDC
|
||||
|
||||
Out of scope here but due: the immich PostgreSQL 14 cluster reaches end of
|
||||
life on 2026-11-12.
|
||||
@@ -73,16 +73,6 @@ endpoints:
|
||||
conditions:
|
||||
- "[STATUS] == 401"
|
||||
- "[CERTIFICATE_EXPIRATION] > 168h"
|
||||
- name: lingo
|
||||
group: rubenhensen.nl
|
||||
url: https://lingo.rubenhensen.nl
|
||||
interval: 60s
|
||||
conditions: *http-ok
|
||||
- name: blog
|
||||
group: rubenhensen.nl
|
||||
url: https://blog.rubenhensen.nl
|
||||
interval: 60s
|
||||
conditions: *http-ok
|
||||
- name: serpbear
|
||||
group: rubenhensen.nl
|
||||
url: https://serpbear.rubenhensen.nl
|
||||
|
||||
@@ -48,6 +48,11 @@ spec:
|
||||
readOnly: true
|
||||
- name: data
|
||||
mountPath: /data
|
||||
# Trust store without the compromised eMudhra intermediates,
|
||||
# see ca-bundle/. Drop once the image ships a fixed bundle.
|
||||
- name: patched-ca-bundle
|
||||
mountPath: /etc/ssl/certs
|
||||
readOnly: true
|
||||
volumes:
|
||||
- name: config
|
||||
configMap:
|
||||
@@ -55,3 +60,6 @@ spec:
|
||||
- name: data
|
||||
persistentVolumeClaim:
|
||||
claimName: gatus-data
|
||||
- name: patched-ca-bundle
|
||||
configMap:
|
||||
name: patched-ca-bundle
|
||||
@@ -1,42 +0,0 @@
|
||||
apiVersion: external-secrets.io/v1beta1
|
||||
kind: ExternalSecret
|
||||
metadata:
|
||||
name: ghost-mail-config
|
||||
namespace: ghost-blog
|
||||
spec:
|
||||
refreshInterval: "15m"
|
||||
secretStoreRef:
|
||||
name: vault-backend
|
||||
kind: ClusterSecretStore
|
||||
target:
|
||||
name: ghost-mail-config
|
||||
creationPolicy: Owner
|
||||
data:
|
||||
- secretKey: mail__transport
|
||||
remoteRef:
|
||||
key: kv/ghost-blog/config
|
||||
property: email_transport
|
||||
- secretKey: mail__from
|
||||
remoteRef:
|
||||
key: kv/ghost-blog/config
|
||||
property: email_from
|
||||
- secretKey: mail__options__service
|
||||
remoteRef:
|
||||
key: kv/ghost-blog/config
|
||||
property: email_service
|
||||
- secretKey: mail__options__host
|
||||
remoteRef:
|
||||
key: kv/ghost-blog/config
|
||||
property: email_host
|
||||
- secretKey: mail__options__port
|
||||
remoteRef:
|
||||
key: kv/ghost-blog/config
|
||||
property: email_port
|
||||
- secretKey: mail__options__auth__user
|
||||
remoteRef:
|
||||
key: kv/ghost-blog/config
|
||||
property: email_user
|
||||
- secretKey: mail__options__auth__pass
|
||||
remoteRef:
|
||||
key: kv/ghost-blog/config
|
||||
property: email_password
|
||||
@@ -1,165 +0,0 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: ghost-blog
|
||||
namespace: ghost-blog
|
||||
labels:
|
||||
app: ghost-blog
|
||||
app.kubernetes.io/name: ghost-blog
|
||||
app.kubernetes.io/instance: ghost-blog
|
||||
app.kubernetes.io/version: '5.92'
|
||||
app.kubernetes.io/component: ghost
|
||||
app.kubernetes.io/part-of: ghost-blog
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: ghost-blog
|
||||
minReadySeconds: 5
|
||||
strategy:
|
||||
type: RollingUpdate
|
||||
rollingUpdate:
|
||||
maxUnavailable: 0
|
||||
maxSurge: 3
|
||||
revisionHistoryLimit: 4
|
||||
progressDeadlineSeconds: 600
|
||||
template:
|
||||
metadata:
|
||||
namespace: ghost-blog
|
||||
labels:
|
||||
app: ghost-blog
|
||||
spec:
|
||||
automountServiceAccountToken: false
|
||||
volumes:
|
||||
- name: ghost-content
|
||||
persistentVolumeClaim:
|
||||
claimName: ghost-content
|
||||
- name: tmp
|
||||
emptyDir:
|
||||
sizeLimit: 64Mi
|
||||
|
||||
initContainers:
|
||||
- name: permissions-fix
|
||||
imagePullPolicy: IfNotPresent
|
||||
image: docker.io/busybox:stable-musl
|
||||
env:
|
||||
- name: GHOST_CONTENT
|
||||
value: /var/lib/ghost/content
|
||||
securityContext:
|
||||
readOnlyRootFilesystem: true
|
||||
allowPrivilegeEscalation: false
|
||||
resources:
|
||||
limits:
|
||||
cpu: 500m
|
||||
memory: 256Mi
|
||||
requests:
|
||||
cpu: 100m
|
||||
memory: 128Mi
|
||||
command:
|
||||
- /bin/sh
|
||||
- '-c'
|
||||
- |
|
||||
set -e
|
||||
export DIRS='files logs apps themes data public settings images media'
|
||||
echo 'Check if base dirs exists, if not, create them'
|
||||
echo "Directories to check: $DIRS"
|
||||
for dir in $DIRS; do
|
||||
if [ ! -d $GHOST_CONTENT/$dir ]; then
|
||||
echo "Creating $GHOST_CONTENT/$dir directory"
|
||||
mkdir -pv $GHOST_CONTENT/$dir || echo "Error creating $GHOST_CONTENT/$dir directory"
|
||||
fi
|
||||
chown -Rfv 1000:1000 $GHOST_CONTENT/$dir && echo "chown ok on $dir" || echo "Error changing ownership of $GHOST_CONTENT/$dir directory"
|
||||
done
|
||||
exit 0
|
||||
volumeMounts:
|
||||
- name: ghost-content
|
||||
mountPath: /var/lib/ghost/content
|
||||
readOnly: false
|
||||
|
||||
containers:
|
||||
- name: ghost-blog
|
||||
image: ghost:5.114.1-alpine
|
||||
imagePullPolicy: Always
|
||||
ports:
|
||||
- name: ghost
|
||||
containerPort: 2368
|
||||
protocol: TCP
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /ghost/api/v4/admin/site/
|
||||
port: ghost
|
||||
httpHeaders:
|
||||
- name: X-Forwarded-Proto
|
||||
value: https
|
||||
- name: Host
|
||||
value: blog.rubenhensen.nl
|
||||
periodSeconds: 10
|
||||
timeoutSeconds: 3
|
||||
successThreshold: 1
|
||||
failureThreshold: 3
|
||||
initialDelaySeconds: 10
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /ghost/api/v4/admin/site/
|
||||
port: ghost
|
||||
httpHeaders:
|
||||
- name: X-Forwarded-Proto
|
||||
value: https
|
||||
- name: Host
|
||||
value: blog.rubenhensen.nl
|
||||
periodSeconds: 300
|
||||
timeoutSeconds: 3
|
||||
successThreshold: 1
|
||||
failureThreshold: 1
|
||||
initialDelaySeconds: 30
|
||||
env:
|
||||
- name: NODE_ENV
|
||||
value: production
|
||||
- name: database__client
|
||||
value: mysql
|
||||
- name: database__connection__host
|
||||
value: ghost-mysql-service
|
||||
- name: database__connection__user
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: ghost-mysql-env
|
||||
key: MYSQL_USER
|
||||
- name: database__connection__password
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: ghost-mysql-env
|
||||
key: MYSQL_PASSWORD
|
||||
- name: database__connection__database
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: ghost-mysql-env
|
||||
key: MYSQL_DATABASE
|
||||
- name: url
|
||||
value: https://blog.rubenhensen.nl
|
||||
envFrom:
|
||||
- secretRef:
|
||||
name: ghost-mail-config
|
||||
resources:
|
||||
limits:
|
||||
cpu: 800m
|
||||
memory: 800Mi
|
||||
requests:
|
||||
cpu: 200m
|
||||
memory: 400Mi
|
||||
volumeMounts:
|
||||
- name: ghost-content
|
||||
mountPath: /var/lib/ghost/content
|
||||
readOnly: false
|
||||
- name: tmp
|
||||
mountPath: /tmp
|
||||
readOnly: false
|
||||
securityContext:
|
||||
allowPrivilegeEscalation: false
|
||||
runAsNonRoot: true
|
||||
runAsUser: 1000
|
||||
restartPolicy: Always
|
||||
terminationGracePeriodSeconds: 15
|
||||
dnsPolicy: ClusterFirst
|
||||
securityContext:
|
||||
seccompProfile:
|
||||
type: RuntimeDefault
|
||||
@@ -1,33 +0,0 @@
|
||||
apiVersion: networking.k8s.io/v1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
name: ghost-blog-ingress
|
||||
namespace: ghost-blog
|
||||
labels:
|
||||
app: ghost-blog
|
||||
app.kubernetes.io/name: ghost-blog-ingress
|
||||
app.kubernetes.io/instance: ghost-blog
|
||||
app.kubernetes.io/version: '5.92'
|
||||
app.kubernetes.io/component: ingress
|
||||
app.kubernetes.io/part-of: ghost-blog
|
||||
annotations:
|
||||
cert-manager.io/cluster-issuer: prod-cluster-issuer
|
||||
nginx.ingress.kubernetes.io/proxy-body-size: 1G
|
||||
argocd.argoproj.io/sync-wave: "7"
|
||||
spec:
|
||||
ingressClassName: nginx
|
||||
tls:
|
||||
- hosts:
|
||||
- blog.rubenhensen.nl
|
||||
secretName: ghost-tls-secret
|
||||
rules:
|
||||
- host: blog.rubenhensen.nl
|
||||
http:
|
||||
paths:
|
||||
- path: /
|
||||
pathType: Prefix
|
||||
backend:
|
||||
service:
|
||||
name: ghost-service
|
||||
port:
|
||||
name: ghost
|
||||
@@ -1,36 +0,0 @@
|
||||
apiVersion: external-secrets.io/v1beta1
|
||||
kind: ExternalSecret
|
||||
metadata:
|
||||
name: ghost-mysql-env
|
||||
namespace: ghost-blog
|
||||
annotations:
|
||||
argocd.argoproj.io/sync-wave: "1"
|
||||
spec:
|
||||
refreshInterval: "15m"
|
||||
secretStoreRef:
|
||||
name: vault-backend
|
||||
kind: ClusterSecretStore
|
||||
target:
|
||||
name: ghost-mysql-env
|
||||
creationPolicy: Owner
|
||||
data:
|
||||
- secretKey: MYSQL_DATABASE
|
||||
remoteRef:
|
||||
key: kv/ghost-blog/mysql
|
||||
property: database
|
||||
- secretKey: MYSQL_USER
|
||||
remoteRef:
|
||||
key: kv/ghost-blog/mysql
|
||||
property: username
|
||||
- secretKey: MYSQL_PASSWORD
|
||||
remoteRef:
|
||||
key: kv/ghost-blog/mysql
|
||||
property: password
|
||||
- secretKey: MYSQL_ROOT_PASSWORD
|
||||
remoteRef:
|
||||
key: kv/ghost-blog/mysql
|
||||
property: root_password
|
||||
# - secretKey: MYSQL_HOST
|
||||
# remoteRef:
|
||||
# key: kv/ghost-blog/mysql
|
||||
# property: host
|
||||
@@ -1,114 +0,0 @@
|
||||
apiVersion: apps/v1
|
||||
kind: StatefulSet
|
||||
metadata:
|
||||
name: ghost-mysql
|
||||
namespace: ghost-blog
|
||||
labels:
|
||||
app: ghost-mysql
|
||||
app.kubernetes.io/name: ghost-mysql
|
||||
app.kubernetes.io/instance: ghost-blog
|
||||
app.kubernetes.io/version: '5.92'
|
||||
app.kubernetes.io/component: database
|
||||
app.kubernetes.io/part-of: ghost-blog
|
||||
annotations:
|
||||
argocd.argoproj.io/sync-wave: "5"
|
||||
spec:
|
||||
serviceName: ghost-mysql-service
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: ghost-mysql
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: ghost-mysql
|
||||
spec:
|
||||
initContainers:
|
||||
- name: ghost-mysql-init
|
||||
securityContext:
|
||||
allowPrivilegeEscalation: false
|
||||
privileged: false
|
||||
readOnlyRootFilesystem: true
|
||||
image: docker.io/busybox:stable-musl
|
||||
imagePullPolicy: IfNotPresent
|
||||
command:
|
||||
- /bin/sh
|
||||
- -c
|
||||
- |
|
||||
set -e
|
||||
echo 'Changing ownership of mysql mount directory to 65534:65534'
|
||||
chown -Rfv 65534:65534 /mnt/mysql || echo 'Error changing ownership of mysql mount directory to 65534:65534'
|
||||
echo 'Changing ownership of tmp mount directory to 65534:65534'
|
||||
chown -Rfv 65534:65534 /mnt/tmp || echo 'Error changing ownership of tmp mount directory to 65534:65534'
|
||||
echo 'Changing ownership of socket mount directory to 65534:65534'
|
||||
chown -Rfv 65534:65534 /mnt/var/run/mysqld || echo 'Error changing ownership of socket mount directory to 65534:65534'
|
||||
volumeMounts:
|
||||
- name: ghost-mysql-volume
|
||||
mountPath: /mnt/mysql
|
||||
subPath: mysql-empty-subdir
|
||||
readOnly: false
|
||||
- name: ghost-mysql-tmp
|
||||
mountPath: /mnt/tmp
|
||||
readOnly: false
|
||||
- name: ghost-mysql-socket
|
||||
mountPath: /mnt/var/run/mysqld
|
||||
readOnly: false
|
||||
resources:
|
||||
requests:
|
||||
memory: 50Mi
|
||||
cpu: 50m
|
||||
limits:
|
||||
memory: 100Mi
|
||||
cpu: 100m
|
||||
|
||||
containers:
|
||||
- name: ghost-mysql
|
||||
securityContext:
|
||||
allowPrivilegeEscalation: false
|
||||
privileged: false
|
||||
readOnlyRootFilesystem: true
|
||||
runAsNonRoot: true
|
||||
runAsUser: 65534
|
||||
image: docker.io/mysql:8.4
|
||||
imagePullPolicy: IfNotPresent
|
||||
envFrom:
|
||||
- secretRef:
|
||||
name: ghost-mysql-env
|
||||
resources:
|
||||
requests:
|
||||
memory: 256Mi
|
||||
cpu: 100m
|
||||
limits:
|
||||
memory: 512Mi
|
||||
cpu: 500m
|
||||
ports:
|
||||
- containerPort: 3306
|
||||
protocol: TCP
|
||||
name: mysql
|
||||
volumeMounts:
|
||||
- name: ghost-mysql-volume
|
||||
mountPath: /var/lib/mysql
|
||||
subPath: mysql-empty-subdir
|
||||
readOnly: false
|
||||
- name: ghost-mysql-tmp
|
||||
mountPath: /tmp
|
||||
readOnly: false
|
||||
- name: ghost-mysql-socket
|
||||
mountPath: /var/run/mysqld
|
||||
readOnly: false
|
||||
|
||||
automountServiceAccountToken: false
|
||||
securityContext:
|
||||
seccompProfile:
|
||||
type: RuntimeDefault
|
||||
|
||||
volumes:
|
||||
- name: ghost-mysql-volume
|
||||
persistentVolumeClaim:
|
||||
claimName: ghost-mysql-pvc
|
||||
- name: ghost-mysql-tmp
|
||||
emptyDir:
|
||||
sizeLimit: 128Mi
|
||||
- name: ghost-mysql-socket
|
||||
emptyDir:
|
||||
sizeLimit: 128Mi
|
||||
@@ -1,41 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
name: ghost-content
|
||||
namespace: ghost-blog
|
||||
labels:
|
||||
app: ghost-blog
|
||||
app.kubernetes.io/name: ghost-content
|
||||
app.kubernetes.io/instance: ghost-blog
|
||||
app.kubernetes.io/version: '5.92'
|
||||
app.kubernetes.io/component: storage
|
||||
app.kubernetes.io/part-of: ghost-blog
|
||||
spec:
|
||||
storageClassName: "longhorn"
|
||||
volumeMode: Filesystem
|
||||
accessModes:
|
||||
- ReadWriteOnce
|
||||
resources:
|
||||
requests:
|
||||
storage: 10Gi
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
name: ghost-mysql-pvc
|
||||
namespace: ghost-blog
|
||||
labels:
|
||||
app: ghost-mysql
|
||||
app.kubernetes.io/name: ghost-mysql-pvc
|
||||
app.kubernetes.io/instance: ghost-blog
|
||||
app.kubernetes.io/version: '5.92'
|
||||
app.kubernetes.io/component: database-storage
|
||||
app.kubernetes.io/part-of: ghost-blog
|
||||
spec:
|
||||
storageClassName: "longhorn"
|
||||
volumeMode: Filesystem
|
||||
accessModes:
|
||||
- ReadWriteOnce
|
||||
resources:
|
||||
requests:
|
||||
storage: 10Gi
|
||||
@@ -1,44 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: ghost-service
|
||||
namespace: ghost-blog
|
||||
labels:
|
||||
app: ghost-blog
|
||||
app.kubernetes.io/name: ghost-service
|
||||
app.kubernetes.io/instance: ghost-blog
|
||||
app.kubernetes.io/version: '5.92'
|
||||
app.kubernetes.io/component: service-frontend
|
||||
app.kubernetes.io/part-of: ghost-blog
|
||||
spec:
|
||||
ports:
|
||||
- port: 2368
|
||||
protocol: TCP
|
||||
targetPort: ghost
|
||||
name: ghost
|
||||
type: ClusterIP
|
||||
selector:
|
||||
app: ghost-blog
|
||||
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: ghost-mysql-service
|
||||
namespace: ghost-blog
|
||||
labels:
|
||||
app: ghost-mysql
|
||||
app.kubernetes.io/name: ghost-mysql-service
|
||||
app.kubernetes.io/instance: ghost-blog
|
||||
app.kubernetes.io/version: '5.92'
|
||||
app.kubernetes.io/component: service-database
|
||||
app.kubernetes.io/part-of: ghost-blog
|
||||
spec:
|
||||
ports:
|
||||
- port: 3306
|
||||
protocol: TCP
|
||||
targetPort: mysql
|
||||
name: mysql
|
||||
type: ClusterIP
|
||||
selector:
|
||||
app: ghost-mysql
|
||||
@@ -53,8 +53,16 @@ spec:
|
||||
volumeMounts:
|
||||
- mountPath: /data
|
||||
name: data
|
||||
# Trust store without the compromised eMudhra intermediates,
|
||||
# see ca-bundle/. Drop once the image ships a fixed bundle.
|
||||
- mountPath: /etc/ssl/certs
|
||||
name: patched-ca-bundle
|
||||
readOnly: true
|
||||
restartPolicy: Always
|
||||
volumes:
|
||||
- name: data
|
||||
persistentVolumeClaim:
|
||||
claimName: gitea-data
|
||||
- name: patched-ca-bundle
|
||||
configMap:
|
||||
name: patched-ca-bundle
|
||||
@@ -1,10 +1,30 @@
|
||||
# Home Assistant runs outside the cluster on 192.168.1.202. ingress-nginx
|
||||
# 1.13 resolves an ExternalName as a DNS name and fails on a bare IP, so
|
||||
# point a selector-less Service at it with a hand-written EndpointSlice.
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: home-assistant-external
|
||||
spec:
|
||||
type: ExternalName
|
||||
externalName: 192.168.1.202
|
||||
ports:
|
||||
- port: 8123
|
||||
protocol: TCP
|
||||
- name: http
|
||||
port: 8123
|
||||
protocol: TCP
|
||||
targetPort: 8123
|
||||
---
|
||||
apiVersion: discovery.k8s.io/v1
|
||||
kind: EndpointSlice
|
||||
metadata:
|
||||
name: home-assistant-external-1
|
||||
labels:
|
||||
kubernetes.io/service-name: home-assistant-external
|
||||
addressType: IPv4
|
||||
ports:
|
||||
- name: http
|
||||
port: 8123
|
||||
protocol: TCP
|
||||
endpoints:
|
||||
- addresses:
|
||||
- 192.168.1.202
|
||||
conditions:
|
||||
ready: true
|
||||
@@ -91,6 +91,20 @@ spec:
|
||||
image:
|
||||
repository: ghcr.io/immich-app/immich-server
|
||||
pullPolicy: IfNotPresent
|
||||
# Node trusts its built-in roots, which still include the
|
||||
# ones above the compromised eMudhra intermediates. Use
|
||||
# patched-ca-bundle through OpenSSL until Node ships a fix.
|
||||
env:
|
||||
NODE_OPTIONS: --use-openssl-ca
|
||||
SSL_CERT_FILE: /etc/ssl/certs/ca-certificates.crt
|
||||
persistence:
|
||||
patched-ca-bundle:
|
||||
enabled: true
|
||||
type: configMap
|
||||
name: patched-ca-bundle
|
||||
globalMounts:
|
||||
- path: /etc/ssl/certs
|
||||
readOnly: true
|
||||
ingress:
|
||||
main:
|
||||
enabled: true
|
||||
@@ -135,7 +149,18 @@ spec:
|
||||
TRANSFORMERS_CACHE: /cache
|
||||
HF_XET_CACHE: /cache/huggingface-xet
|
||||
MPLCONFIGDIR: /cache/matplotlib-config
|
||||
# Trust store without the compromised eMudhra
|
||||
# intermediates; requests would otherwise use certifi.
|
||||
SSL_CERT_FILE: /etc/ssl/certs/ca-certificates.crt
|
||||
REQUESTS_CA_BUNDLE: /etc/ssl/certs/ca-certificates.crt
|
||||
persistence:
|
||||
patched-ca-bundle:
|
||||
enabled: true
|
||||
type: configMap
|
||||
name: patched-ca-bundle
|
||||
globalMounts:
|
||||
- path: /etc/ssl/certs
|
||||
readOnly: true
|
||||
cache:
|
||||
enabled: true
|
||||
size: 10Gi
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
labels:
|
||||
app: lingo-api
|
||||
name: lingo-api
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: lingo-api
|
||||
strategy:
|
||||
type: Recreate
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: lingo-api
|
||||
spec:
|
||||
containers:
|
||||
- image: ghcr.io/rubenhensen/lingo-api:master-4404fe5
|
||||
name: lingo-api
|
||||
ports:
|
||||
- containerPort: 80
|
||||
protocol: TCP
|
||||
resources:
|
||||
requests:
|
||||
memory: "128Mi"
|
||||
cpu: "100m"
|
||||
limits:
|
||||
memory: "512Mi"
|
||||
cpu: "500m"
|
||||
restartPolicy: Always
|
||||
@@ -1,13 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
labels:
|
||||
app: lingo-api
|
||||
name: lingo-api
|
||||
spec:
|
||||
ports:
|
||||
- name: "api"
|
||||
port: 8000
|
||||
targetPort: 80
|
||||
selector:
|
||||
app: lingo-api
|
||||
@@ -1,32 +0,0 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
labels:
|
||||
app: lingo-frontend
|
||||
name: lingo-frontend
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: lingo-frontend
|
||||
strategy:
|
||||
type: Recreate
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: lingo-frontend
|
||||
spec:
|
||||
containers:
|
||||
- image: ghcr.io/rubenhensen/lingo-frontend:master-46bddb5
|
||||
name: lingo-frontend
|
||||
ports:
|
||||
- containerPort: 80
|
||||
protocol: TCP
|
||||
resources:
|
||||
requests:
|
||||
memory: "128Mi"
|
||||
cpu: "100m"
|
||||
limits:
|
||||
memory: "512Mi"
|
||||
cpu: "500m"
|
||||
restartPolicy: Always
|
||||
@@ -1,13 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
labels:
|
||||
app: lingo-frontend
|
||||
name: lingo-frontend
|
||||
spec:
|
||||
ports:
|
||||
- name: "frontend"
|
||||
port: 8001
|
||||
targetPort: 80
|
||||
selector:
|
||||
app: lingo-frontend
|
||||
@@ -1,50 +0,0 @@
|
||||
apiVersion: networking.k8s.io/v1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
name: lingo-api-ingress
|
||||
annotations:
|
||||
cert-manager.io/cluster-issuer: prod-cluster-issuer
|
||||
nginx.ingress.kubernetes.io/ssl-passthrough: "false"
|
||||
nginx.ingress.kubernetes.io/rewrite-target: /$2
|
||||
spec:
|
||||
ingressClassName: nginx
|
||||
rules:
|
||||
- host: lingo.rubenhensen.nl
|
||||
http:
|
||||
paths:
|
||||
- path: /api(/|$)(.*)
|
||||
pathType: ImplementationSpecific
|
||||
backend:
|
||||
service:
|
||||
name: lingo-api
|
||||
port:
|
||||
number: 8000
|
||||
tls:
|
||||
- secretName: letsencrypt-prod
|
||||
hosts:
|
||||
- lingo.rubenhensen.nl
|
||||
---
|
||||
apiVersion: networking.k8s.io/v1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
name: lingo-frontend-ingress
|
||||
annotations:
|
||||
cert-manager.io/cluster-issuer: prod-cluster-issuer
|
||||
nginx.ingress.kubernetes.io/ssl-passthrough: "false"
|
||||
spec:
|
||||
ingressClassName: nginx
|
||||
rules:
|
||||
- host: lingo.rubenhensen.nl
|
||||
http:
|
||||
paths:
|
||||
- path: /
|
||||
pathType: Prefix
|
||||
backend:
|
||||
service:
|
||||
name: lingo-frontend
|
||||
port:
|
||||
number: 8001
|
||||
tls:
|
||||
- secretName: letsencrypt-prod
|
||||
hosts:
|
||||
- lingo.rubenhensen.nl
|
||||
@@ -1,29 +0,0 @@
|
||||
apiVersion: networking.k8s.io/v1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
name: nas-ingress
|
||||
annotations:
|
||||
cert-manager.io/cluster-issuer: prod-cluster-issuer
|
||||
nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
|
||||
nginx.ingress.kubernetes.io/ssl-passthrough: "false"
|
||||
spec:
|
||||
ingressClassName: nginx
|
||||
rules:
|
||||
- host: nas.rubenhensen.nl
|
||||
http:
|
||||
paths:
|
||||
- path: /
|
||||
pathType: Prefix
|
||||
backend:
|
||||
service:
|
||||
name: nas-external
|
||||
port:
|
||||
number: 5000
|
||||
|
||||
# TLS configuration for HTTPS
|
||||
tls:
|
||||
# TLS secretName used on ClusterIssuer
|
||||
- secretName: letsencrypt-prod
|
||||
hosts:
|
||||
- nas.rubenhensen.nl
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: nas-external
|
||||
spec:
|
||||
type: ExternalName
|
||||
externalName: 192.168.1.99
|
||||
ports:
|
||||
- name: nas-5000
|
||||
protocol: TCP
|
||||
port: 5000
|
||||
- name: nas-5001
|
||||
protocol: TCP
|
||||
port: 5001
|
||||
@@ -16,8 +16,6 @@ let
|
||||
"argocd.rubenhensen.nl"
|
||||
"ha.rubenhensen.nl"
|
||||
"longhorn.rubenhensen.nl"
|
||||
"lingo.rubenhensen.nl"
|
||||
"blog.rubenhensen.nl"
|
||||
"serpbear.rubenhensen.nl"
|
||||
"git.rubenhensen.nl"
|
||||
"vic.rubenhensen.nl"
|
||||
|
||||
@@ -60,7 +60,15 @@ spec:
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /var/lib/ntfy
|
||||
# Trust store without the compromised eMudhra intermediates,
|
||||
# see ca-bundle/. Drop once the image ships a fixed bundle.
|
||||
- name: patched-ca-bundle
|
||||
mountPath: /etc/ssl/certs
|
||||
readOnly: true
|
||||
volumes:
|
||||
- name: data
|
||||
persistentVolumeClaim:
|
||||
claimName: ntfy-data
|
||||
- name: patched-ca-bundle
|
||||
configMap:
|
||||
name: patched-ca-bundle
|
||||
@@ -46,6 +46,13 @@
|
||||
}
|
||||
],
|
||||
"packageRules": [
|
||||
{
|
||||
"description": "Longhorn 1.11.3 and newer need Kubernetes 1.34, see docs/upgrade-k8s-1.33.md",
|
||||
"matchPackageNames": [
|
||||
"longhorn"
|
||||
],
|
||||
"allowedVersions": "<1.11.3"
|
||||
},
|
||||
{
|
||||
"matchDatasources": [
|
||||
"helm"
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
apiVersion: external-secrets.io/v1beta1
|
||||
kind: ExternalSecret
|
||||
metadata:
|
||||
name: hensenio-ghost-secrets
|
||||
namespace: blog
|
||||
spec:
|
||||
refreshInterval: "15m"
|
||||
secretStoreRef:
|
||||
name: vault-backend
|
||||
kind: ClusterSecretStore
|
||||
target:
|
||||
name: ghost-es
|
||||
creationPolicy: Owner
|
||||
data:
|
||||
- secretKey: mysql-root-password
|
||||
remoteRef:
|
||||
key: kv/ghost
|
||||
property: ghostmsqlrootpw
|
||||
|
||||
- secretKey: mysql-password
|
||||
remoteRef:
|
||||
key: kv/ghost
|
||||
property: ghostmsqlpw
|
||||
|
||||
- secretKey: ghost-password
|
||||
remoteRef:
|
||||
key: kv/ghost
|
||||
property: ghostpw
|
||||
|
||||
- secretKey: smtp-password
|
||||
remoteRef:
|
||||
key: kv/hensenio/smtp
|
||||
property: password
|
||||
@@ -44,6 +44,13 @@ spec:
|
||||
value: https://serpbear.rubenhensen.nl
|
||||
- name: TZ
|
||||
value: Europe/Amsterdam
|
||||
# Node trusts its built-in roots, which still include the ones
|
||||
# above the compromised eMudhra intermediates. Use
|
||||
# patched-ca-bundle through OpenSSL instead until Node ships a fix.
|
||||
- name: NODE_OPTIONS
|
||||
value: --use-openssl-ca
|
||||
- name: SSL_CERT_FILE
|
||||
value: /etc/ssl/certs/ca-certificates.crt
|
||||
image: towfiqi/serpbear:3.1.0
|
||||
name: serpbear
|
||||
ports:
|
||||
@@ -52,8 +59,14 @@ spec:
|
||||
volumeMounts:
|
||||
- mountPath: /app/data
|
||||
name: data
|
||||
- mountPath: /etc/ssl/certs
|
||||
name: patched-ca-bundle
|
||||
readOnly: true
|
||||
restartPolicy: Always
|
||||
volumes:
|
||||
- name: data
|
||||
persistentVolumeClaim:
|
||||
claimName: data
|
||||
- name: patched-ca-bundle
|
||||
configMap:
|
||||
name: patched-ca-bundle
|
||||
@@ -16,7 +16,7 @@ spec:
|
||||
sources:
|
||||
- chart: vault
|
||||
repoURL: https://helm.releases.hashicorp.com
|
||||
targetRevision: 0.28.1
|
||||
targetRevision: 0.34.1
|
||||
helm:
|
||||
valueFiles:
|
||||
- $values/vault/overrides.yaml
|
||||
|
||||
@@ -3,7 +3,16 @@ global:
|
||||
tlsDisable: true
|
||||
injector:
|
||||
enabled: true
|
||||
# The chart's default anti-affinity forbids two injector pods on one
|
||||
# node, so on this single node a rolling update can never start the new
|
||||
# pod while the old one runs.
|
||||
affinity: ""
|
||||
server:
|
||||
# Pinned to the running version: the chart would otherwise pull its own
|
||||
# default on the next pod restart, and with Shamir unsealing a Vault
|
||||
# upgrade needs someone with the unseal keys at hand.
|
||||
image:
|
||||
tag: "1.17.2"
|
||||
dataStorage:
|
||||
storageClass: longhorn
|
||||
standalone:
|
||||
|
||||
+10
-5
@@ -8,17 +8,22 @@ spec:
|
||||
source:
|
||||
chart: velero
|
||||
repoURL: https://vmware-tanzu.github.io/helm-charts
|
||||
targetRevision: 8.4.0
|
||||
targetRevision: 10.1.3
|
||||
helm:
|
||||
values: |
|
||||
# Velero builds its repository maintenance jobs from a Deployment
|
||||
# named "velero". Under the default name (velero-helm) every
|
||||
# maintenance run failed and the kopia repos on the NAS were never
|
||||
# cleaned up.
|
||||
fullnameOverride: velero
|
||||
# The CRD upgrade hook pulls docker.io/bitnami/kubectl, which Bitnami
|
||||
# has removed, so every sync hangs on it. The CRDs only change with
|
||||
# the chart version; turn this back on (with another kubectl image)
|
||||
# when bumping targetRevision.
|
||||
# has removed, so every sync hangs on it. Not needed anyway: Argo CD
|
||||
# applies the chart's crds/ directory on every sync, which is how the
|
||||
# 1.16 CRDs got in.
|
||||
upgradeCRDs: false
|
||||
initContainers:
|
||||
- name: velero-plugin-for-aws
|
||||
image: velero/velero-plugin-for-aws:v1.11.1
|
||||
image: velero/velero-plugin-for-aws:v1.12.2
|
||||
volumeMounts:
|
||||
- mountPath: /target
|
||||
name: plugins
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
apiVersion: v1
|
||||
data:
|
||||
DB_PASS: whishper
|
||||
DB_USER: whishper
|
||||
LT_LOAD_ONLY: es,en,fr,nl
|
||||
WHISHPER_HOST: http://127.0.0.1:8082
|
||||
WHISPER_MODELS: tiny,small,large-v3
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
labels:
|
||||
io.kompose.service: mongo-env
|
||||
name: env
|
||||
@@ -1,12 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
labels:
|
||||
io.kompose.service: mongo-claim10
|
||||
name: mongo-claim10
|
||||
spec:
|
||||
accessModes:
|
||||
- ReadWriteOnce
|
||||
resources:
|
||||
requests:
|
||||
storage: 10Gi
|
||||
@@ -1,12 +0,0 @@
|
||||
# apiVersion: v1
|
||||
# kind: PersistentVolumeClaim
|
||||
# metadata:
|
||||
# labels:
|
||||
# io.kompose.service: mongo-claim1
|
||||
# name: mongo-claim1
|
||||
# spec:
|
||||
# accessModes:
|
||||
# - ReadWriteOnce
|
||||
# resources:
|
||||
# requests:
|
||||
# storage: 10Gi
|
||||
@@ -1,76 +0,0 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
annotations:
|
||||
kompose.cmd: kompose convert
|
||||
kompose.version: 1.34.0 (cbf2835db)
|
||||
labels:
|
||||
io.kompose.service: mongo
|
||||
name: mongo
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
io.kompose.service: mongo
|
||||
strategy:
|
||||
type: Recreate
|
||||
template:
|
||||
metadata:
|
||||
annotations:
|
||||
kompose.cmd: kompose convert
|
||||
kompose.version: 1.34.0 (cbf2835db)
|
||||
labels:
|
||||
io.kompose.service: mongo
|
||||
spec:
|
||||
containers:
|
||||
# - args:
|
||||
# - --logpath
|
||||
# - /var/log/mongodb/mongod.log
|
||||
- env:
|
||||
- name: DB_PASS
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
key: DB_PASS
|
||||
name: env
|
||||
- name: DB_USER
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
key: DB_USER
|
||||
name: env
|
||||
- name: LT_LOAD_ONLY
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
key: LT_LOAD_ONLY
|
||||
name: env
|
||||
- name: MONGO_INITDB_ROOT_PASSWORD
|
||||
value: whishper
|
||||
- name: MONGO_INITDB_ROOT_USERNAME
|
||||
value: whishper
|
||||
- name: WHISHPER_HOST
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
key: WHISHPER_HOST
|
||||
name: env
|
||||
- name: WHISPER_MODELS
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
key: WHISPER_MODELS
|
||||
name: env
|
||||
image: mongo
|
||||
name: mongo
|
||||
ports:
|
||||
- containerPort: 27017
|
||||
protocol: TCP
|
||||
volumeMounts:
|
||||
- mountPath: /data/db
|
||||
name: mongo-claim0
|
||||
# - mountPath: /var/log/mongodb
|
||||
# name: mongo-claim1
|
||||
restartPolicy: Always
|
||||
volumes:
|
||||
- name: mongo-claim0
|
||||
persistentVolumeClaim:
|
||||
claimName: mongo-claim10
|
||||
# - name: mongo-claim1
|
||||
# persistentVolumeClaim:
|
||||
# claimName: mongo-claim1
|
||||
@@ -1,16 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
annotations:
|
||||
kompose.cmd: kompose convert
|
||||
kompose.version: 1.34.0 (cbf2835db)
|
||||
labels:
|
||||
io.kompose.service: mongo
|
||||
name: mongo
|
||||
spec:
|
||||
ports:
|
||||
- name: "27017"
|
||||
port: 27017
|
||||
targetPort: 27017
|
||||
selector:
|
||||
io.kompose.service: mongo
|
||||
@@ -1,12 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
labels:
|
||||
io.kompose.service: translate-claim0
|
||||
name: translate-claim0
|
||||
spec:
|
||||
accessModes:
|
||||
- ReadWriteOnce
|
||||
resources:
|
||||
requests:
|
||||
storage: 10Gi
|
||||
@@ -1,12 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
labels:
|
||||
io.kompose.service: translate-claim1
|
||||
name: translate-claim1
|
||||
spec:
|
||||
accessModes:
|
||||
- ReadWriteOnce
|
||||
resources:
|
||||
requests:
|
||||
storage: 10Gi
|
||||
@@ -1,85 +0,0 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
annotations:
|
||||
kompose.cmd: kompose convert
|
||||
kompose.version: 1.34.0 (cbf2835db)
|
||||
labels:
|
||||
io.kompose.service: translate
|
||||
name: translate
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
io.kompose.service: translate
|
||||
strategy:
|
||||
type: Recreate
|
||||
template:
|
||||
metadata:
|
||||
annotations:
|
||||
kompose.cmd: kompose convert
|
||||
kompose.version: 1.34.0 (cbf2835db)
|
||||
labels:
|
||||
io.kompose.service: translate
|
||||
spec:
|
||||
containers:
|
||||
- image: libretranslate/libretranslate:latest
|
||||
securityContext:
|
||||
runAsUser: 0
|
||||
runAsGroup: 0
|
||||
runAsNonRoot: false
|
||||
livenessProbe:
|
||||
exec:
|
||||
command:
|
||||
- ./venv/bin/python scripts/healthcheck.py
|
||||
failureThreshold: 5
|
||||
periodSeconds: 2
|
||||
timeoutSeconds: 3
|
||||
name: whisper-libretranslate
|
||||
ports:
|
||||
- containerPort: 5000
|
||||
protocol: TCP
|
||||
tty: true
|
||||
volumeMounts:
|
||||
- mountPath: /home/libretranslate/.local/share
|
||||
name: translate-claim0
|
||||
- mountPath: /home/libretranslate/.local/cache
|
||||
name: translate-claim1
|
||||
env:
|
||||
- name: DB_PASS
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
key: DB_PASS
|
||||
name: env
|
||||
- name: DB_USER
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
key: DB_USER
|
||||
name: env
|
||||
- name: LT_DISABLE_WEB_UI
|
||||
value: "true"
|
||||
- name: LT_LOAD_ONLY
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
key: LT_LOAD_ONLY
|
||||
name: env
|
||||
- name: LT_UPDATE_MODELS
|
||||
value: "true"
|
||||
- name: WHISHPER_HOST
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
key: WHISHPER_HOST
|
||||
name: env
|
||||
- name: WHISPER_MODELS
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
key: WHISPER_MODELS
|
||||
name: env
|
||||
restartPolicy: Always
|
||||
volumes:
|
||||
- name: translate-claim0
|
||||
persistentVolumeClaim:
|
||||
claimName: translate-claim0
|
||||
- name: translate-claim1
|
||||
persistentVolumeClaim:
|
||||
claimName: translate-claim1
|
||||
@@ -1,16 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
annotations:
|
||||
kompose.cmd: kompose convert
|
||||
kompose.version: 1.34.0 (cbf2835db)
|
||||
labels:
|
||||
io.kompose.service: translate
|
||||
name: translate
|
||||
spec:
|
||||
ports:
|
||||
- name: "5000"
|
||||
port: 5000
|
||||
targetPort: 5000
|
||||
selector:
|
||||
io.kompose.service: translate
|
||||
@@ -1,12 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
labels:
|
||||
io.kompose.service: whishper-claim0
|
||||
name: whishper-claim0
|
||||
spec:
|
||||
accessModes:
|
||||
- ReadWriteOnce
|
||||
resources:
|
||||
requests:
|
||||
storage: 10Gi
|
||||
@@ -1,12 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
labels:
|
||||
io.kompose.service: whishper-claim1
|
||||
name: whishper-claim1
|
||||
spec:
|
||||
accessModes:
|
||||
- ReadWriteOnce
|
||||
resources:
|
||||
requests:
|
||||
storage: 10Gi
|
||||
@@ -1,81 +0,0 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
annotations:
|
||||
kompose.cmd: kompose convert
|
||||
kompose.version: 1.34.0 (cbf2835db)
|
||||
labels:
|
||||
io.kompose.service: whishper
|
||||
name: whishper
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
io.kompose.service: whishper
|
||||
strategy:
|
||||
type: Recreate
|
||||
template:
|
||||
metadata:
|
||||
annotations:
|
||||
kompose.cmd: kompose convert
|
||||
kompose.version: 1.34.0 (cbf2835db)
|
||||
labels:
|
||||
io.kompose.service: whishper
|
||||
spec:
|
||||
containers:
|
||||
- env:
|
||||
- name: CPU_THREADS
|
||||
value: "4"
|
||||
- name: DB_PASS
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
key: DB_PASS
|
||||
name: env
|
||||
- name: DB_USER
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
key: DB_USER
|
||||
name: env
|
||||
- name: LT_LOAD_ONLY
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
key: LT_LOAD_ONLY
|
||||
name: env
|
||||
- name: PUBLIC_API_HOST
|
||||
- name: PUBLIC_INTERNAL_API_HOST
|
||||
value: http://127.0.0.1:80
|
||||
- name: PUBLIC_TRANSLATION_API_HOST
|
||||
- name: PUBLIC_WHISHPER_PROFILE
|
||||
value: cpu
|
||||
- name: UPLOAD_DIR
|
||||
value: /app/uploads
|
||||
- name: WHISHPER_HOST
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
key: WHISHPER_HOST
|
||||
name: env
|
||||
- name: WHISPER_MODELS
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
key: WHISPER_MODELS
|
||||
name: env
|
||||
- name: WHISPER_MODELS_DIR
|
||||
value: /app/models
|
||||
image: pluja/whishper:latest
|
||||
name: whishper
|
||||
ports:
|
||||
- containerPort: 80
|
||||
protocol: TCP
|
||||
volumeMounts:
|
||||
- mountPath: /app/uploads
|
||||
name: whishper-claim0
|
||||
- mountPath: /var/log/whishper
|
||||
name: whishper-claim1
|
||||
restartPolicy: Always
|
||||
volumes:
|
||||
- name: whishper-claim0
|
||||
persistentVolumeClaim:
|
||||
claimName: whishper-claim0
|
||||
- name: whishper-claim1
|
||||
persistentVolumeClaim:
|
||||
claimName: whishper-claim1
|
||||
@@ -1,43 +0,0 @@
|
||||
apiVersion: networking.k8s.io/v1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
name: whisper-ingress
|
||||
annotations:
|
||||
# nginx.ingress.kubernetes.io/rewrite-target: /
|
||||
cert-manager.io/cluster-issuer: prod-cluster-issuer
|
||||
nginx.ingress.kubernetes.io/ssl-passthrough: "false"
|
||||
nginx.ingress.kubernetes.io/enable-cors: "true"
|
||||
# type of authentication
|
||||
nginx.ingress.kubernetes.io/auth-type: basic
|
||||
# name of the secret that contains the user/password definitions
|
||||
nginx.ingress.kubernetes.io/auth-secret: whisper-basic-auth
|
||||
# message to display with an appropriate context why the authentication is required
|
||||
nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required '
|
||||
nginx.ingress.kubernetes.io/proxy-body-size: "0"
|
||||
# nginx.ingress.kubernetes.io/cors-allow-origin: "http://localhost:3000/"
|
||||
# nginx.ingress.kubernetes.io/cors-allow-methods: "PUT, GET, POST, OPTIONS, DELETE"
|
||||
# If you encounter a redirect loop or are getting a 307 response code
|
||||
# then you need to force the nginx ingress to connect to the backend using HTTPS.
|
||||
#
|
||||
# nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
|
||||
# namespace: ente-photos
|
||||
spec:
|
||||
ingressClassName: nginx
|
||||
rules:
|
||||
- host: alv.rubenhensen.nl
|
||||
http:
|
||||
paths:
|
||||
- path: /
|
||||
pathType: Prefix
|
||||
backend:
|
||||
service:
|
||||
name: whishper
|
||||
port:
|
||||
number: 8082
|
||||
|
||||
# TLS configuration for HTTPS
|
||||
tls:
|
||||
# TLS secretName used on ClusterIssuer
|
||||
- secretName: letsencrypt-prod
|
||||
hosts:
|
||||
- alv.rubenhensen.nl
|
||||
@@ -1,16 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
annotations:
|
||||
kompose.cmd: kompose convert
|
||||
kompose.version: 1.34.0 (cbf2835db)
|
||||
labels:
|
||||
io.kompose.service: whishper
|
||||
name: whishper
|
||||
spec:
|
||||
ports:
|
||||
- name: "8082"
|
||||
port: 8082
|
||||
targetPort: 80
|
||||
selector:
|
||||
io.kompose.service: whishper
|
||||
Reference in new issue
Block a user