mirror of
https://github.com/rubenhensen/k8scd.git
synced 2026-11-17 06:29:09 +01:00
Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6d9e405126 | ||
|
|
dfdc4451fb | ||
|
|
e19f4b8db5 | ||
|
|
8c2bd89444 | ||
|
|
400d46c462 | ||
|
|
25a6bf3a05 | ||
|
|
a507282103 | ||
|
|
19eacd35f7 | ||
|
|
bb7e2f2bac | ||
|
|
1efa132f9d |
No files matched your search
@@ -36,6 +36,20 @@ spec:
|
|||||||
|
|
||||||
extraEnvVars:
|
extraEnvVars:
|
||||||
ACTUAL_OPENID_SERVER_HOSTNAME: https://ynab.rubenhensen.nl
|
ACTUAL_OPENID_SERVER_HOSTNAME: https://ynab.rubenhensen.nl
|
||||||
|
# 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.
|
||||||
|
NODE_OPTIONS: --use-openssl-ca
|
||||||
|
SSL_CERT_FILE: /etc/ssl/certs/ca-certificates.crt
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
- name: patched-ca-bundle
|
||||||
|
configMap:
|
||||||
|
name: patched-ca-bundle
|
||||||
|
volumeMounts:
|
||||||
|
- name: patched-ca-bundle
|
||||||
|
mountPath: /etc/ssl/certs
|
||||||
|
readOnly: true
|
||||||
|
|
||||||
# Service configuration
|
# Service configuration
|
||||||
service:
|
service:
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -86,8 +86,18 @@ spec:
|
|||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: actualbudget-oidc-client-secret
|
name: actualbudget-oidc-client-secret
|
||||||
key: client_secret
|
key: client_secret
|
||||||
|
# Point OpenSSL and requests (which uses certifi otherwise) at
|
||||||
|
# patched-ca-bundle, mounted below until the image drops the
|
||||||
|
# compromised eMudhra intermediates.
|
||||||
|
- name: SSL_CERT_FILE
|
||||||
|
value: /etc/ssl/certs/ca-certificates.crt
|
||||||
|
- name: REQUESTS_CA_BUNDLE
|
||||||
|
value: /etc/ssl/certs/ca-certificates.crt
|
||||||
server:
|
server:
|
||||||
volumes:
|
volumes:
|
||||||
|
- name: patched-ca-bundle
|
||||||
|
configMap:
|
||||||
|
name: patched-ca-bundle
|
||||||
- name: blueprint-vault
|
- name: blueprint-vault
|
||||||
configMap:
|
configMap:
|
||||||
name: authentik-blueprint-vault
|
name: authentik-blueprint-vault
|
||||||
@@ -131,6 +141,9 @@ spec:
|
|||||||
- name: blueprint-session
|
- name: blueprint-session
|
||||||
mountPath: /blueprints/custom/session-duration.yaml
|
mountPath: /blueprints/custom/session-duration.yaml
|
||||||
subPath: session-duration.yaml
|
subPath: session-duration.yaml
|
||||||
|
- name: patched-ca-bundle
|
||||||
|
mountPath: /etc/ssl/certs
|
||||||
|
readOnly: true
|
||||||
ingress:
|
ingress:
|
||||||
enabled: true
|
enabled: true
|
||||||
ingressClassName: nginx
|
ingressClassName: nginx
|
||||||
@@ -144,6 +157,9 @@ spec:
|
|||||||
- authentik.rubenhensen.nl
|
- authentik.rubenhensen.nl
|
||||||
worker:
|
worker:
|
||||||
volumes:
|
volumes:
|
||||||
|
- name: patched-ca-bundle
|
||||||
|
configMap:
|
||||||
|
name: patched-ca-bundle
|
||||||
- name: blueprint-vault
|
- name: blueprint-vault
|
||||||
configMap:
|
configMap:
|
||||||
name: authentik-blueprint-vault
|
name: authentik-blueprint-vault
|
||||||
@@ -187,6 +203,9 @@ spec:
|
|||||||
- name: blueprint-session
|
- name: blueprint-session
|
||||||
mountPath: /blueprints/custom/session-duration.yaml
|
mountPath: /blueprints/custom/session-duration.yaml
|
||||||
subPath: session-duration.yaml
|
subPath: session-duration.yaml
|
||||||
|
- name: patched-ca-bundle
|
||||||
|
mountPath: /etc/ssl/certs
|
||||||
|
readOnly: true
|
||||||
postgresql:
|
postgresql:
|
||||||
enabled: false
|
enabled: false
|
||||||
redis:
|
redis:
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
apiVersion: argoproj.io/v1alpha1
|
|
||||||
kind: Application
|
|
||||||
metadata:
|
|
||||||
name: ip-updater
|
|
||||||
namespace: argocd
|
|
||||||
finalizers:
|
|
||||||
- resources-finalizer.argocd.argoproj.io
|
|
||||||
spec:
|
|
||||||
project: default
|
|
||||||
source:
|
|
||||||
repoURL: https://github.com/rubenhensen/k8scd.git
|
|
||||||
targetRevision: HEAD
|
|
||||||
path: ip-updater
|
|
||||||
destination:
|
|
||||||
server: https://kubernetes.default.svc
|
|
||||||
namespace: ip-updater
|
|
||||||
syncPolicy:
|
|
||||||
syncOptions:
|
|
||||||
- CreateNamespace=true
|
|
||||||
automated:
|
|
||||||
selfHeal: true
|
|
||||||
prune: true
|
|
||||||
@@ -16,6 +16,10 @@ spec:
|
|||||||
chart: wordpress
|
chart: wordpress
|
||||||
helm:
|
helm:
|
||||||
values: |
|
values: |
|
||||||
|
# Stopped until PHP is patched (CERT-EU 2026-018, CVE-2026-109618,
|
||||||
|
# CVE-2026-109619). Set back to 1 once the image ships a fixed PHP.
|
||||||
|
replicaCount: 0
|
||||||
|
|
||||||
# Official WordPress image configuration
|
# Official WordPress image configuration
|
||||||
image:
|
image:
|
||||||
registry: docker.io
|
registry: docker.io
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ resources:
|
|||||||
- https://raw.githubusercontent.com/argoproj/argo-cd/refs/tags/v2.14.2/manifests/install.yaml
|
- https://raw.githubusercontent.com/argoproj/argo-cd/refs/tags/v2.14.2/manifests/install.yaml
|
||||||
- ingress.yaml
|
- ingress.yaml
|
||||||
- oidc-secret.yaml
|
- oidc-secret.yaml
|
||||||
|
- patched-ca-bundle.yaml
|
||||||
|
|
||||||
patches:
|
patches:
|
||||||
- target:
|
- target:
|
||||||
@@ -18,4 +19,5 @@ patches:
|
|||||||
name: argocd-notifications-controller
|
name: argocd-notifications-controller
|
||||||
path: overlays/argocd-notifications-controller-patch.yaml
|
path: overlays/argocd-notifications-controller-patch.yaml
|
||||||
- path: overlays/argocd-cm.patch.yaml
|
- path: overlays/argocd-cm.patch.yaml
|
||||||
- path: overlays/argocd-rbac-cm.patch.yaml
|
- path: overlays/argocd-rbac-cm.patch.yaml
|
||||||
|
- path: overlays/patched-ca-bundle.patch.yaml
|
||||||
@@ -0,0 +1,111 @@
|
|||||||
|
# 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.
|
||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: argocd-server
|
||||||
|
spec:
|
||||||
|
template:
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: argocd-server
|
||||||
|
volumeMounts:
|
||||||
|
- name: patched-ca-bundle
|
||||||
|
mountPath: /etc/ssl/certs
|
||||||
|
readOnly: true
|
||||||
|
volumes:
|
||||||
|
- name: patched-ca-bundle
|
||||||
|
configMap:
|
||||||
|
name: patched-ca-bundle
|
||||||
|
---
|
||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: argocd-repo-server
|
||||||
|
spec:
|
||||||
|
template:
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: argocd-repo-server
|
||||||
|
volumeMounts:
|
||||||
|
- name: patched-ca-bundle
|
||||||
|
mountPath: /etc/ssl/certs
|
||||||
|
readOnly: true
|
||||||
|
volumes:
|
||||||
|
- name: patched-ca-bundle
|
||||||
|
configMap:
|
||||||
|
name: patched-ca-bundle
|
||||||
|
---
|
||||||
|
apiVersion: apps/v1
|
||||||
|
kind: StatefulSet
|
||||||
|
metadata:
|
||||||
|
name: argocd-application-controller
|
||||||
|
spec:
|
||||||
|
template:
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: argocd-application-controller
|
||||||
|
volumeMounts:
|
||||||
|
- name: patched-ca-bundle
|
||||||
|
mountPath: /etc/ssl/certs
|
||||||
|
readOnly: true
|
||||||
|
volumes:
|
||||||
|
- name: patched-ca-bundle
|
||||||
|
configMap:
|
||||||
|
name: patched-ca-bundle
|
||||||
|
---
|
||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: argocd-applicationset-controller
|
||||||
|
spec:
|
||||||
|
template:
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: argocd-applicationset-controller
|
||||||
|
volumeMounts:
|
||||||
|
- name: patched-ca-bundle
|
||||||
|
mountPath: /etc/ssl/certs
|
||||||
|
readOnly: true
|
||||||
|
volumes:
|
||||||
|
- name: patched-ca-bundle
|
||||||
|
configMap:
|
||||||
|
name: patched-ca-bundle
|
||||||
|
---
|
||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: argocd-notifications-controller
|
||||||
|
spec:
|
||||||
|
template:
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: argocd-notifications-controller
|
||||||
|
volumeMounts:
|
||||||
|
- name: patched-ca-bundle
|
||||||
|
mountPath: /etc/ssl/certs
|
||||||
|
readOnly: true
|
||||||
|
volumes:
|
||||||
|
- name: patched-ca-bundle
|
||||||
|
configMap:
|
||||||
|
name: patched-ca-bundle
|
||||||
|
---
|
||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: argocd-dex-server
|
||||||
|
spec:
|
||||||
|
template:
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: dex
|
||||||
|
volumeMounts:
|
||||||
|
- name: patched-ca-bundle
|
||||||
|
mountPath: /etc/ssl/certs
|
||||||
|
readOnly: true
|
||||||
|
volumes:
|
||||||
|
- name: patched-ca-bundle
|
||||||
|
configMap:
|
||||||
|
name: patched-ca-bundle
|
||||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -8,7 +8,9 @@ metadata:
|
|||||||
io.kompose.service: freshrss
|
io.kompose.service: freshrss
|
||||||
name: freshrss
|
name: freshrss
|
||||||
spec:
|
spec:
|
||||||
replicas: 1
|
# Stopped until PHP is patched (CERT-EU 2026-018, CVE-2026-109618,
|
||||||
|
# CVE-2026-109619). Set back to 1 once the image ships a fixed PHP.
|
||||||
|
replicas: 0
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
io.kompose.service: freshrss
|
io.kompose.service: freshrss
|
||||||
|
|||||||
@@ -1,39 +0,0 @@
|
|||||||
apiVersion: batch/v1
|
|
||||||
kind: CronJob
|
|
||||||
metadata:
|
|
||||||
name: ip-updater
|
|
||||||
spec:
|
|
||||||
schedule: "*/5 * * * *"
|
|
||||||
successfulJobsHistoryLimit: 1
|
|
||||||
failedJobsHistoryLimit: 3
|
|
||||||
jobTemplate:
|
|
||||||
spec:
|
|
||||||
template:
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: ip-updater
|
|
||||||
image: alpine:3.19
|
|
||||||
command: ["/bin/sh", "-c"]
|
|
||||||
args:
|
|
||||||
- |
|
|
||||||
apk add --no-cache openssh-client curl > /dev/null 2>&1
|
|
||||||
cp /ssh-key/private_key /tmp/ssh_key
|
|
||||||
chmod 600 /tmp/ssh_key
|
|
||||||
IP=$(curl -s --max-time 10 https://api.ipify.org)
|
|
||||||
if [ -z "$IP" ]; then
|
|
||||||
echo "Failed to get external IP"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo "Current external IP: $IP"
|
|
||||||
ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
|
|
||||||
-i /tmp/ssh_key root@46.224.26.65 "$IP"
|
|
||||||
volumeMounts:
|
|
||||||
- name: ssh-key
|
|
||||||
mountPath: /ssh-key
|
|
||||||
readOnly: true
|
|
||||||
volumes:
|
|
||||||
- name: ssh-key
|
|
||||||
secret:
|
|
||||||
secretName: ip-updater-ssh-key
|
|
||||||
defaultMode: 0400
|
|
||||||
restartPolicy: OnFailure
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
apiVersion: external-secrets.io/v1beta1
|
|
||||||
kind: ExternalSecret
|
|
||||||
metadata:
|
|
||||||
name: ip-updater-ssh-key
|
|
||||||
spec:
|
|
||||||
secretStoreRef:
|
|
||||||
name: vault-backend
|
|
||||||
kind: ClusterSecretStore
|
|
||||||
refreshInterval: 15m
|
|
||||||
target:
|
|
||||||
name: ip-updater-ssh-key
|
|
||||||
creationPolicy: Owner
|
|
||||||
data:
|
|
||||||
- secretKey: private_key
|
|
||||||
remoteRef:
|
|
||||||
key: kv/ip-updater
|
|
||||||
property: ssh_private_key
|
|
||||||
@@ -122,6 +122,17 @@ in
|
|||||||
80 # HTTP (ACME)
|
80 # HTTP (ACME)
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# ──────────────────────────────────────────────
|
||||||
|
# Trust store
|
||||||
|
# ──────────────────────────────────────────────
|
||||||
|
# Distrust the roots above the compromised eMudhra intermediates until
|
||||||
|
# nixpkgs ships NSS 3.131.1, see https://emudhra.we-have-a-problem.com.
|
||||||
|
# Everything this box talks to chains to ISRG Root X1.
|
||||||
|
security.pki.caCertificateBlacklist = [
|
||||||
|
"Comodo AAA Services root"
|
||||||
|
"emSign ECC Root CA - G3"
|
||||||
|
];
|
||||||
|
|
||||||
# ──────────────────────────────────────────────
|
# ──────────────────────────────────────────────
|
||||||
# ACME / Let's Encrypt
|
# ACME / Let's Encrypt
|
||||||
# ──────────────────────────────────────────────
|
# ──────────────────────────────────────────────
|
||||||
|
|||||||
@@ -11,6 +11,11 @@ spec:
|
|||||||
targetRevision: 8.4.0
|
targetRevision: 8.4.0
|
||||||
helm:
|
helm:
|
||||||
values: |
|
values: |
|
||||||
|
# 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.
|
||||||
|
upgradeCRDs: false
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: velero-plugin-for-aws
|
- name: velero-plugin-for-aws
|
||||||
image: velero/velero-plugin-for-aws:v1.11.1
|
image: velero/velero-plugin-for-aws:v1.11.1
|
||||||
@@ -43,13 +48,15 @@ spec:
|
|||||||
nodeAgent:
|
nodeAgent:
|
||||||
containerSecurityContext:
|
containerSecurityContext:
|
||||||
privileged: true
|
privileged: true
|
||||||
|
# 512Mi got the server OOMKilled 314 times, including halfway
|
||||||
|
# through a backup of ~14.7k items.
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 100m
|
cpu: 100m
|
||||||
memory: 256Mi
|
memory: 512Mi
|
||||||
limits:
|
limits:
|
||||||
cpu: 500m
|
cpu: 500m
|
||||||
memory: 512Mi
|
memory: 2Gi
|
||||||
|
|
||||||
destination:
|
destination:
|
||||||
server: https://kubernetes.default.svc
|
server: https://kubernetes.default.svc
|
||||||
|
|||||||
Reference in new issue
Block a user