diff --git a/Tiltfile b/Tiltfile index eb9a213b6..dee934f96 100644 --- a/Tiltfile +++ b/Tiltfile @@ -32,9 +32,7 @@ k8s_resource( k8s_attach("caaph-controller-manager", "deployment.apps/caaph-controller-manager", namespace="caaph-system") -# Linode CCM, necessary for provisioned self-managed k8s 1.29 clusters -# to correctly set internal and external IPs -k8s_yaml("./templates/addons/linode-cloud-controller-manager-helm.yaml") +k8s_yaml(local('./hack/generate-helmchart-proxies.sh', quiet=True, echo_off=True)) k8s_resource( new_name="addon-linode-cloud-controller-manager-helm", objects=[ @@ -42,9 +40,6 @@ k8s_resource( ], resource_deps=["capi-controller-manager", "cluster-api-provider-linode-controller-manager", "caaph-controller-manager"] ) - -# Linode Blockstorage CSI driver for storage on self-managed k8s clusters -k8s_yaml("./templates/addons/linode-blockstorage-csi-driver-helm.yaml") k8s_resource( new_name="addon-linode-blockstorage-csi-driver-helm", objects=[ diff --git a/hack/generate-helmchart-proxies.sh b/hack/generate-helmchart-proxies.sh new file mode 100755 index 000000000..1571aae81 --- /dev/null +++ b/hack/generate-helmchart-proxies.sh @@ -0,0 +1,4 @@ +#!/bin/bash +set -euo pipefail + +for f in templates/addons/linode-*.yaml; do envsubst < $f ; done diff --git a/templates/addons/linode-blockstorage-csi-driver-helm.yaml b/templates/addons/linode-blockstorage-csi-driver-helm.yaml index c851baaea..135bb4f16 100644 --- a/templates/addons/linode-blockstorage-csi-driver-helm.yaml +++ b/templates/addons/linode-blockstorage-csi-driver-helm.yaml @@ -18,3 +18,4 @@ spec: apiToken: ${LINODE_TOKEN} csiLinodePlugin: tag: v0.6.3 +--- diff --git a/templates/addons/linode-cloud-controller-manager-helm.yaml b/templates/addons/linode-cloud-controller-manager-helm.yaml index 26b3817c3..f6ed4e3c0 100644 --- a/templates/addons/linode-cloud-controller-manager-helm.yaml +++ b/templates/addons/linode-cloud-controller-manager-helm.yaml @@ -35,3 +35,4 @@ spec: - key: node.kubernetes.io/unreachable operator: Exists effect: NoSchedule +---