Merge "Upgrade ironic, baremetal-operator, cluster-api"

diff --combined env/lib/common.sh
index af54d23,2cbdc0b..ba23921
--- 1/env/lib/common.sh
--- 2/env/lib/common.sh
+++ b/env/lib/common.sh
@@@ -17,7 -17,7 +17,7 @@@ BMOPATH="/opt/src/github.com/metal3-io/
  #Bare Metal Operator version to use
  #  If changing this, the value in deploy/ironic/icn/kustomization.yaml
  #  must also be changed
- BMO_VERSION="capm3-v0.5.1"
+ BMO_VERSION="capm3-v0.5.4"
  
  #KuD repository URL
  KUDREPO="${KUDREPO:-https://github.com/onap/multicloud-k8s.git}"
@@@ -27,11 -27,11 +27,11 @@@ KUDPATH="/opt/src/github.com/onap/multi
  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:-false}"
@@@ -40,10 -40,10 +40,10 @@@
  KUSTOMIZE_VERSION="v4.3.0"
  
  #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.25.3"
@@@ -274,6 -274,40 +274,6 @@@ 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 fetch_image {
      if [[ "${BM_IMAGE_URL}" && "${BM_IMAGE}" ]]; then
         mkdir -p "${IRONIC_DATA_DIR}/html/images"