Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fd7fc8f41b | |||
| 93581bfde2 | |||
| 1b781e0885 | |||
| ede25a3858 | |||
| f5f713fe86 | |||
| 3990fbfe06 | |||
| d358098fff | |||
| 201e601737 | |||
| d230d87ec9 | |||
| 6497dab25e | |||
| f403c6b05d | |||
| ac8b8212bd |
@@ -1,2 +1,3 @@
|
||||
manifests/
|
||||
apps/**/charts/
|
||||
ci/crd-schemas/
|
||||
|
||||
@@ -6,7 +6,7 @@ repos:
|
||||
- id: check-executables-have-shebangs
|
||||
- id: check-json
|
||||
- id: check-added-large-files
|
||||
args: ['--maxkb=500']
|
||||
args: ['--maxkb=2048']
|
||||
- id: check-merge-conflict
|
||||
- id: check-shebang-scripts-are-executable
|
||||
- id: check-symlinks
|
||||
|
||||
@@ -2,6 +2,21 @@ when:
|
||||
- event: pull_request
|
||||
|
||||
steps:
|
||||
- name: generate-schemas
|
||||
image: git.unkin.net/unkin/almalinux9-kubetest:20260319
|
||||
commands:
|
||||
- make generate-schemas
|
||||
backend_options:
|
||||
kubernetes:
|
||||
serviceAccountName: default
|
||||
resources:
|
||||
requests:
|
||||
memory: 512Mi
|
||||
cpu: 1
|
||||
limits:
|
||||
memory: 2Gi
|
||||
cpu: 2
|
||||
|
||||
- name: kubeconform
|
||||
image: git.unkin.net/unkin/almalinux9-kubetest:20260319
|
||||
commands:
|
||||
|
||||
@@ -11,6 +11,11 @@ kubeconform:
|
||||
@ci/validate-apps.sh && \
|
||||
ci/validate-clusters.sh
|
||||
|
||||
# Generate JSON schemas from CRD definitions for kubeconform
|
||||
# Run when CRD versions change, then commit ci/crd-schemas/
|
||||
generate-schemas:
|
||||
@ci/generate-crd-schemas.sh
|
||||
|
||||
# Clean all generated manifests
|
||||
clean:
|
||||
@rm -rf manifests/
|
||||
|
||||
@@ -6,6 +6,7 @@ remotes:
|
||||
immutable_patterns:
|
||||
- "^cloudnative-pg/cloudnative-pg"
|
||||
- "^emberstack/helm-charts"
|
||||
- "^open-webui/open-webui"
|
||||
- "^openvoxproject/"
|
||||
- "^stakater/reloader"
|
||||
- "^stalwartlabs/stalwart"
|
||||
|
||||
@@ -36,6 +36,7 @@ remotes:
|
||||
- "neovim/neovim/.*/nvim-linux-x86_64.tar.gz$"
|
||||
- "nzbgetcom/nzbget/.*/nzbget-.*.x86_64.rpm$"
|
||||
- "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-nomad_linux_amd64_.*.tar.gz$"
|
||||
- "prometheus-community/bind_exporter/.*/bind_exporter-.*.linux-amd64.tar.gz$"
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
# kanidm
|
||||
|
||||
Single-replica kanidm identity server deployment.
|
||||
|
||||
## Initial setup
|
||||
|
||||
After the pod starts for the first time, generate the admin and idm_admin credentials:
|
||||
|
||||
```bash
|
||||
kubectl exec -n kanidm kanidm-0 -- /sbin/kanidmd recover-account admin
|
||||
kubectl exec -n kanidm kanidm-0 -- /sbin/kanidmd recover-account idm_admin
|
||||
```
|
||||
|
||||
## Adding replication
|
||||
|
||||
If replication is needed in the future:
|
||||
|
||||
1. Scale the StatefulSet to 3 replicas and add `podAntiAffinity` to spread across nodes.
|
||||
2. Add a `[replication]` section to `configmap.yaml` per pod (origin is pod-specific:
|
||||
`repl://kanidm-N.kanidm-headless.kanidm.svc.cluster.local:8444`).
|
||||
3. Add the replication port (8444) back to the StatefulSet container ports and headless service.
|
||||
4. Restore `rbac.yaml` for the cert-publisher sidecar, or exchange certificates manually:
|
||||
|
||||
```bash
|
||||
# On each pod, get its replication certificate
|
||||
kubectl exec -n kanidm kanidm-0 -- /sbin/kanidmd renew-replication-certificate
|
||||
|
||||
# Add each peer's certificate to the other pods' configs under:
|
||||
# [replication."repl://<peer-fqdn>:8444"]
|
||||
# type = "mutual-pull"
|
||||
# partner_cert = "<cert>"
|
||||
```
|
||||
@@ -1,40 +0,0 @@
|
||||
---
|
||||
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,12 +5,23 @@ kind: Kustomization
|
||||
resources:
|
||||
- namespace.yaml
|
||||
- serviceaccount.yaml
|
||||
- rbac.yaml
|
||||
- certificate.yaml
|
||||
- configmap.yaml
|
||||
- service.yaml
|
||||
- statefulset.yaml
|
||||
- poddisruptionbudget.yaml
|
||||
- gateway.yaml
|
||||
- httproute.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
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
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"
|
||||
|
||||
[replication."repl://kanidm-1.kanidm-headless.kanidm.svc.cluster.local:8444"]
|
||||
type = "mutual-pull"
|
||||
partner_cert = "MIIB-TCCAZ-gAwIBAgIRASqOpORz60wiv7wF_7oBOxQwCgYIKoZIzj0EAwIwTDEtMCsGA1UEAwwkMmE4ZWE0ZTQtNzNlYi00YzIyLWJmYmMtMDVmZmJhMDEzYjE0MRswGQYDVQQKDBJLYW5pZG0gUmVwbGljYXRpb24wHhcNMjYwNTI1MTMyODM5WhcNMzAwNTI1MTMyODM5WjBMMS0wKwYDVQQDDCQyYThlYTRlNC03M2ViLTRjMjItYmZiYy0wNWZmYmEwMTNiMTQxGzAZBgNVBAoMEkthbmlkbSBSZXBsaWNhdGlvbjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABFQP3zpFRt7TCOhzrUpOJBojn-sC2LmqZUub8P2ymVdIQbmoAyh4Q8Me0hNWJFyuFDnnqO06dt5I2iv0910-X6KjYjBgMCAGA1UdJQEB_wQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATA8BgNVHREENTAzgjFrYW5pZG0tMS5rYW5pZG0taGVhZGxlc3Mua2FuaWRtLnN2Yy5jbHVzdGVyLmxvY2FsMAoGCCqGSM49BAMCA0gAMEUCIGjl58U6apcDjMEPIca8Wwg_JMfuMvV-uVcJI49Gl_9GAiEA2tFdb9rnFeBI7mwysScf5UsmY3ZziMD3UVm1vWN2IKs"
|
||||
|
||||
[replication."repl://kanidm-2.kanidm-headless.kanidm.svc.cluster.local:8444"]
|
||||
type = "mutual-pull"
|
||||
partner_cert = "MIIB-TCCAZ-gAwIBAgIRAeFGUAJbCkJ2vzf_Vv4qjeUwCgYIKoZIzj0EAwIwTDEtMCsGA1UEAwwkZTE0NjUwMDItNWIwYS00Mjc2LWJmMzctZmY1NmZlMmE4ZGU1MRswGQYDVQQKDBJLYW5pZG0gUmVwbGljYXRpb24wHhcNMjYwNTI1MTMyOTEwWhcNMzAwNTI1MTMyOTEwWjBMMS0wKwYDVQQDDCRlMTQ2NTAwMi01YjBhLTQyNzYtYmYzNy1mZjU2ZmUyYThkZTUxGzAZBgNVBAoMEkthbmlkbSBSZXBsaWNhdGlvbjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCrncHSbDNSV3_aOSZ14plbVfrvSXQQL9MOqvrDKlf_Q6WbcA8OrTUjs3Jt0Q2beWjC3Z5-5c9fGu8M_k2iVWf-jYjBgMCAGA1UdJQEB_wQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATA8BgNVHREENTAzgjFrYW5pZG0tMi5rYW5pZG0taGVhZGxlc3Mua2FuaWRtLnN2Yy5jbHVzdGVyLmxvY2FsMAoGCCqGSM49BAMCA0gAMEUCIQDHY5Yl-bhDTuJaYnHSMSiSAEWPrDcRVzvfmOJukuJ1QQIgSwgyeSG3K0MY87DI1RDYAdZlpP1YOK3Yatj7-YSXPC0"
|
||||
@@ -0,0 +1,27 @@
|
||||
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"
|
||||
|
||||
[replication."repl://kanidm-0.kanidm-headless.kanidm.svc.cluster.local:8444"]
|
||||
type = "mutual-pull"
|
||||
partner_cert = "MIIB-jCCAZ-gAwIBAgIRAVKuoPDpF0IBnvFjCwdK41EwCgYIKoZIzj0EAwIwTDEtMCsGA1UEAwwkNTJhZWEwZjAtZTkxNy00MjAxLTllZjEtNjMwYjA3NGFlMzUxMRswGQYDVQQKDBJLYW5pZG0gUmVwbGljYXRpb24wHhcNMjYwNTI1MTMzNzQ5WhcNMzAwNTI1MTMzNzQ5WjBMMS0wKwYDVQQDDCQ1MmFlYTBmMC1lOTE3LTQyMDEtOWVmMS02MzBiMDc0YWUzNTExGzAZBgNVBAoMEkthbmlkbSBSZXBsaWNhdGlvbjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGejqjk0Eet-RILHI236wHYqISdnPlebqnkuUTh4W2mCzkmqKibyjxGIUOs8LBrUeTR2DxVR1VV6H2rYQk2wdROjYjBgMCAGA1UdJQEB_wQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATA8BgNVHREENTAzgjFrYW5pZG0tMC5rYW5pZG0taGVhZGxlc3Mua2FuaWRtLnN2Yy5jbHVzdGVyLmxvY2FsMAoGCCqGSM49BAMCA0kAMEYCIQCSkFj2A-KVWv2tKJLFzb18J5eWWKtsvWewZTn-FVnRnQIhAKJbt84IoZ9oXxgfp0VOLyVZiAgUgwMFS6JOfno3D-Nw"
|
||||
|
||||
[replication."repl://kanidm-2.kanidm-headless.kanidm.svc.cluster.local:8444"]
|
||||
type = "mutual-pull"
|
||||
partner_cert = "MIIB-TCCAZ-gAwIBAgIRAeFGUAJbCkJ2vzf_Vv4qjeUwCgYIKoZIzj0EAwIwTDEtMCsGA1UEAwwkZTE0NjUwMDItNWIwYS00Mjc2LWJmMzctZmY1NmZlMmE4ZGU1MRswGQYDVQQKDBJLYW5pZG0gUmVwbGljYXRpb24wHhcNMjYwNTI1MTMyOTEwWhcNMzAwNTI1MTMyOTEwWjBMMS0wKwYDVQQDDCRlMTQ2NTAwMi01YjBhLTQyNzYtYmYzNy1mZjU2ZmUyYThkZTUxGzAZBgNVBAoMEkthbmlkbSBSZXBsaWNhdGlvbjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCrncHSbDNSV3_aOSZ14plbVfrvSXQQL9MOqvrDKlf_Q6WbcA8OrTUjs3Jt0Q2beWjC3Z5-5c9fGu8M_k2iVWf-jYjBgMCAGA1UdJQEB_wQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATA8BgNVHREENTAzgjFrYW5pZG0tMi5rYW5pZG0taGVhZGxlc3Mua2FuaWRtLnN2Yy5jbHVzdGVyLmxvY2FsMAoGCCqGSM49BAMCA0gAMEUCIQDHY5Yl-bhDTuJaYnHSMSiSAEWPrDcRVzvfmOJukuJ1QQIgSwgyeSG3K0MY87DI1RDYAdZlpP1YOK3Yatj7-YSXPC0"
|
||||
@@ -0,0 +1,27 @@
|
||||
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"
|
||||
|
||||
[replication."repl://kanidm-0.kanidm-headless.kanidm.svc.cluster.local:8444"]
|
||||
type = "mutual-pull"
|
||||
partner_cert = "MIIB-jCCAZ-gAwIBAgIRAVKuoPDpF0IBnvFjCwdK41EwCgYIKoZIzj0EAwIwTDEtMCsGA1UEAwwkNTJhZWEwZjAtZTkxNy00MjAxLTllZjEtNjMwYjA3NGFlMzUxMRswGQYDVQQKDBJLYW5pZG0gUmVwbGljYXRpb24wHhcNMjYwNTI1MTMzNzQ5WhcNMzAwNTI1MTMzNzQ5WjBMMS0wKwYDVQQDDCQ1MmFlYTBmMC1lOTE3LTQyMDEtOWVmMS02MzBiMDc0YWUzNTExGzAZBgNVBAoMEkthbmlkbSBSZXBsaWNhdGlvbjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGejqjk0Eet-RILHI236wHYqISdnPlebqnkuUTh4W2mCzkmqKibyjxGIUOs8LBrUeTR2DxVR1VV6H2rYQk2wdROjYjBgMCAGA1UdJQEB_wQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATA8BgNVHREENTAzgjFrYW5pZG0tMC5rYW5pZG0taGVhZGxlc3Mua2FuaWRtLnN2Yy5jbHVzdGVyLmxvY2FsMAoGCCqGSM49BAMCA0kAMEYCIQCSkFj2A-KVWv2tKJLFzb18J5eWWKtsvWewZTn-FVnRnQIhAKJbt84IoZ9oXxgfp0VOLyVZiAgUgwMFS6JOfno3D-Nw"
|
||||
|
||||
[replication."repl://kanidm-1.kanidm-headless.kanidm.svc.cluster.local:8444"]
|
||||
type = "mutual-pull"
|
||||
partner_cert = "MIIB-TCCAZ-gAwIBAgIRASqOpORz60wiv7wF_7oBOxQwCgYIKoZIzj0EAwIwTDEtMCsGA1UEAwwkMmE4ZWE0ZTQtNzNlYi00YzIyLWJmYmMtMDVmZmJhMDEzYjE0MRswGQYDVQQKDBJLYW5pZG0gUmVwbGljYXRpb24wHhcNMjYwNTI1MTMyODM5WhcNMzAwNTI1MTMyODM5WjBMMS0wKwYDVQQDDCQyYThlYTRlNC03M2ViLTRjMjItYmZiYy0wNWZmYmEwMTNiMTQxGzAZBgNVBAoMEkthbmlkbSBSZXBsaWNhdGlvbjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABFQP3zpFRt7TCOhzrUpOJBojn-sC2LmqZUub8P2ymVdIQbmoAyh4Q8Me0hNWJFyuFDnnqO06dt5I2iv0910-X6KjYjBgMCAGA1UdJQEB_wQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATA8BgNVHREENTAzgjFrYW5pZG0tMS5rYW5pZG0taGVhZGxlc3Mua2FuaWRtLnN2Yy5jbHVzdGVyLmxvY2FsMAoGCCqGSM49BAMCA0gAMEUCIGjl58U6apcDjMEPIca8Wwg_JMfuMvV-uVcJI49Gl_9GAiEA2tFdb9rnFeBI7mwysScf5UsmY3ZziMD3UVm1vWN2IKs"
|
||||
@@ -36,24 +36,10 @@ spec:
|
||||
fsGroup: 1000
|
||||
initContainers:
|
||||
- name: config-init
|
||||
image: kanidm/server:1.10.3
|
||||
image: busybox:1.36
|
||||
command: ["/bin/sh", "-c"]
|
||||
args:
|
||||
- |
|
||||
set -e
|
||||
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
|
||||
if [ "${peer}" = "${POD_NAME}" ]; then
|
||||
continue
|
||||
fi
|
||||
cert_file="/repl-certs/${peer}"
|
||||
if [ -s "${cert_file}" ]; then
|
||||
fqdn="${peer}.kanidm-headless.kanidm.svc.cluster.local"
|
||||
printf '\n[replication."repl://%s:8444"]\ntype = "mutual-pull"\npartner_cert = "%s"\n' \
|
||||
"${fqdn}" "$(cat ${cert_file})" >> /config/server.toml
|
||||
fi
|
||||
done
|
||||
- cp "/config-template/server-${POD_NAME##*-}.toml" /config/server.toml
|
||||
env:
|
||||
- name: POD_NAME
|
||||
valueFrom:
|
||||
@@ -62,41 +48,12 @@ spec:
|
||||
volumeMounts:
|
||||
- name: config-template
|
||||
mountPath: /config-template
|
||||
readOnly: true
|
||||
- name: config
|
||||
mountPath: /config
|
||||
- name: repl-certs
|
||||
mountPath: /repl-certs
|
||||
readOnly: true
|
||||
securityContext:
|
||||
allowPrivilegeEscalation: false
|
||||
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:
|
||||
- name: kanidm
|
||||
image: kanidm/server:1.10.3
|
||||
@@ -144,9 +101,6 @@ spec:
|
||||
name: kanidm-config
|
||||
- name: config
|
||||
emptyDir: {}
|
||||
- name: repl-certs
|
||||
configMap:
|
||||
name: kanidm-repl-certs
|
||||
- name: tls
|
||||
secret:
|
||||
secretName: kanidm-tls
|
||||
|
||||
@@ -13,9 +13,14 @@ spec:
|
||||
- auth.unkin.net
|
||||
- au.auth.unkin.net
|
||||
parentRefs:
|
||||
- name: kanidm
|
||||
- group: gateway.networking.k8s.io
|
||||
kind: Gateway
|
||||
name: kanidm
|
||||
sectionName: https-passthrough
|
||||
rules:
|
||||
- backendRefs:
|
||||
- name: kanidm
|
||||
- group: ""
|
||||
kind: Service
|
||||
name: kanidm
|
||||
port: 8443
|
||||
weight: 1
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
---
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
|
||||
resources:
|
||||
- priorityclasses.yaml
|
||||
@@ -0,0 +1,36 @@
|
||||
---
|
||||
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."
|
||||
@@ -9,7 +9,6 @@ metadata:
|
||||
name: puppetdb
|
||||
namespace: puppet
|
||||
spec:
|
||||
clusterIP: null
|
||||
ports:
|
||||
- name: pdb-http
|
||||
port: 8080
|
||||
|
||||
@@ -6,3 +6,4 @@ resources:
|
||||
- namespace.yaml
|
||||
- gateway.yaml
|
||||
- httproute.yaml
|
||||
- role_k8s-service-registration.yaml
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
---
|
||||
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
|
||||
limits:
|
||||
memory: 2Gi
|
||||
cpu: 1000m
|
||||
cpu: "1"
|
||||
|
||||
client:
|
||||
enabled: false
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
---
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
|
||||
resources:
|
||||
- ../../../base/priority-classes
|
||||
@@ -40,9 +40,7 @@ server:
|
||||
}
|
||||
}
|
||||
|
||||
service_registration "consul" {
|
||||
address = "consul-server.consul.svc.cluster.local:8500"
|
||||
}
|
||||
service_registration "kubernetes" {}
|
||||
|
||||
dataStorage:
|
||||
enabled: true
|
||||
@@ -50,6 +48,14 @@ server:
|
||||
storageClass: cephrbd-fast-delete
|
||||
accessMode: ReadWriteOnce
|
||||
|
||||
extraEnv:
|
||||
- name: VAULT_K8S_NAMESPACE
|
||||
value: vault
|
||||
- name: VAULT_K8S_POD_NAME
|
||||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: metadata.name
|
||||
|
||||
statefulSet:
|
||||
securityContext:
|
||||
container:
|
||||
|
||||
@@ -2,6 +2,7 @@ agent:
|
||||
replicaCount: 3
|
||||
env:
|
||||
WOODPECKER_MAX_WORKFLOWS: "8"
|
||||
WOODPECKER_BACKEND_K8S_PRIORITY_CLASS: power
|
||||
WOODPECKER_BACKEND_K8S_STORAGE_CLASS: cephrbd-fast-delete
|
||||
WOODPECKER_BACKEND_K8S_VOLUME_SIZE: 10G
|
||||
WOODPECKER_BACKEND_K8S_STORAGE_RWX: false
|
||||
|
||||
@@ -22,6 +22,7 @@ spec:
|
||||
- path: apps/overlays/*/jfrog
|
||||
- path: apps/overlays/*/kanidm
|
||||
- path: apps/overlays/*/node-feature-discovery
|
||||
- path: apps/overlays/*/priority-classes
|
||||
- path: apps/overlays/*/puppet
|
||||
- path: apps/overlays/*/purelb
|
||||
- path: apps/overlays/*/reflector-system
|
||||
|
||||
@@ -31,6 +31,8 @@ spec:
|
||||
server: https://kubernetes.default.svc
|
||||
- namespace: 'node-feature-discovery'
|
||||
server: https://kubernetes.default.svc
|
||||
- namespace: 'priority-classes'
|
||||
server: https://kubernetes.default.svc
|
||||
- namespace: 'purelb'
|
||||
server: https://kubernetes.default.svc
|
||||
- namespace: 'puppet'
|
||||
|
||||
Executable
+49
@@ -0,0 +1,49 @@
|
||||
#!/usr/bin/env -S uv run
|
||||
# /// script
|
||||
# requires-python = ">=3.11"
|
||||
# dependencies = ["pyyaml"]
|
||||
# ///
|
||||
"""
|
||||
Extract OpenAPI v3 schemas from CRD YAML on stdin and write JSON schema files
|
||||
to the output directory for use with kubeconform.
|
||||
|
||||
Usage: kustomize build ... | ci/generate-crd-schemas.py <output-dir>
|
||||
"""
|
||||
import sys
|
||||
import json
|
||||
import os
|
||||
|
||||
import yaml
|
||||
|
||||
|
||||
def main() -> int:
|
||||
output_dir = sys.argv[1] if len(sys.argv) > 1 else "ci/crd-schemas"
|
||||
count = 0
|
||||
|
||||
for doc in yaml.safe_load_all(sys.stdin):
|
||||
if not doc or doc.get("kind") != "CustomResourceDefinition":
|
||||
continue
|
||||
|
||||
group = doc["spec"]["group"]
|
||||
kind = doc["spec"]["names"]["kind"]
|
||||
group_dir = os.path.join(output_dir, group)
|
||||
os.makedirs(group_dir, exist_ok=True)
|
||||
|
||||
for ver in doc["spec"].get("versions", []):
|
||||
if not ver.get("served", True):
|
||||
continue
|
||||
schema = ver.get("schema", {}).get("openAPIV3Schema")
|
||||
if not schema:
|
||||
continue
|
||||
fname = os.path.join(group_dir, f"{kind.lower()}_{ver['name']}.json")
|
||||
with open(fname, "w") as f:
|
||||
json.dump({"$schema": "http://json-schema.org/schema#", **schema}, f, indent=2)
|
||||
f.write("\n")
|
||||
print(f" wrote {fname}", file=sys.stderr)
|
||||
count += 1
|
||||
|
||||
return count
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
print(main())
|
||||
Executable
+23
@@ -0,0 +1,23 @@
|
||||
#!/usr/bin/env bash
|
||||
# Extract OpenAPI v3 schemas from CRD definitions in all kustomize overlays
|
||||
# and write JSON schema files to ci/crd-schemas/ for kubeconform validation.
|
||||
#
|
||||
# Run this script whenever CRD versions change, then commit the output.
|
||||
# Usage: ci/generate-crd-schemas.sh [output-dir]
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
OUTPUT_DIR="${1:-${SCRIPT_DIR}/crd-schemas}"
|
||||
mkdir -p "$OUTPUT_DIR"
|
||||
|
||||
total=0
|
||||
|
||||
while IFS= read -r -d "" k; do
|
||||
dir="$(dirname "$k")"
|
||||
n=$(kustomize build --enable-helm "$dir" 2>/dev/null \
|
||||
| "$SCRIPT_DIR/generate-crd-schemas.py" "$OUTPUT_DIR") || continue
|
||||
total=$((total + n))
|
||||
done < <(find apps/overlays clusters -name kustomization.yaml -print0 | sort -z)
|
||||
|
||||
echo "Generated ${total} schema(s) in ${OUTPUT_DIR}" >&2
|
||||
+2
-1
@@ -6,6 +6,7 @@ KUBE_VERSION="1.33.7"
|
||||
schema_args=(
|
||||
-schema-location "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/{{.NormalizedKubernetesVersion}}-standalone{{.StrictSuffix}}/{{.ResourceKind}}{{.KindSuffix}}.json"
|
||||
-schema-location "https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/{{.Group}}/{{.ResourceKind}}_{{.ResourceAPIVersion}}.json"
|
||||
-schema-location "file://${PWD}/ci/crd-schemas/{{.Group}}/{{.ResourceKind}}_{{.ResourceAPIVersion}}.json"
|
||||
)
|
||||
|
||||
while IFS= read -r -d "" k; do
|
||||
@@ -18,6 +19,6 @@ while IFS= read -r -d "" k; do
|
||||
-summary \
|
||||
-output pretty \
|
||||
-verbose \
|
||||
-skip CustomResourceDefinition,GpuDevicePlugin,LBNodeAgent,ServiceGroup \
|
||||
-skip GpuDevicePlugin,LBNodeAgent,ServiceGroup \
|
||||
"${schema_args[@]}"
|
||||
done < <(find apps/overlays -name kustomization.yaml -print0)
|
||||
|
||||
@@ -6,6 +6,7 @@ KUBE_VERSION="1.33.7"
|
||||
schema_args=(
|
||||
-schema-location "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/{{.NormalizedKubernetesVersion}}-standalone{{.StrictSuffix}}/{{.ResourceKind}}{{.KindSuffix}}.json"
|
||||
-schema-location "https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/{{.Group}}/{{.ResourceKind}}_{{.ResourceAPIVersion}}.json"
|
||||
-schema-location "file://${PWD}/ci/crd-schemas/{{.Group}}/{{.ResourceKind}}_{{.ResourceAPIVersion}}.json"
|
||||
)
|
||||
|
||||
while IFS= read -r -d "" k; do
|
||||
|
||||
Reference in New Issue
Block a user