diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cffa2fd..15dbec2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,7 +81,7 @@ 'overlay-paths': | tests/fixtures/flux-render-good 'mode': 'strict' - 'crd-catalog-source': 'JorisJonkers-dev/platform-blueprints' + 'crd-catalog-source': 'JorisJonkers-dev/flux-modules' 'crd-catalog-ref': '${{ github.head_ref || github.ref_name }}' 'pipeline-complete': diff --git a/README.md b/README.md index acb5ace..7f056b2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# platform-blueprints +# flux-modules Reusable Kubernetes, Flux, storage, edge, CRD schema, backup, restore, and validation blueprints for JorisJonkers-dev platform repositories. @@ -16,7 +16,7 @@ may contain: - Documentation, examples, tests, CI, and release metadata for this artifact. Reusable host modules and Nix helpers live in -`JorisJonkers-dev/nix-platform`. Consumer repositories continue to own host +`JorisJonkers-dev/nixos-modules`. Consumer repositories continue to own host configuration, deploy nodes, inventories, secrets, app manifests, generated manifests, locks, and deployment workflows. @@ -110,7 +110,7 @@ List and dry-run a manifest-driven remote filesystem backup: ```bash scripts/backup/backup-service-state.sh \ --manifest examples/backup/manifest.tsv \ - --output-dir /tmp/platform-blueprints-backup \ + --output-dir /tmp/flux-modules-backup \ --dry-run ``` @@ -119,7 +119,7 @@ Capture service-native snapshot plugins declared by the consumer: ```bash scripts/backup/backup-service-snapshots.sh \ --plugins examples/backup/snapshot-plugins.tsv \ - --output-dir /tmp/platform-blueprints-snapshots \ + --output-dir /tmp/flux-modules-snapshots \ --dry-run ``` diff --git a/docs/strict-flux-render-validation.md b/docs/strict-flux-render-validation.md index e2ba924..a5f48e5 100644 --- a/docs/strict-flux-render-validation.md +++ b/docs/strict-flux-render-validation.md @@ -21,7 +21,7 @@ jobs: overlay-paths: | path/to/flux/overlay mode: strict - crd-catalog-source: JorisJonkers-dev/platform-blueprints + crd-catalog-source: JorisJonkers-dev/flux-modules crd-catalog-ref: v1.1.0 ``` diff --git a/release-please-config.json b/release-please-config.json index 63e4394..fac0fd7 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -3,7 +3,7 @@ "release-type": "simple", "packages": { ".": { - "package-name": "platform-blueprints", + "package-name": "flux-modules", "changelog-path": "CHANGELOG.md", "include-component-in-tag": false, "bump-minor-pre-major": true diff --git a/schemas/crds/README.md b/schemas/crds/README.md index 8b4255b..5a88453 100644 --- a/schemas/crds/README.md +++ b/schemas/crds/README.md @@ -1,7 +1,7 @@ # Pinned CRD Schema Catalog This catalog is the offline default used by `scripts/validate-flux-render.sh`. -It pins the CRD groups that platform-blueprints commonly emits so kubeconform +It pins the CRD groups that flux-modules commonly emits so kubeconform does not need to fetch CRD schemas during validation. Pin date: 2026-06-10 diff --git a/scripts/restore/restore-http-api-export.sh b/scripts/restore/restore-http-api-export.sh index 5ebf011..0f3c4d0 100755 --- a/scripts/restore/restore-http-api-export.sh +++ b/scripts/restore/restore-http-api-export.sh @@ -132,7 +132,7 @@ require_command "${KUBECTL}" require_command "${CURL}" "${KUBECTL}" get service -n "${NAMESPACE}" "${SERVICE}" >/dev/null -port_forward_log="$(mktemp "${TMPDIR:-/tmp}/platform-blueprints-port-forward.XXXXXX.log")" +port_forward_log="$(mktemp "${TMPDIR:-/tmp}/flux-modules-port-forward.XXXXXX.log")" cleanup() { if [[ -n "${PORT_FORWARD_PID:-}" ]]; then kill "${PORT_FORWARD_PID}" >/dev/null 2>&1 || true diff --git a/scripts/restore/restore-pvc-archive.sh b/scripts/restore/restore-pvc-archive.sh index 11de006..730aa63 100755 --- a/scripts/restore/restore-pvc-archive.sh +++ b/scripts/restore/restore-pvc-archive.sh @@ -48,7 +48,7 @@ metadata: name: ${POD_NAME} namespace: ${NAMESPACE} labels: - app.kubernetes.io/managed-by: platform-blueprints-restore-toolkit + app.kubernetes.io/managed-by: flux-modules-restore-toolkit spec: restartPolicy: Never containers: diff --git a/scripts/restore/restore-vault-raft-snapshot.sh b/scripts/restore/restore-vault-raft-snapshot.sh index 93c47ab..d783400 100755 --- a/scripts/restore/restore-vault-raft-snapshot.sh +++ b/scripts/restore/restore-vault-raft-snapshot.sh @@ -89,7 +89,7 @@ VAULT_TOKEN_VALUE="$(read_token)" echo "Restoring Vault raft snapshot from ${SNAPSHOT}" "${KUBECTL}" exec -i -n "${NAMESPACE}" -c "${CONTAINER_NAME}" "${POD_NAME}" -- \ env "VAULT_ADDR=${VAULT_ADDR}" "VAULT_TOKEN=${VAULT_TOKEN_VALUE}" \ - sh -ec 'cat >/tmp/platform-blueprints-vault-raft.snapshot && vault operator raft snapshot restore -force /tmp/platform-blueprints-vault-raft.snapshot && rm -f /tmp/platform-blueprints-vault-raft.snapshot' \ + sh -ec 'cat >/tmp/flux-modules-vault-raft.snapshot && vault operator raft snapshot restore -force /tmp/flux-modules-vault-raft.snapshot && rm -f /tmp/flux-modules-vault-raft.snapshot' \ < "${SNAPSHOT}" echo "Vault raft snapshot restore finished: ${NAMESPACE}/${POD_NAME}" diff --git a/scripts/validate-flux.sh b/scripts/validate-flux.sh index 4c1d6c6..e00ab67 100755 --- a/scripts/validate-flux.sh +++ b/scripts/validate-flux.sh @@ -178,7 +178,7 @@ if [[ "${enable_helm}" == "true" ]]; then fi fi -render_output="$(mktemp "${TMPDIR:-/tmp}/platform-blueprints-flux.XXXXXX.yaml")" +render_output="$(mktemp "${TMPDIR:-/tmp}/flux-modules-flux.XXXXXX.yaml")" trap 'rm -f "${render_output}"' EXIT echo "==> kustomize build ${cluster_path}" @@ -203,7 +203,7 @@ if [[ "${enable_helm}" == "true" ]]; then fi echo "==> drop non-resource documents before kubeconform" -stripped_output="$(mktemp "${TMPDIR:-/tmp}/platform-blueprints-flux-stripped.XXXXXX.yaml")" +stripped_output="$(mktemp "${TMPDIR:-/tmp}/flux-modules-flux-stripped.XXXXXX.yaml")" strip_non_resource_documents "${render_output}" "${stripped_output}" rm -f "${render_output}" render_output="${stripped_output}" diff --git a/scripts/validate-repository.sh b/scripts/validate-repository.sh index f9f2ad4..96466d0 100755 --- a/scripts/validate-repository.sh +++ b/scripts/validate-repository.sh @@ -221,7 +221,7 @@ check_legacy_brand_references() { check_output_names() { local output_name_regex - output_name_regex="platform-blueprints-platform""-blueprints|platform""Blueprints[.]platform""Blueprints" + output_name_regex="flux-modules-platform""-blueprints|platform""Blueprints[.]platform""Blueprints" if grep --line-number -R -E "${output_name_regex}" README.md docs scripts tests packs examples skeletons fixtures schemas .github; then record_failure "Found doubled platform marker in public outputs or docs" fi @@ -229,7 +229,7 @@ check_output_names() { check_vault_policy_compiler() { local tmpdir - tmpdir="$(mktemp -d "${TMPDIR:-/tmp}/platform-blueprints-vault.XXXXXX")" + tmpdir="$(mktemp -d "${TMPDIR:-/tmp}/flux-modules-vault.XXXXXX")" trap 'rm -rf "${tmpdir}"' RETURN python3 scripts/vault/compile-vault-bootstrap-policy.py \