summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
0e93643)
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I74261208e6e75fd369254c3686ac91e0611eafa5
sops --decrypt --in-place --config=${site_dir}/.sops.yaml ${site_yaml}
}
sops --decrypt --in-place --config=${site_dir}/.sops.yaml ${site_yaml}
}
+function flux_site_source_name {
+ local -r url=$1
+ local -r branch=$2
+ echo $(basename ${url})-${branch}
+}
+
+function flux_site_kustomization_name {
+ local -r url=$1
+ local -r branch=$2
+ local -r path=$3
+ echo $(flux_site_source_name ${url} ${branch})-site-$(basename ${path})
+}
+
function flux_create_site {
local -r url=$1
local -r branch=$2
local -r path=$3
local -r key_name=$4
function flux_create_site {
local -r url=$1
local -r branch=$2
local -r path=$3
local -r key_name=$4
- local -r source_name="$(basename ${url})-${branch}"
- local -r kustomization_name="${source_name}-site-$(basename ${path})"
+ local -r source_name=$(flux_site_source_name ${url} ${branch})
+ local -r kustomization_name=$(flux_site_kustomization_name ${url} ${branch} ${path})
local -r key_fp=$(gpg --with-colons --list-secret-keys ${key_name} | awk -F: '/fpr/ {print $10;exit}')
local -r secret_name="${key_name}-sops-gpg"
local -r key_fp=$(gpg --with-colons --list-secret-keys ${key_name} | awk -F: '/fpr/ {print $10;exit}')
local -r secret_name="${key_name}-sops-gpg"
BUILDDIR=${SCRIPTDIR/deploy/build}
mkdir -p ${BUILDDIR}
BUILDDIR=${SCRIPTDIR/deploy/build}
mkdir -p ${BUILDDIR}
+SITE_REPO=${SITE_REPO:-"https://gerrit.akraino.org/r/icn"}
+SITE_BRANCH=${SITE_BRANCH:-"master"}
+SITE_PATH=${SITE_PATH:-"deploy/site/pod11"}
+
FLUX_SOPS_KEY_NAME=${FLUX_SOPS_KEY_NAME:-"icn-site-vm"} # TODO Replace ICN test key with real key
function build_source {
FLUX_SOPS_KEY_NAME=${FLUX_SOPS_KEY_NAME:-"icn-site-vm"} # TODO Replace ICN test key with real key
function build_source {
- flux_create_site https://gerrit.akraino.org/r/icn master deploy/site/pod11 ${FLUX_SOPS_KEY_NAME}
+ flux_create_site ${SITE_REPO} ${SITE_BRANCH} ${SITE_PATH} ${FLUX_SOPS_KEY_NAME}
- kubectl -n flux-system delete kustomization icn-master-site-pod11
+ kubectl -n flux-system delete kustomization $(flux_site_kustomization_name ${SITE_REPO} ${SITE_BRANCH} ${SITE_PATH})
}
function is_cluster_ready {
}
function is_cluster_ready {
BUILDDIR=${SCRIPTDIR/deploy/build}
mkdir -p ${BUILDDIR}
BUILDDIR=${SCRIPTDIR/deploy/build}
mkdir -p ${BUILDDIR}
+SITE_REPO=${SITE_REPO:-"https://gerrit.akraino.org/r/icn"}
+SITE_BRANCH=${SITE_BRANCH:-"master"}
+SITE_PATH=${SITE_PATH:-"deploy/site/vm"}
+
FLUX_SOPS_KEY_NAME=${FLUX_SOPS_KEY_NAME:-"icn-site-vm"}
# !!!NOTE!!! THE KEYS USED BELOW ARE FOR TEST PURPOSES ONLY. DO NOT
FLUX_SOPS_KEY_NAME=${FLUX_SOPS_KEY_NAME:-"icn-site-vm"}
# !!!NOTE!!! THE KEYS USED BELOW ARE FOR TEST PURPOSES ONLY. DO NOT
function deploy {
gpg --import ${SCRIPTDIR}/sops.asc
function deploy {
gpg --import ${SCRIPTDIR}/sops.asc
- flux_create_site https://gerrit.akraino.org/r/icn master deploy/site/vm ${FLUX_SOPS_KEY_NAME}
+ flux_create_site ${SITE_REPO} ${SITE_BRANCH} ${SITE_PATH} ${FLUX_SOPS_KEY_NAME}
- kubectl -n flux-system delete kustomization icn-master-site-vm
+ kubectl -n flux-system delete kustomization $(flux_site_kustomization_name ${SITE_REPO} ${SITE_BRANCH} ${SITE_PATH})
}
function is_cluster_ready {
}
function is_cluster_ready {