X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=env%2Flib%2Fcommon.sh;h=2cd93d613c2cf1f455a718fa7a852af919578a2a;hb=e554714c7123d5f2244456cf9afed652933fe7b2;hp=07eb7f1b9ff14718ee11ba03dfdf87d787d69b4b;hpb=5d59b70e0f3321d52464cb0139ade79815b84c8c;p=icn.git

diff --git a/env/lib/common.sh b/env/lib/common.sh
index 07eb7f1..2cd93d6 100755
--- a/env/lib/common.sh
+++ b/env/lib/common.sh
@@ -15,40 +15,75 @@ BMOREPO="${BMOREPO:-https://github.com/metal3-io/baremetal-operator.git}"
 #Path to clone the baremetal operator repo
 BMOPATH="/opt/src/github.com/metal3-io/baremetal-operator"
 #Bare Metal Operator version to use
-BMO_VERSION="capm3-v0.5.1"
+#  If changing this, the value in deploy/ironic/icn/kustomization.yaml
+#  must also be changed
+BMO_VERSION="capm3-v0.5.4"
 
 #KuD repository URL
 KUDREPO="${KUDREPO:-https://github.com/onap/multicloud-k8s.git}"
 #Path to clone the KuD repo
 KUDPATH="/opt/src/github.com/onap/multicloud-k8s"
 #KuD version to use
-KUD_VERSION="ed96bca7fe415f1636d82c26af15d7474bdfe876"
+KUD_VERSION="8157bf63753839ce4e9006978816fad3f63ca2de"
 
 #EMCO repository URL
-EMCOREPO="${EMCOREPO:-https://github.com/open-ness/EMCO.git}"
+EMCOREPO="${EMCOREPO:-https://gitlab.com/project-emco/core/emco-base.git}"
 #Path to clone the EMCO repo
-EMCOPATH="/opt/src/github.com/open-ness/EMCO"
+EMCOPATH="/opt/src/emco-base"
 #EMCO version to use
-EMCO_VERSION="openness-21.03.06"
+EMCO_VERSION="v21.12"
 
 #Discard existing repo directory
-FORCE_REPO_UPDATE="${FORCE_REPO_UPDATE:-true}"
+FORCE_REPO_UPDATE="${FORCE_REPO_UPDATE:-false}"
 
 # The kustomize version to use
-KUSTOMIZE_VERSION="v4.3.0"
+KUSTOMIZE_VERSION="v4.5.2"
 
 #Cluster API version to use
-CAPI_VERSION="v0.4.3"
+CAPI_VERSION="v0.4.7"
 
 #Cluster API version to use
-CAPM3_VERSION="v0.5.1"
+CAPM3_VERSION="v0.5.4"
 
 #The flux version to use
-FLUX_VERSION="0.20.0"
+FLUX_VERSION="0.27.0"
 
 #The sops version to use
 SOPS_VERSION="v3.7.1"
 
+#Cert-Manager version to use
+CERT_MANAGER_VERSION="v1.7.1"
+
+#CNI versions to use in cluster chart
+CALICO_VERSION="v3.22.0"
+FLANNEL_VERSION="v0.16.3"
+
+#Kata version to use
+KATA_VERSION="2.3.2"
+KATA_WEBHOOK_VERSION="2.3.2"
+
+#The kubectl version to install when KuD is not used to deploy the
+#jump server K8s cluster
+KUBECTL_VERSION="v1.20.7"
+
+#The yq version to use
+YQ_VERSION="v4.20.1"
+
+#Istio repository URL
+ISTIOREPO="${ISTIOREPO:-https://github.com/istio/istio.git}"
+#Path to clone the Istio repo
+ISTIOPATH="/opt/src/istio"
+#Istio version to use
+ISTIO_VERSION="1.10.3"
+
+#Addon versions
+CDI_VERSION="v1.44.1"
+CPU_MANAGER_VERSION="v1.4.1"
+KUBEVIRT_VERSION="v0.50.0"
+MULTUS_VERSION="v3.8"
+NODUS_VERSION="dd9985e5be010b764b324b57c1afe985a59abf68"
+QAT_VERSION="v0.23.0"
+
 #refered from onap
 function call_api {
     #Runs curl with passed flags and provides
@@ -272,38 +307,8 @@ function clone_emco_repository {
     clone_repository ${EMCOPATH} ${EMCOREPO} ${EMCO_VERSION}
 }
 
-function install_kustomize {
-    curl -sL "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz" -o kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz
-    tar xzf kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz --no-same-owner
-    sudo install -o root -g root -m 0755 kustomize /usr/local/bin/kustomize
-    rm kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz kustomize
-    kustomize version
-}
-
-function install_clusterctl {
-    curl -L https://github.com/kubernetes-sigs/cluster-api/releases/download/${CAPI_VERSION}/clusterctl-linux-amd64 -o clusterctl
-    sudo install -o root -g root -m 0755 clusterctl /usr/local/bin/clusterctl
-    rm clusterctl
-    clusterctl version
-}
-
-function install_flux_cli {
-    export FLUX_VERSION
-    curl -s https://fluxcd.io/install.sh | sudo -E bash
-    flux --version
-}
-
-function install_emcoctl {
-    clone_emco_repository
-    make -C ${EMCOPATH}/src/tools/emcoctl
-    sudo install -o root -g root -m 0755 ${EMCOPATH}/bin/emcoctl/emcoctl /usr/local/bin/emcoctl
-}
-
-function install_sops {
-    curl -L https://github.com/mozilla/sops/releases/download/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux -o sops
-    sudo install -o root -g root -m 0755 sops /usr/local/bin/sops
-    rm sops
-    sops --version
+function clone_istio_repository {
+    clone_repository ${ISTIOPATH} ${ISTIOREPO} ${ISTIO_VERSION}
 }
 
 function fetch_image {