X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fcluster%2Fcluster.sh;h=101e7bd9a86f98ab373b5c869abe22ee424a0038;hb=d63ac9f8de3b8fdfc2f0d122354e2f6f0ac5a063;hp=f1571997db848b37931d605f8f4e1df533f07cd0;hpb=7a6bf66cfeaeaff0bea0bf2da6ffd3467e998492;p=icn.git

diff --git a/deploy/cluster/cluster.sh b/deploy/cluster/cluster.sh
index f157199..101e7bd 100755
--- a/deploy/cluster/cluster.sh
+++ b/deploy/cluster/cluster.sh
@@ -7,9 +7,6 @@ LIBDIR="$(dirname $(dirname ${SCRIPTDIR}))/env/lib"
 source $LIBDIR/logging.sh
 source $LIBDIR/common.sh
 
-CALICO_VERSION="v3.22.0"
-FLANNEL_VERSION="v0.15.0"
-
 function build_source_flannel {
     curl -sL https://raw.githubusercontent.com/coreos/flannel/${FLANNEL_VERSION}/Documentation/kube-flannel.yml -o ${SCRIPTDIR}/addons/flannel.yaml
     cat <<EOF >${SCRIPTDIR}/templates/flannel-addon.yaml
@@ -23,7 +20,12 @@ EOF
 }
 
 function build_source_flux {
-    flux install --export >${SCRIPTDIR}/addons/flux-system.yaml
+    # NOTE: This reaches outside this directory to
+    # deploy/site/cluster-addons/flux-system.  This is to ensure that
+    # the day-0 config of a cluster using deploy/site/cluster-addons
+    # is in sync with the chart.
+    flux install --export >${SCRIPTDIR}/../site/cluster-addons/flux-system/gotk-components.yaml
+    kustomize build ${SCRIPTDIR}/../site/cluster-addons/flux-system >${SCRIPTDIR}/addons/flux-system.yaml
     cat <<EOF >>${SCRIPTDIR}/addons/flux-system.yaml
 ---
 apiVersion: rbac.authorization.k8s.io/v1