Stéphane Tailland
3c5025ee52
The gateway and policies Kustomizations sat in flux-system, and so did the Secret carrying the control-plane id. Neither was a governance decision: postBuild.substituteFrom resolves only in the Kustomization's own namespace, dataplane-template-defaults existed only in flux-system, so everything that needed it had to live there too — in a namespace the feature team has no access to. The team could not touch its own gateway. k8s-platform now places that ConfigMap in every domain namespace, so the constraint is gone. Move both Kustomizations and the control-plane ExternalSecret to catalog. The id no longer transits a shared namespace either, which was a compromise this repo documented rather than liked. Adds the GitRepository this repo never had — its Kustomizations point at k8s-platform for templates, and nothing needed to read the repo that declares them, because those declarations were applied by hand. It reuses the domain's existing deploy key rather than minting one; verified that the key reads this repository. Worth knowing what that implies: the key is not scoped to a single repo, so the isolation its per-repo name suggests does not exist. And the bootstrap Kustomization that watches ./dev/api-gateway, so all of it reconciles from git from now on. Migration is not a patch: a namespace is immutable, so the existing objects have to be deleted and recreated. Deleting a Kustomization with prune enabled would take its Gateway, GatewayConfiguration and mirror CR with it, so prune has to be turned off on the old objects first, then the new ones adopt what is already running. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
40 lines
1.6 KiB
YAML
40 lines
1.6 KiB
YAML
# Moved out of flux-system with the Kustomization that reads it. It only ever
|
|
# lived there because postBuild.substituteFrom resolves in the Kustomization's
|
|
# own namespace, and that Kustomization had to be in flux-system to reach
|
|
# dataplane-template-defaults. Both now sit in the domain namespace, so the
|
|
# control-plane id no longer transits a shared namespace at all.
|
|
# The Control Plane id, delivered to flux-system so gateway-kustomization.yaml
|
|
# can substitute it instead of carrying a hardcoded UUID.
|
|
#
|
|
# Why a second ExternalSecret rather than extra keys on the existing one:
|
|
# substituteFrom requires the Secret to sit in the same namespace as the Flux
|
|
# Kustomization, which is flux-system — a shared, broadly-readable namespace.
|
|
# The Konnect token must never go there. A Control Plane id is not a secret;
|
|
# it is visible in the Konnect UI URL.
|
|
#
|
|
# Terraform writes this path (see konnect-platform). Moving to a new Konnect
|
|
# org then needs no edit here at all.
|
|
apiVersion: external-secrets.io/v1
|
|
kind: ExternalSecret
|
|
metadata:
|
|
name: catalog-dev-control-plane
|
|
namespace: catalog
|
|
spec:
|
|
refreshInterval: 1h
|
|
secretStoreRef:
|
|
kind: ClusterSecretStore
|
|
name: vault-kong-v2
|
|
target:
|
|
name: catalog-dev-control-plane
|
|
data:
|
|
# Key names are the Flux substitution variables verbatim: substituteFrom
|
|
# exposes each key as ${KEY}.
|
|
- secretKey: CONTROL_PLANE_ID
|
|
remoteRef:
|
|
key: kong-v2/catalog/dev/control-plane
|
|
property: CONTROL_PLANE_ID
|
|
- secretKey: CONTROL_PLANE_NAME
|
|
remoteRef:
|
|
key: kong-v2/catalog/dev/control-plane
|
|
property: CONTROL_PLANE_NAME
|