Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d0b3c26223 |
@@ -40,3 +40,10 @@ repos:
|
|||||||
entry: ci/validate-no-secrets.sh
|
entry: ci/validate-no-secrets.sh
|
||||||
language: system
|
language: system
|
||||||
pass_filenames: false
|
pass_filenames: false
|
||||||
|
- id: conftest_policies
|
||||||
|
name: OPA policy checks (conftest)
|
||||||
|
entry: conftest test --policy policy/
|
||||||
|
language: system
|
||||||
|
types: [yaml]
|
||||||
|
exclude: ".*/charts/.*|.*/templates/.*|\\.woodpecker/.*"
|
||||||
|
pass_filenames: true
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ remotes:
|
|||||||
immutable_patterns:
|
immutable_patterns:
|
||||||
- "^cloudnative-pg/cloudnative-pg"
|
- "^cloudnative-pg/cloudnative-pg"
|
||||||
- "^emberstack/helm-charts"
|
- "^emberstack/helm-charts"
|
||||||
- "^open-webui/open-webui"
|
|
||||||
- "^openvoxproject/"
|
- "^openvoxproject/"
|
||||||
- "^stakater/reloader"
|
- "^stakater/reloader"
|
||||||
- "^stalwartlabs/stalwart"
|
- "^stalwartlabs/stalwart"
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ remotes:
|
|||||||
- "neovim/neovim/.*/nvim-linux-x86_64.tar.gz$"
|
- "neovim/neovim/.*/nvim-linux-x86_64.tar.gz$"
|
||||||
- "nzbgetcom/nzbget/.*/nzbget-.*.x86_64.rpm$"
|
- "nzbgetcom/nzbget/.*/nzbget-.*.x86_64.rpm$"
|
||||||
- "onedr0p/exportarr/.*/exportarr_.*_linux_amd64.tar.gz$"
|
- "onedr0p/exportarr/.*/exportarr_.*_linux_amd64.tar.gz$"
|
||||||
- "open-policy-agent/conftest/.*/conftest_.*_Linux_x86_64.tar.gz$"
|
|
||||||
- "openbao/openbao-plugins/.*/openbao-plugin-secrets-consul_linux_amd64_.*.tar.gz$"
|
- "openbao/openbao-plugins/.*/openbao-plugin-secrets-consul_linux_amd64_.*.tar.gz$"
|
||||||
- "openbao/openbao-plugins/.*/openbao-plugin-secrets-nomad_linux_amd64_.*.tar.gz$"
|
- "openbao/openbao-plugins/.*/openbao-plugin-secrets-nomad_linux_amd64_.*.tar.gz$"
|
||||||
- "prometheus-community/bind_exporter/.*/bind_exporter-.*.linux-amd64.tar.gz$"
|
- "prometheus-community/bind_exporter/.*/bind_exporter-.*.linux-amd64.tar.gz$"
|
||||||
|
|||||||
@@ -1,51 +0,0 @@
|
|||||||
# kanidm
|
|
||||||
|
|
||||||
Three-replica kanidm identity server with Vault-managed replication certificates.
|
|
||||||
|
|
||||||
## Architecture
|
|
||||||
|
|
||||||
- Per-pod `server-N.toml` in `resources/` — each has its own replication origin hardcoded
|
|
||||||
- `config-init` busybox init container copies the right config and injects peer certs from the
|
|
||||||
vault-synced `kanidm-repl-certs` Secret at pod startup
|
|
||||||
- `reloader.stakater.com/auto: "true"` triggers a rolling restart when the ConfigMap or Secret changes
|
|
||||||
- Vault path: `kv/kubernetes/namespace/kanidm/default/repl-certs`
|
|
||||||
- Keys: `kanidm-0`, `kanidm-1`, `kanidm-2` — each holds that pod's replication certificate
|
|
||||||
|
|
||||||
## Initial setup
|
|
||||||
|
|
||||||
After the first pod starts, generate the admin credentials:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
kubectl exec -n kanidm kanidm-0 -- /sbin/kanidmd recover-account -c /config/server.toml admin
|
|
||||||
kubectl exec -n kanidm kanidm-0 -- /sbin/kanidmd recover-account -c /config/server.toml idm_admin
|
|
||||||
```
|
|
||||||
|
|
||||||
## Replication certificate rotation
|
|
||||||
|
|
||||||
When certs need to be renewed, update vault and reloader will roll the StatefulSet:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Get new cert from a pod
|
|
||||||
kubectl exec -it -n kanidm kanidm-N -- /sbin/kanidmd renew-replication-certificate -c /config/server.toml
|
|
||||||
|
|
||||||
# Write updated cert to vault (reloader triggers restart automatically)
|
|
||||||
vault kv patch kv/kubernetes/namespace/kanidm/default/repl-certs "kanidm-N=<cert>"
|
|
||||||
```
|
|
||||||
|
|
||||||
## Resolving domain UUID mismatch
|
|
||||||
|
|
||||||
If pods initialized independently (each with a different domain UUID), replication will fail with
|
|
||||||
`Consumer Domain UUID does not match`. Fix by resetting kanidm-1 and kanidm-2 to sync from
|
|
||||||
kanidm-0 (the authoritative node):
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Scale down to avoid split-brain during reset
|
|
||||||
kubectl scale statefulset -n kanidm kanidm --replicas=1
|
|
||||||
|
|
||||||
# Delete the stale PVCs for the replica pods
|
|
||||||
kubectl delete pvc -n kanidm data-kanidm-1 data-kanidm-2
|
|
||||||
|
|
||||||
# Scale back up — replicas start with empty DBs and automatic_refresh=true
|
|
||||||
# will trigger a full sync from kanidm-0 once TLS peer certs are verified
|
|
||||||
kubectl scale statefulset -n kanidm kanidm --replicas=3
|
|
||||||
```
|
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: ConfigMap
|
||||||
|
metadata:
|
||||||
|
name: kanidm-config
|
||||||
|
namespace: kanidm
|
||||||
|
labels:
|
||||||
|
app.kubernetes.io/name: kanidm
|
||||||
|
app.kubernetes.io/instance: kanidm
|
||||||
|
data:
|
||||||
|
server.toml: |
|
||||||
|
version = "2"
|
||||||
|
|
||||||
|
domain = "auth.unkin.net"
|
||||||
|
origin = "https://auth.unkin.net"
|
||||||
|
bindaddress = "[::]:8443"
|
||||||
|
db_path = "/data/kanidm.db"
|
||||||
|
db_arc_size = 2048
|
||||||
|
tls_chain = "/data/tls/tls.crt"
|
||||||
|
tls_key = "/data/tls/tls.key"
|
||||||
|
log_level = "info"
|
||||||
|
|
||||||
|
[online_backup]
|
||||||
|
path = "/data/backups/"
|
||||||
|
schedule = "0 22 * * *"
|
||||||
|
versions = 7
|
||||||
|
|
||||||
|
[replication]
|
||||||
|
origin = "__REPL_ORIGIN__"
|
||||||
|
bindaddress = "[::]:8444"
|
||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: ConfigMap
|
||||||
|
metadata:
|
||||||
|
name: kanidm-repl-certs
|
||||||
|
namespace: kanidm
|
||||||
|
labels:
|
||||||
|
app.kubernetes.io/name: kanidm
|
||||||
|
app.kubernetes.io/instance: kanidm
|
||||||
|
data: {}
|
||||||
@@ -5,25 +5,12 @@ kind: Kustomization
|
|||||||
resources:
|
resources:
|
||||||
- namespace.yaml
|
- namespace.yaml
|
||||||
- serviceaccount.yaml
|
- serviceaccount.yaml
|
||||||
- vaultauth.yaml
|
- rbac.yaml
|
||||||
- vaultstaticsecret.yaml
|
|
||||||
- certificate.yaml
|
- certificate.yaml
|
||||||
|
- configmap.yaml
|
||||||
- service.yaml
|
- service.yaml
|
||||||
- statefulset.yaml
|
- statefulset.yaml
|
||||||
- poddisruptionbudget.yaml
|
- poddisruptionbudget.yaml
|
||||||
- gateway.yaml
|
- gateway.yaml
|
||||||
- httproute.yaml
|
- httproute.yaml
|
||||||
- tlsroute.yaml
|
- tlsroute.yaml
|
||||||
|
|
||||||
configMapGenerator:
|
|
||||||
- name: kanidm-config
|
|
||||||
namespace: kanidm
|
|
||||||
options:
|
|
||||||
disableNameSuffixHash: true
|
|
||||||
labels:
|
|
||||||
app.kubernetes.io/name: kanidm
|
|
||||||
app.kubernetes.io/instance: kanidm
|
|
||||||
files:
|
|
||||||
- server-0.toml=resources/server-0.toml
|
|
||||||
- server-1.toml=resources/server-1.toml
|
|
||||||
- server-2.toml=resources/server-2.toml
|
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
version = "2"
|
|
||||||
|
|
||||||
domain = "auth.unkin.net"
|
|
||||||
origin = "https://auth.unkin.net"
|
|
||||||
bindaddress = "[::]:8443"
|
|
||||||
db_path = "/data/kanidm.db"
|
|
||||||
db_arc_size = 2048
|
|
||||||
tls_chain = "/data/tls/tls.crt"
|
|
||||||
tls_key = "/data/tls/tls.key"
|
|
||||||
log_level = "info"
|
|
||||||
|
|
||||||
[online_backup]
|
|
||||||
path = "/data/backups/"
|
|
||||||
schedule = "0 22 * * *"
|
|
||||||
versions = 7
|
|
||||||
|
|
||||||
[replication]
|
|
||||||
origin = "repl://kanidm-0.kanidm-headless.kanidm.svc.cluster.local:8444"
|
|
||||||
bindaddress = "[::]:8444"
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
version = "2"
|
|
||||||
|
|
||||||
domain = "auth.unkin.net"
|
|
||||||
origin = "https://auth.unkin.net"
|
|
||||||
bindaddress = "[::]:8443"
|
|
||||||
db_path = "/data/kanidm.db"
|
|
||||||
db_arc_size = 2048
|
|
||||||
tls_chain = "/data/tls/tls.crt"
|
|
||||||
tls_key = "/data/tls/tls.key"
|
|
||||||
log_level = "info"
|
|
||||||
|
|
||||||
[online_backup]
|
|
||||||
path = "/data/backups/"
|
|
||||||
schedule = "0 22 * * *"
|
|
||||||
versions = 7
|
|
||||||
|
|
||||||
[replication]
|
|
||||||
origin = "repl://kanidm-1.kanidm-headless.kanidm.svc.cluster.local:8444"
|
|
||||||
bindaddress = "[::]:8444"
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
version = "2"
|
|
||||||
|
|
||||||
domain = "auth.unkin.net"
|
|
||||||
origin = "https://auth.unkin.net"
|
|
||||||
bindaddress = "[::]:8443"
|
|
||||||
db_path = "/data/kanidm.db"
|
|
||||||
db_arc_size = 2048
|
|
||||||
tls_chain = "/data/tls/tls.crt"
|
|
||||||
tls_key = "/data/tls/tls.key"
|
|
||||||
log_level = "info"
|
|
||||||
|
|
||||||
[online_backup]
|
|
||||||
path = "/data/backups/"
|
|
||||||
schedule = "0 22 * * *"
|
|
||||||
versions = 7
|
|
||||||
|
|
||||||
[replication]
|
|
||||||
origin = "repl://kanidm-2.kanidm-headless.kanidm.svc.cluster.local:8444"
|
|
||||||
bindaddress = "[::]:8444"
|
|
||||||
@@ -4,8 +4,6 @@ kind: StatefulSet
|
|||||||
metadata:
|
metadata:
|
||||||
name: kanidm
|
name: kanidm
|
||||||
namespace: kanidm
|
namespace: kanidm
|
||||||
annotations:
|
|
||||||
reloader.stakater.com/auto: "true"
|
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: kanidm
|
app.kubernetes.io/name: kanidm
|
||||||
app.kubernetes.io/instance: kanidm
|
app.kubernetes.io/instance: kanidm
|
||||||
@@ -38,19 +36,23 @@ spec:
|
|||||||
fsGroup: 1000
|
fsGroup: 1000
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: config-init
|
- name: config-init
|
||||||
image: busybox:1.36
|
image: kanidm/server:1.10.3
|
||||||
command: ["/bin/sh", "-c"]
|
command: ["/bin/sh", "-c"]
|
||||||
args:
|
args:
|
||||||
- |
|
- |
|
||||||
set -e
|
set -e
|
||||||
cp "/config-template/server-${POD_NAME##*-}.toml" /config/server.toml
|
REPL_ORIGIN="repl://${POD_NAME}.kanidm-headless.kanidm.svc.cluster.local:8444"
|
||||||
|
sed "s|__REPL_ORIGIN__|${REPL_ORIGIN}|g" /config-template/server.toml > /config/server.toml
|
||||||
for peer in kanidm-0 kanidm-1 kanidm-2; do
|
for peer in kanidm-0 kanidm-1 kanidm-2; do
|
||||||
[ "${peer}" = "${POD_NAME}" ] && continue
|
if [ "${peer}" = "${POD_NAME}" ]; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
cert_file="/repl-certs/${peer}"
|
cert_file="/repl-certs/${peer}"
|
||||||
[ -s "${cert_file}" ] || continue
|
if [ -s "${cert_file}" ]; then
|
||||||
fqdn="${peer}.kanidm-headless.kanidm.svc.cluster.local"
|
fqdn="${peer}.kanidm-headless.kanidm.svc.cluster.local"
|
||||||
printf '\n[replication."repl://%s:8444"]\ntype = "mutual-pull"\npartner_cert = "%s"\n' \
|
printf '\n[replication."repl://%s:8444"]\ntype = "mutual-pull"\npartner_cert = "%s"\n' \
|
||||||
"${fqdn}" "$(cat ${cert_file})" >> /config/server.toml
|
"${fqdn}" "$(cat ${cert_file})" >> /config/server.toml
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
env:
|
env:
|
||||||
- name: POD_NAME
|
- name: POD_NAME
|
||||||
@@ -60,7 +62,6 @@ spec:
|
|||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: config-template
|
- name: config-template
|
||||||
mountPath: /config-template
|
mountPath: /config-template
|
||||||
readOnly: true
|
|
||||||
- name: config
|
- name: config
|
||||||
mountPath: /config
|
mountPath: /config
|
||||||
- name: repl-certs
|
- name: repl-certs
|
||||||
@@ -69,6 +70,33 @@ spec:
|
|||||||
securityContext:
|
securityContext:
|
||||||
allowPrivilegeEscalation: false
|
allowPrivilegeEscalation: false
|
||||||
readOnlyRootFilesystem: true
|
readOnlyRootFilesystem: true
|
||||||
|
- name: repl-cert-publisher
|
||||||
|
image: bitnami/kubectl:1.33
|
||||||
|
restartPolicy: Always
|
||||||
|
command: ["/bin/sh", "-c"]
|
||||||
|
args:
|
||||||
|
- |
|
||||||
|
until kubectl exec "${POD_NAME}" -c kanidm -- /sbin/kanidmd renew-replication-certificate 2>/dev/null | grep -q '^# certificate:'; do
|
||||||
|
sleep 30
|
||||||
|
done
|
||||||
|
while true; do
|
||||||
|
cert=$(kubectl exec "${POD_NAME}" -c kanidm -- /sbin/kanidmd renew-replication-certificate 2>/dev/null \
|
||||||
|
| grep '^# certificate:' | sed 's/^# certificate: "\(.*\)"$/\1/')
|
||||||
|
if [ -n "${cert}" ]; then
|
||||||
|
kubectl patch configmap kanidm-repl-certs \
|
||||||
|
--type=merge \
|
||||||
|
-p "{\"data\":{\"${POD_NAME}\":\"${cert}\"}}"
|
||||||
|
fi
|
||||||
|
sleep 3600
|
||||||
|
done
|
||||||
|
env:
|
||||||
|
- name: POD_NAME
|
||||||
|
valueFrom:
|
||||||
|
fieldRef:
|
||||||
|
fieldPath: metadata.name
|
||||||
|
securityContext:
|
||||||
|
allowPrivilegeEscalation: false
|
||||||
|
readOnlyRootFilesystem: false
|
||||||
containers:
|
containers:
|
||||||
- name: kanidm
|
- name: kanidm
|
||||||
image: kanidm/server:1.10.3
|
image: kanidm/server:1.10.3
|
||||||
@@ -117,8 +145,8 @@ spec:
|
|||||||
- name: config
|
- name: config
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
- name: repl-certs
|
- name: repl-certs
|
||||||
secret:
|
configMap:
|
||||||
secretName: kanidm-repl-certs
|
name: kanidm-repl-certs
|
||||||
- name: tls
|
- name: tls
|
||||||
secret:
|
secret:
|
||||||
secretName: kanidm-tls
|
secretName: kanidm-tls
|
||||||
|
|||||||
@@ -13,14 +13,9 @@ spec:
|
|||||||
- auth.unkin.net
|
- auth.unkin.net
|
||||||
- au.auth.unkin.net
|
- au.auth.unkin.net
|
||||||
parentRefs:
|
parentRefs:
|
||||||
- group: gateway.networking.k8s.io
|
- name: kanidm
|
||||||
kind: Gateway
|
|
||||||
name: kanidm
|
|
||||||
sectionName: https-passthrough
|
sectionName: https-passthrough
|
||||||
rules:
|
rules:
|
||||||
- backendRefs:
|
- backendRefs:
|
||||||
- group: ""
|
- name: kanidm
|
||||||
kind: Service
|
|
||||||
name: kanidm
|
|
||||||
port: 8443
|
port: 8443
|
||||||
weight: 1
|
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: secrets.hashicorp.com/v1beta1
|
|
||||||
kind: VaultAuth
|
|
||||||
metadata:
|
|
||||||
name: default
|
|
||||||
namespace: kanidm
|
|
||||||
spec:
|
|
||||||
allowedNamespaces:
|
|
||||||
- kanidm
|
|
||||||
kubernetes:
|
|
||||||
audiences:
|
|
||||||
- vault
|
|
||||||
role: default
|
|
||||||
serviceAccount: default
|
|
||||||
tokenExpirationSeconds: 600
|
|
||||||
method: kubernetes
|
|
||||||
mount: k8s/au/syd1
|
|
||||||
vaultConnectionRef: vso-system/default
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: secrets.hashicorp.com/v1beta1
|
|
||||||
kind: VaultStaticSecret
|
|
||||||
metadata:
|
|
||||||
name: repl-certs
|
|
||||||
namespace: kanidm
|
|
||||||
labels:
|
|
||||||
app.kubernetes.io/name: kanidm
|
|
||||||
app.kubernetes.io/instance: kanidm
|
|
||||||
spec:
|
|
||||||
vaultAuthRef: default
|
|
||||||
mount: kv
|
|
||||||
type: kv-v2
|
|
||||||
path: kubernetes/namespace/kanidm/default/repl-certs
|
|
||||||
refreshAfter: 5m
|
|
||||||
destination:
|
|
||||||
name: kanidm-repl-certs
|
|
||||||
create: true
|
|
||||||
overwrite: true
|
|
||||||
hmacSecretData: true
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
|
|
||||||
resources:
|
|
||||||
- priorityclasses.yaml
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: scheduling.k8s.io/v1
|
|
||||||
kind: PriorityClass
|
|
||||||
metadata:
|
|
||||||
name: low
|
|
||||||
value: 100
|
|
||||||
preemptionPolicy: Never
|
|
||||||
globalDefault: false
|
|
||||||
description: "Low-importance workloads. Can be evicted under pressure but will not preempt other pods."
|
|
||||||
---
|
|
||||||
apiVersion: scheduling.k8s.io/v1
|
|
||||||
kind: PriorityClass
|
|
||||||
metadata:
|
|
||||||
name: power
|
|
||||||
value: 100
|
|
||||||
preemptionPolicy: Never
|
|
||||||
globalDefault: false
|
|
||||||
description: "Compute-heavy workloads with low scheduling importance. Evictable under pressure."
|
|
||||||
---
|
|
||||||
apiVersion: scheduling.k8s.io/v1
|
|
||||||
kind: PriorityClass
|
|
||||||
metadata:
|
|
||||||
name: medium
|
|
||||||
value: 10000
|
|
||||||
preemptionPolicy: PreemptLowerPriority
|
|
||||||
globalDefault: false
|
|
||||||
description: "Standard workloads. Will preempt low-priority pods if the cluster is under pressure."
|
|
||||||
---
|
|
||||||
apiVersion: scheduling.k8s.io/v1
|
|
||||||
kind: PriorityClass
|
|
||||||
metadata:
|
|
||||||
name: high
|
|
||||||
value: 100000
|
|
||||||
preemptionPolicy: PreemptLowerPriority
|
|
||||||
globalDefault: false
|
|
||||||
description: "High-importance services. Will preempt medium- and low-priority pods if necessary."
|
|
||||||
@@ -150,7 +150,7 @@ spec:
|
|||||||
memory: 350Mi
|
memory: 350Mi
|
||||||
cpu: 100m
|
cpu: 100m
|
||||||
limits:
|
limits:
|
||||||
memory: 1024Mi
|
memory: 1Gi
|
||||||
cpu: 500m
|
cpu: 500m
|
||||||
securityContext:
|
securityContext:
|
||||||
runAsNonRoot: true
|
runAsNonRoot: true
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ spec:
|
|||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpu: 1
|
cpu: "1"
|
||||||
memory: 1536Mi
|
memory: 1536Mi
|
||||||
requests:
|
requests:
|
||||||
cpu: 250m
|
cpu: 250m
|
||||||
|
|||||||
@@ -31,11 +31,11 @@ spec:
|
|||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpu: 2
|
cpu: "2"
|
||||||
memory: 3072Mi
|
memory: 3Gi
|
||||||
requests:
|
requests:
|
||||||
cpu: 500m
|
cpu: 500m
|
||||||
memory: 1024Mi
|
memory: 1Gi
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8140
|
- containerPort: 8140
|
||||||
name: puppetserver
|
name: puppetserver
|
||||||
|
|||||||
@@ -35,11 +35,11 @@ spec:
|
|||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpu: 2
|
cpu: "2"
|
||||||
memory: 3500Mi
|
memory: 3500Mi
|
||||||
requests:
|
requests:
|
||||||
cpu: 250m
|
cpu: 250m
|
||||||
memory: 1024Mi
|
memory: 1Gi
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8140
|
- containerPort: 8140
|
||||||
name: puppetserver
|
name: puppetserver
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ metadata:
|
|||||||
name: puppetdb
|
name: puppetdb
|
||||||
namespace: puppet
|
namespace: puppet
|
||||||
spec:
|
spec:
|
||||||
|
clusterIP: null
|
||||||
ports:
|
ports:
|
||||||
- name: pdb-http
|
- name: pdb-http
|
||||||
port: 8080
|
port: 8080
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ spec:
|
|||||||
cpu: 500m
|
cpu: 500m
|
||||||
memory: 1Gi
|
memory: 1Gi
|
||||||
limits:
|
limits:
|
||||||
cpu: 2000m
|
cpu: "2"
|
||||||
memory: 4Gi
|
memory: 4Gi
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: repodata
|
- name: repodata
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ spec:
|
|||||||
cpu: 500m
|
cpu: 500m
|
||||||
memory: 1Gi
|
memory: 1Gi
|
||||||
limits:
|
limits:
|
||||||
cpu: 2000m
|
cpu: "2"
|
||||||
memory: 4Gi
|
memory: 4Gi
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: repodata
|
- name: repodata
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ spec:
|
|||||||
cpu: 500m
|
cpu: 500m
|
||||||
memory: 1Gi
|
memory: 1Gi
|
||||||
limits:
|
limits:
|
||||||
cpu: 2000m
|
cpu: "2"
|
||||||
memory: 4Gi
|
memory: 4Gi
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: repodata
|
- name: repodata
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ spec:
|
|||||||
cpu: 500m
|
cpu: 500m
|
||||||
memory: 1Gi
|
memory: 1Gi
|
||||||
limits:
|
limits:
|
||||||
cpu: 2000m
|
cpu: "2"
|
||||||
memory: 4Gi
|
memory: 4Gi
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: repodata
|
- name: repodata
|
||||||
|
|||||||
@@ -6,4 +6,3 @@ resources:
|
|||||||
- namespace.yaml
|
- namespace.yaml
|
||||||
- gateway.yaml
|
- gateway.yaml
|
||||||
- httproute.yaml
|
- httproute.yaml
|
||||||
- role_k8s-service-registration.yaml
|
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
|
||||||
kind: Role
|
|
||||||
metadata:
|
|
||||||
name: vault-k8s-service-registration
|
|
||||||
namespace: vault
|
|
||||||
rules:
|
|
||||||
- apiGroups: [""]
|
|
||||||
resources: ["pods"]
|
|
||||||
verbs: ["get", "update", "patch"]
|
|
||||||
---
|
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
|
||||||
kind: RoleBinding
|
|
||||||
metadata:
|
|
||||||
name: vault-k8s-service-registration
|
|
||||||
namespace: vault
|
|
||||||
roleRef:
|
|
||||||
apiGroup: rbac.authorization.k8s.io
|
|
||||||
kind: Role
|
|
||||||
name: vault-k8s-service-registration
|
|
||||||
subjects:
|
|
||||||
- kind: ServiceAccount
|
|
||||||
name: vault
|
|
||||||
namespace: vault
|
|
||||||
@@ -37,7 +37,7 @@ server:
|
|||||||
cpu: 100m
|
cpu: 100m
|
||||||
limits:
|
limits:
|
||||||
memory: 2Gi
|
memory: 2Gi
|
||||||
cpu: "1"
|
cpu: 1000m
|
||||||
|
|
||||||
client:
|
client:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
|
|
||||||
resources:
|
|
||||||
- ../../../base/priority-classes
|
|
||||||
@@ -40,7 +40,9 @@ server:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
service_registration "kubernetes" {}
|
service_registration "consul" {
|
||||||
|
address = "consul-server.consul.svc.cluster.local:8500"
|
||||||
|
}
|
||||||
|
|
||||||
dataStorage:
|
dataStorage:
|
||||||
enabled: true
|
enabled: true
|
||||||
@@ -48,14 +50,6 @@ server:
|
|||||||
storageClass: cephrbd-fast-delete
|
storageClass: cephrbd-fast-delete
|
||||||
accessMode: ReadWriteOnce
|
accessMode: ReadWriteOnce
|
||||||
|
|
||||||
extraEnv:
|
|
||||||
- name: VAULT_K8S_NAMESPACE
|
|
||||||
value: vault
|
|
||||||
- name: VAULT_K8S_POD_NAME
|
|
||||||
valueFrom:
|
|
||||||
fieldRef:
|
|
||||||
fieldPath: metadata.name
|
|
||||||
|
|
||||||
statefulSet:
|
statefulSet:
|
||||||
securityContext:
|
securityContext:
|
||||||
container:
|
container:
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ agent:
|
|||||||
replicaCount: 3
|
replicaCount: 3
|
||||||
env:
|
env:
|
||||||
WOODPECKER_MAX_WORKFLOWS: "8"
|
WOODPECKER_MAX_WORKFLOWS: "8"
|
||||||
WOODPECKER_BACKEND_K8S_PRIORITY_CLASS: power
|
|
||||||
WOODPECKER_BACKEND_K8S_STORAGE_CLASS: cephrbd-fast-delete
|
WOODPECKER_BACKEND_K8S_STORAGE_CLASS: cephrbd-fast-delete
|
||||||
WOODPECKER_BACKEND_K8S_VOLUME_SIZE: 10G
|
WOODPECKER_BACKEND_K8S_VOLUME_SIZE: 10G
|
||||||
WOODPECKER_BACKEND_K8S_STORAGE_RWX: false
|
WOODPECKER_BACKEND_K8S_STORAGE_RWX: false
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ spec:
|
|||||||
- path: apps/overlays/*/jfrog
|
- path: apps/overlays/*/jfrog
|
||||||
- path: apps/overlays/*/kanidm
|
- path: apps/overlays/*/kanidm
|
||||||
- path: apps/overlays/*/node-feature-discovery
|
- path: apps/overlays/*/node-feature-discovery
|
||||||
- path: apps/overlays/*/priority-classes
|
|
||||||
- path: apps/overlays/*/puppet
|
- path: apps/overlays/*/puppet
|
||||||
- path: apps/overlays/*/purelb
|
- path: apps/overlays/*/purelb
|
||||||
- path: apps/overlays/*/reflector-system
|
- path: apps/overlays/*/reflector-system
|
||||||
|
|||||||
@@ -31,8 +31,6 @@ spec:
|
|||||||
server: https://kubernetes.default.svc
|
server: https://kubernetes.default.svc
|
||||||
- namespace: 'node-feature-discovery'
|
- namespace: 'node-feature-discovery'
|
||||||
server: https://kubernetes.default.svc
|
server: https://kubernetes.default.svc
|
||||||
- namespace: 'priority-classes'
|
|
||||||
server: https://kubernetes.default.svc
|
|
||||||
- namespace: 'purelb'
|
- namespace: 'purelb'
|
||||||
server: https://kubernetes.default.svc
|
server: https://kubernetes.default.svc
|
||||||
- namespace: 'puppet'
|
- namespace: 'puppet'
|
||||||
|
|||||||
@@ -0,0 +1,94 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
# Gateway API resources require several fields to be set explicitly even though
|
||||||
|
# the Gateway API controller defaults them. ArgoCD diffs desired vs live by
|
||||||
|
# string comparison, so any field the controller defaults that is absent from
|
||||||
|
# the git manifest causes a permanent OutOfSync.
|
||||||
|
#
|
||||||
|
# Affected resources:
|
||||||
|
# HTTPRoute / TLSRoute — parentRefs and backendRefs (see PR #162, #165)
|
||||||
|
# Gateway — listeners[*].tls.certificateRefs (see PR #153)
|
||||||
|
|
||||||
|
_route_kinds := {"HTTPRoute", "TLSRoute"}
|
||||||
|
|
||||||
|
# ---- parentRefs: group must be "gateway.networking.k8s.io" ----
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
_route_kinds[input.kind]
|
||||||
|
ref := input.spec.parentRefs[i]
|
||||||
|
object.get(ref, "group", null) != "gateway.networking.k8s.io"
|
||||||
|
msg := sprintf(
|
||||||
|
"%s %s/%s parentRefs[%d]: add 'group: gateway.networking.k8s.io' — controller defaults this field, causing ArgoCD OutOfSync when omitted",
|
||||||
|
[input.kind, input.metadata.namespace, input.metadata.name, i],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---- parentRefs: kind must be "Gateway" ----
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
_route_kinds[input.kind]
|
||||||
|
ref := input.spec.parentRefs[i]
|
||||||
|
object.get(ref, "kind", null) != "Gateway"
|
||||||
|
msg := sprintf(
|
||||||
|
"%s %s/%s parentRefs[%d]: add 'kind: Gateway' — controller defaults this field, causing ArgoCD OutOfSync when omitted",
|
||||||
|
[input.kind, input.metadata.namespace, input.metadata.name, i],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---- backendRefs: group must be present (may be empty string "") ----
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
_route_kinds[input.kind]
|
||||||
|
rule := input.spec.rules[ri]
|
||||||
|
ref := rule.backendRefs[bi]
|
||||||
|
not _has_key(ref, "group")
|
||||||
|
msg := sprintf(
|
||||||
|
"%s %s/%s rules[%d].backendRefs[%d]: add 'group: \"\"' — controller defaults this field, causing ArgoCD OutOfSync when omitted",
|
||||||
|
[input.kind, input.metadata.namespace, input.metadata.name, ri, bi],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---- backendRefs: kind must be "Service" ----
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
_route_kinds[input.kind]
|
||||||
|
rule := input.spec.rules[ri]
|
||||||
|
ref := rule.backendRefs[bi]
|
||||||
|
object.get(ref, "kind", null) != "Service"
|
||||||
|
msg := sprintf(
|
||||||
|
"%s %s/%s rules[%d].backendRefs[%d]: add 'kind: Service' — controller defaults this field, causing ArgoCD OutOfSync when omitted",
|
||||||
|
[input.kind, input.metadata.namespace, input.metadata.name, ri, bi],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---- backendRefs: weight must be present ----
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
_route_kinds[input.kind]
|
||||||
|
rule := input.spec.rules[ri]
|
||||||
|
ref := rule.backendRefs[bi]
|
||||||
|
not _has_key(ref, "weight")
|
||||||
|
msg := sprintf(
|
||||||
|
"%s %s/%s rules[%d].backendRefs[%d]: add 'weight: 1' — controller defaults this field, causing ArgoCD OutOfSync when omitted",
|
||||||
|
[input.kind, input.metadata.namespace, input.metadata.name, ri, bi],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---- Gateway certificateRefs: group must be present (may be empty string "") ----
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
input.kind == "Gateway"
|
||||||
|
listener := input.spec.listeners[li]
|
||||||
|
ref := listener.tls.certificateRefs[ci]
|
||||||
|
not _has_key(ref, "group")
|
||||||
|
msg := sprintf(
|
||||||
|
"Gateway %s/%s listeners[%d].tls.certificateRefs[%d]: add 'group: \"\"' — admission webhook defaults this field, causing ArgoCD OutOfSync when omitted",
|
||||||
|
[input.metadata.namespace, input.metadata.name, li, ci],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---- Helper: key presence check (works for null, "", and any defined value) ----
|
||||||
|
|
||||||
|
_has_key(obj, key) if {
|
||||||
|
_ = obj[key]
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
# Deny all Kubernetes Ingress resources.
|
||||||
|
# This cluster uses Gateway API (HTTPRoute + Gateway) for ingress routing.
|
||||||
|
# Ingress is the legacy API and must not be added.
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
input.kind == "Ingress"
|
||||||
|
msg := sprintf(
|
||||||
|
"%s/%s: Ingress resources are forbidden — use Gateway API HTTPRoute instead",
|
||||||
|
[input.metadata.namespace, input.metadata.name],
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,173 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
# Kubernetes normalizes resource quantity values on write. ArgoCD diffs by
|
||||||
|
# string comparison, so a non-canonical value in git will always differ from
|
||||||
|
# the live object, causing permanent OutOfSync.
|
||||||
|
#
|
||||||
|
# Rules enforced here:
|
||||||
|
# CPU integers — k8s converts integer 1 to string "1" (see PR #163)
|
||||||
|
# CPU milliCPU — k8s converts 1000m → "1", 2000m → "2", etc. (PR #164)
|
||||||
|
# Memory Mi→Gi — k8s converts 1024Mi → 1Gi, 2048Mi → 2Gi, etc. (PR #163)
|
||||||
|
# clusterIP null — k8s assigns a real IP; null in git always differs
|
||||||
|
# from the live assigned value (see PR #166)
|
||||||
|
|
||||||
|
# ---- Container helpers ----
|
||||||
|
# Extracts containers from Deployment/StatefulSet/DaemonSet/Job/CronJob/Pod
|
||||||
|
|
||||||
|
_containers contains c if { c := input.spec.template.spec.containers[_] }
|
||||||
|
_containers contains c if { c := input.spec.template.spec.initContainers[_] }
|
||||||
|
_containers contains c if { c := input.spec.containers[_] }
|
||||||
|
_containers contains c if { c := input.spec.initContainers[_] }
|
||||||
|
_containers contains c if { c := input.spec.jobTemplate.spec.template.spec.containers[_] }
|
||||||
|
|
||||||
|
# ---- CPU: must not be an integer ----
|
||||||
|
# YAML `cpu: 1` (unquoted) parses as JSON integer; k8s stores as string "1".
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
c := _containers[_]
|
||||||
|
cpu := c.resources.limits.cpu
|
||||||
|
is_number(cpu)
|
||||||
|
msg := sprintf(
|
||||||
|
"%s container %q: cpu limit %v is an unquoted integer — use \"%v\" (string) to prevent ArgoCD OutOfSync",
|
||||||
|
[input.kind, c.name, cpu, cpu],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
c := _containers[_]
|
||||||
|
cpu := c.resources.requests.cpu
|
||||||
|
is_number(cpu)
|
||||||
|
msg := sprintf(
|
||||||
|
"%s container %q: cpu request %v is an unquoted integer — use \"%v\" (string) to prevent ArgoCD OutOfSync",
|
||||||
|
[input.kind, c.name, cpu, cpu],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
input.kind == "Cluster"
|
||||||
|
cpu := input.spec.resources.limits.cpu
|
||||||
|
is_number(cpu)
|
||||||
|
msg := sprintf(
|
||||||
|
"Cluster %s/%s: cpu limit %v is an unquoted integer — use \"%v\" (string) to prevent ArgoCD OutOfSync",
|
||||||
|
[input.metadata.namespace, input.metadata.name, cpu, cpu],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
input.kind == "Cluster"
|
||||||
|
cpu := input.spec.resources.requests.cpu
|
||||||
|
is_number(cpu)
|
||||||
|
msg := sprintf(
|
||||||
|
"Cluster %s/%s: cpu request %v is an unquoted integer — use \"%v\" (string) to prevent ArgoCD OutOfSync",
|
||||||
|
[input.metadata.namespace, input.metadata.name, cpu, cpu],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---- CPU: milliCPU divisible by 1000 normalizes to a whole number ----
|
||||||
|
# k8s converts 1000m → "1", 2000m → "2". Use the canonical whole-number form.
|
||||||
|
|
||||||
|
_milli_whole(cpu) := n if {
|
||||||
|
is_string(cpu)
|
||||||
|
endswith(cpu, "m")
|
||||||
|
val := to_number(substring(cpu, 0, count(cpu) - 1))
|
||||||
|
val % 1000 == 0
|
||||||
|
val > 0
|
||||||
|
n := val / 1000
|
||||||
|
}
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
c := _containers[_]
|
||||||
|
n := _milli_whole(c.resources.limits.cpu)
|
||||||
|
msg := sprintf(
|
||||||
|
"%s container %q: cpu limit %q normalizes to \"%v\" — use canonical form to prevent ArgoCD OutOfSync",
|
||||||
|
[input.kind, c.name, c.resources.limits.cpu, n],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
c := _containers[_]
|
||||||
|
n := _milli_whole(c.resources.requests.cpu)
|
||||||
|
msg := sprintf(
|
||||||
|
"%s container %q: cpu request %q normalizes to \"%v\" — use canonical form to prevent ArgoCD OutOfSync",
|
||||||
|
[input.kind, c.name, c.resources.requests.cpu, n],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
input.kind == "Cluster"
|
||||||
|
n := _milli_whole(input.spec.resources.limits.cpu)
|
||||||
|
msg := sprintf(
|
||||||
|
"Cluster %s/%s: cpu limit %q normalizes to \"%v\" — use canonical form to prevent ArgoCD OutOfSync",
|
||||||
|
[input.metadata.namespace, input.metadata.name, input.spec.resources.limits.cpu, n],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
input.kind == "Cluster"
|
||||||
|
n := _milli_whole(input.spec.resources.requests.cpu)
|
||||||
|
msg := sprintf(
|
||||||
|
"Cluster %s/%s: cpu request %q normalizes to \"%v\" — use canonical form to prevent ArgoCD OutOfSync",
|
||||||
|
[input.metadata.namespace, input.metadata.name, input.spec.resources.requests.cpu, n],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---- Memory: Mi values divisible by 1024 normalize to Gi ----
|
||||||
|
# k8s converts 1024Mi → 1Gi, 2048Mi → 2Gi, etc.
|
||||||
|
|
||||||
|
_mi_canonical(mem) := canonical if {
|
||||||
|
endswith(mem, "Mi")
|
||||||
|
val := to_number(substring(mem, 0, count(mem) - 2))
|
||||||
|
val % 1024 == 0
|
||||||
|
val > 0
|
||||||
|
canonical := sprintf("%vGi", [val / 1024])
|
||||||
|
}
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
c := _containers[_]
|
||||||
|
canonical := _mi_canonical(c.resources.limits.memory)
|
||||||
|
msg := sprintf(
|
||||||
|
"%s container %q: memory limit %q normalizes to %q — use canonical form to prevent ArgoCD OutOfSync",
|
||||||
|
[input.kind, c.name, c.resources.limits.memory, canonical],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
c := _containers[_]
|
||||||
|
canonical := _mi_canonical(c.resources.requests.memory)
|
||||||
|
msg := sprintf(
|
||||||
|
"%s container %q: memory request %q normalizes to %q — use canonical form to prevent ArgoCD OutOfSync",
|
||||||
|
[input.kind, c.name, c.resources.requests.memory, canonical],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
input.kind == "Cluster"
|
||||||
|
canonical := _mi_canonical(input.spec.resources.limits.memory)
|
||||||
|
msg := sprintf(
|
||||||
|
"Cluster %s/%s: memory limit %q normalizes to %q — use canonical form to prevent ArgoCD OutOfSync",
|
||||||
|
[input.metadata.namespace, input.metadata.name, input.spec.resources.limits.memory, canonical],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
input.kind == "Cluster"
|
||||||
|
canonical := _mi_canonical(input.spec.resources.requests.memory)
|
||||||
|
msg := sprintf(
|
||||||
|
"Cluster %s/%s: memory request %q normalizes to %q — use canonical form to prevent ArgoCD OutOfSync",
|
||||||
|
[input.metadata.namespace, input.metadata.name, input.spec.resources.requests.memory, canonical],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---- Service: clusterIP must not be null ----
|
||||||
|
# k8s assigns a real IP on creation; clusterIP is immutable afterward.
|
||||||
|
# Setting null in git means desired=null vs live=10.x.x.x → permanent OutOfSync.
|
||||||
|
# Remove the field and let k8s own it.
|
||||||
|
|
||||||
|
deny contains msg if {
|
||||||
|
input.kind == "Service"
|
||||||
|
input.spec.clusterIP == null
|
||||||
|
msg := sprintf(
|
||||||
|
"Service %s/%s has 'clusterIP: null' — remove this field; Kubernetes assigns the IP on creation and it causes ArgoCD OutOfSync",
|
||||||
|
[input.metadata.namespace, input.metadata.name],
|
||||||
|
)
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user