From 78e59af13b28dcde22c94bad014d4445c6f55dd2 Mon Sep 17 00:00:00 2001 From: Simon Weald Date: Sat, 1 Feb 2025 22:09:41 +0000 Subject: [PATCH] use quote var to wrap numbers --- .../cluster-prereqs/cluster-vars-configmap.yaml | 3 +++ .../patches/shared-patches/controlplane/machine-pods.yaml | 7 +------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/flux/clusters/room101-a7d-mc/cluster-prereqs/cluster-vars-configmap.yaml b/flux/clusters/room101-a7d-mc/cluster-prereqs/cluster-vars-configmap.yaml index c08ee27..48b2c9c 100644 --- a/flux/clusters/room101-a7d-mc/cluster-prereqs/cluster-vars-configmap.yaml +++ b/flux/clusters/room101-a7d-mc/cluster-prereqs/cluster-vars-configmap.yaml @@ -67,3 +67,6 @@ data: # apiserver OIDC config DEX_SUBDOMAIN: dex DEX_CLIENT_ID: 9aba9b32-e761-4507-8445-cea11a6b15da + + # flux hack (see https://fluxcd.io/flux/components/kustomize/kustomizations/#post-build-substitution-of-numbers-and-booleans) + quote: '"' # double quote var \ No newline at end of file diff --git a/flux/kubernetes/patches/shared-patches/controlplane/machine-pods.yaml b/flux/kubernetes/patches/shared-patches/controlplane/machine-pods.yaml index 3be75e5..3a378bc 100644 --- a/flux/kubernetes/patches/shared-patches/controlplane/machine-pods.yaml +++ b/flux/kubernetes/patches/shared-patches/controlplane/machine-pods.yaml @@ -40,12 +40,7 @@ fieldRef: fieldPath: status.podIP - name: bgp_as - value: "${BGP_CLUSTER_AS}" - - name: bgp_peeraddress - - name: bgp_peerpass - - name: bgp_peeras - value: "${BGP_PEER_AS}" - - name: bgp_peers + value: ${quote}${BGP_CLUSTER_AS}${quote} value: "${BGP_PEERS}" - name: address value: "${APISERVER_VIP}"