Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d9ea57a8e0 | |||
| 90a18e5ff9 | |||
| 4b1fbe1fe1 | |||
| 666f3d055c | |||
| 3dc8801070 | |||
| 60f1f3130b | |||
| b6f8cb0633 | |||
| f11ec1056d | |||
| ed7feaf19a | |||
| 4d594fbde7 |
@@ -1,3 +1,2 @@
|
|||||||
manifests/
|
manifests/
|
||||||
apps/**/charts/
|
apps/**/charts/
|
||||||
ci/crd-schemas/
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ repos:
|
|||||||
- id: check-executables-have-shebangs
|
- id: check-executables-have-shebangs
|
||||||
- id: check-json
|
- id: check-json
|
||||||
- id: check-added-large-files
|
- id: check-added-large-files
|
||||||
args: ['--maxkb=2048']
|
args: ['--maxkb=500']
|
||||||
- id: check-merge-conflict
|
- id: check-merge-conflict
|
||||||
- id: check-shebang-scripts-are-executable
|
- id: check-shebang-scripts-are-executable
|
||||||
- id: check-symlinks
|
- id: check-symlinks
|
||||||
|
|||||||
@@ -2,21 +2,6 @@ when:
|
|||||||
- event: pull_request
|
- event: pull_request
|
||||||
|
|
||||||
steps:
|
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
|
- name: kubeconform
|
||||||
image: git.unkin.net/unkin/almalinux9-kubetest:20260319
|
image: git.unkin.net/unkin/almalinux9-kubetest:20260319
|
||||||
commands:
|
commands:
|
||||||
|
|||||||
@@ -11,11 +11,6 @@ kubeconform:
|
|||||||
@ci/validate-apps.sh && \
|
@ci/validate-apps.sh && \
|
||||||
ci/validate-clusters.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 all generated manifests
|
||||||
clean:
|
clean:
|
||||||
@rm -rf manifests/
|
@rm -rf manifests/
|
||||||
|
|||||||
@@ -81,6 +81,8 @@ remotes:
|
|||||||
description: "Gitea download site"
|
description: "Gitea download site"
|
||||||
immutable_patterns:
|
immutable_patterns:
|
||||||
- "act_runner/.*/act_runner-.*-linux-amd64$"
|
- "act_runner/.*/act_runner-.*-linux-amd64$"
|
||||||
|
- "gitea/.*/gitea-.*-linux-amd64$"
|
||||||
|
- "gitea/.*/gitea-.*-linux-amd64.xz$"
|
||||||
- "tea/.*/tea-.*-linux-amd64$"
|
- "tea/.*/tea-.*-linux-amd64$"
|
||||||
cache:
|
cache:
|
||||||
immutable_ttl: 0
|
immutable_ttl: 0
|
||||||
|
|||||||
@@ -17,6 +17,24 @@ remotes:
|
|||||||
immutable_ttl: 0
|
immutable_ttl: 0
|
||||||
mutable_ttl: 7200
|
mutable_ttl: 7200
|
||||||
|
|
||||||
|
almalinux-vault:
|
||||||
|
base_url: "https://vault.almalinux.org"
|
||||||
|
package: "rpm"
|
||||||
|
description: "AlmaLinux Vault RPM package repository"
|
||||||
|
immutable_patterns:
|
||||||
|
- ".*/x86_64/.*\\.rpm$"
|
||||||
|
- ".*/noarch/.*\\.rpm$"
|
||||||
|
- ".*/repodata/.*\\.sqlite.*$"
|
||||||
|
- ".*/repodata/.*\\.xml.*$"
|
||||||
|
- ".*/repodata/.*\\.yaml.*$"
|
||||||
|
- ".*/install.img"
|
||||||
|
- ".*/squashfs.img"
|
||||||
|
- ".*/updates.img"
|
||||||
|
- ".*/RPM-GPG-KEY-.*$"
|
||||||
|
cache:
|
||||||
|
immutable_ttl: 0
|
||||||
|
mutable_ttl: 7200
|
||||||
|
|
||||||
ceph-reef:
|
ceph-reef:
|
||||||
base_url: "https://download.ceph.com/rpm-reef/"
|
base_url: "https://download.ceph.com/rpm-reef/"
|
||||||
package: "rpm"
|
package: "rpm"
|
||||||
|
|||||||
+37
-18
@@ -1,32 +1,51 @@
|
|||||||
# kanidm
|
# kanidm
|
||||||
|
|
||||||
Single-replica kanidm identity server deployment.
|
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
|
## Initial setup
|
||||||
|
|
||||||
After the pod starts for the first time, generate the admin and idm_admin credentials:
|
After the first pod starts, generate the admin credentials:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
kubectl exec -n kanidm kanidm-0 -- /sbin/kanidmd recover-account admin
|
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 idm_admin
|
kubectl exec -n kanidm kanidm-0 -- /sbin/kanidmd recover-account -c /config/server.toml idm_admin
|
||||||
```
|
```
|
||||||
|
|
||||||
## Adding replication
|
## Replication certificate rotation
|
||||||
|
|
||||||
If replication is needed in the future:
|
When certs need to be renewed, update vault and reloader will roll the StatefulSet:
|
||||||
|
|
||||||
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
|
```bash
|
||||||
# On each pod, get its replication certificate
|
# Get new cert from a pod
|
||||||
kubectl exec -n kanidm kanidm-0 -- /sbin/kanidmd renew-replication-certificate
|
kubectl exec -it -n kanidm kanidm-N -- /sbin/kanidmd renew-replication-certificate -c /config/server.toml
|
||||||
|
|
||||||
# Add each peer's certificate to the other pods' configs under:
|
# Write updated cert to vault (reloader triggers restart automatically)
|
||||||
# [replication."repl://<peer-fqdn>:8444"]
|
vault kv patch kv/kubernetes/namespace/kanidm/default/repl-certs "kanidm-N=<cert>"
|
||||||
# type = "mutual-pull"
|
```
|
||||||
# partner_cert = "<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
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ kind: Kustomization
|
|||||||
resources:
|
resources:
|
||||||
- namespace.yaml
|
- namespace.yaml
|
||||||
- serviceaccount.yaml
|
- serviceaccount.yaml
|
||||||
|
- vaultauth.yaml
|
||||||
|
- vaultstaticsecret.yaml
|
||||||
- certificate.yaml
|
- certificate.yaml
|
||||||
- service.yaml
|
- service.yaml
|
||||||
- statefulset.yaml
|
- statefulset.yaml
|
||||||
@@ -23,5 +25,3 @@ configMapGenerator:
|
|||||||
app.kubernetes.io/instance: kanidm
|
app.kubernetes.io/instance: kanidm
|
||||||
files:
|
files:
|
||||||
- server-0.toml=resources/server-0.toml
|
- server-0.toml=resources/server-0.toml
|
||||||
- server-1.toml=resources/server-1.toml
|
|
||||||
- server-2.toml=resources/server-2.toml
|
|
||||||
|
|||||||
@@ -13,15 +13,3 @@ log_level = "info"
|
|||||||
path = "/data/backups/"
|
path = "/data/backups/"
|
||||||
schedule = "0 22 * * *"
|
schedule = "0 22 * * *"
|
||||||
versions = 7
|
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"
|
|
||||||
|
|||||||
@@ -1,27 +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"
|
|
||||||
|
|
||||||
[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"
|
|
||||||
@@ -1,27 +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"
|
|
||||||
|
|
||||||
[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"
|
|
||||||
@@ -9,6 +9,10 @@ metadata:
|
|||||||
app.kubernetes.io/instance: kanidm
|
app.kubernetes.io/instance: kanidm
|
||||||
spec:
|
spec:
|
||||||
type: ClusterIP
|
type: ClusterIP
|
||||||
|
sessionAffinity: ClientIP
|
||||||
|
sessionAffinityConfig:
|
||||||
|
clientIP:
|
||||||
|
timeoutSeconds: 10800
|
||||||
ports:
|
ports:
|
||||||
- name: https
|
- name: https
|
||||||
port: 8443
|
port: 8443
|
||||||
@@ -34,10 +38,6 @@ spec:
|
|||||||
port: 8443
|
port: 8443
|
||||||
targetPort: https
|
targetPort: https
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
- name: replication
|
|
||||||
port: 8444
|
|
||||||
targetPort: replication
|
|
||||||
protocol: TCP
|
|
||||||
selector:
|
selector:
|
||||||
app.kubernetes.io/name: kanidm
|
app.kubernetes.io/name: kanidm
|
||||||
app.kubernetes.io/instance: kanidm
|
app.kubernetes.io/instance: kanidm
|
||||||
|
|||||||
@@ -4,12 +4,14 @@ 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
|
||||||
spec:
|
spec:
|
||||||
serviceName: kanidm-headless
|
serviceName: kanidm-headless
|
||||||
replicas: 3
|
replicas: 1
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app.kubernetes.io/name: kanidm
|
app.kubernetes.io/name: kanidm
|
||||||
@@ -21,39 +23,11 @@ spec:
|
|||||||
app.kubernetes.io/instance: kanidm
|
app.kubernetes.io/instance: kanidm
|
||||||
spec:
|
spec:
|
||||||
serviceAccountName: kanidm
|
serviceAccountName: kanidm
|
||||||
affinity:
|
|
||||||
podAntiAffinity:
|
|
||||||
requiredDuringSchedulingIgnoredDuringExecution:
|
|
||||||
- labelSelector:
|
|
||||||
matchLabels:
|
|
||||||
app.kubernetes.io/name: kanidm
|
|
||||||
app.kubernetes.io/instance: kanidm
|
|
||||||
topologyKey: kubernetes.io/hostname
|
|
||||||
securityContext:
|
securityContext:
|
||||||
runAsUser: 1000
|
runAsUser: 1000
|
||||||
runAsGroup: 1000
|
runAsGroup: 1000
|
||||||
runAsNonRoot: true
|
runAsNonRoot: true
|
||||||
fsGroup: 1000
|
fsGroup: 1000
|
||||||
initContainers:
|
|
||||||
- name: config-init
|
|
||||||
image: busybox:1.36
|
|
||||||
command: ["/bin/sh", "-c"]
|
|
||||||
args:
|
|
||||||
- cp "/config-template/server-${POD_NAME##*-}.toml" /config/server.toml
|
|
||||||
env:
|
|
||||||
- name: POD_NAME
|
|
||||||
valueFrom:
|
|
||||||
fieldRef:
|
|
||||||
fieldPath: metadata.name
|
|
||||||
volumeMounts:
|
|
||||||
- name: config-template
|
|
||||||
mountPath: /config-template
|
|
||||||
readOnly: true
|
|
||||||
- name: config
|
|
||||||
mountPath: /config
|
|
||||||
securityContext:
|
|
||||||
allowPrivilegeEscalation: false
|
|
||||||
readOnlyRootFilesystem: true
|
|
||||||
containers:
|
containers:
|
||||||
- name: kanidm
|
- name: kanidm
|
||||||
image: kanidm/server:1.10.3
|
image: kanidm/server:1.10.3
|
||||||
@@ -63,14 +37,12 @@ spec:
|
|||||||
- name: https
|
- name: https
|
||||||
containerPort: 8443
|
containerPort: 8443
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
- name: replication
|
|
||||||
containerPort: 8444
|
|
||||||
protocol: TCP
|
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: data
|
- name: data
|
||||||
mountPath: /data
|
mountPath: /data
|
||||||
- name: config
|
- name: config
|
||||||
mountPath: /config
|
mountPath: /config/server.toml
|
||||||
|
subPath: server-0.toml
|
||||||
readOnly: true
|
readOnly: true
|
||||||
- name: tls
|
- name: tls
|
||||||
mountPath: /data/tls
|
mountPath: /data/tls
|
||||||
@@ -96,11 +68,9 @@ spec:
|
|||||||
initialDelaySeconds: 30
|
initialDelaySeconds: 30
|
||||||
periodSeconds: 30
|
periodSeconds: 30
|
||||||
volumes:
|
volumes:
|
||||||
- name: config-template
|
- name: config
|
||||||
configMap:
|
configMap:
|
||||||
name: kanidm-config
|
name: kanidm-config
|
||||||
- name: config
|
|
||||||
emptyDir: {}
|
|
||||||
- name: tls
|
- name: tls
|
||||||
secret:
|
secret:
|
||||||
secretName: kanidm-tls
|
secretName: kanidm-tls
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
---
|
||||||
|
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
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
---
|
||||||
|
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
|
||||||
|
rolloutRestartTargets:
|
||||||
|
- kind: StatefulSet
|
||||||
|
name: kanidm
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
#!/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())
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
#!/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
|
|
||||||
+1
-2
@@ -6,7 +6,6 @@ KUBE_VERSION="1.33.7"
|
|||||||
schema_args=(
|
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/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 "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
|
while IFS= read -r -d "" k; do
|
||||||
@@ -19,6 +18,6 @@ while IFS= read -r -d "" k; do
|
|||||||
-summary \
|
-summary \
|
||||||
-output pretty \
|
-output pretty \
|
||||||
-verbose \
|
-verbose \
|
||||||
-skip GpuDevicePlugin,LBNodeAgent,ServiceGroup \
|
-skip CustomResourceDefinition,GpuDevicePlugin,LBNodeAgent,ServiceGroup \
|
||||||
"${schema_args[@]}"
|
"${schema_args[@]}"
|
||||||
done < <(find apps/overlays -name kustomization.yaml -print0)
|
done < <(find apps/overlays -name kustomization.yaml -print0)
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ KUBE_VERSION="1.33.7"
|
|||||||
schema_args=(
|
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/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 "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
|
while IFS= read -r -d "" k; do
|
||||||
|
|||||||
Reference in New Issue
Block a user