From 64de32ca32ef51f604d73d3be71ffb5d54d017ec Mon Sep 17 00:00:00 2001 From: Todd Malsbary Date: Tue, 26 Apr 2022 11:12:44 -0700 Subject: [PATCH] Update EMCO to 22.03 Signed-off-by: Todd Malsbary Change-Id: Iec8b445e79185fdfe228a104ad39ea3ecf8d48a0 --- deploy/site/cluster-emco-compute/emco-monitor.yaml | 2 +- deploy/site/cluster-emco-compute/emco-source.yaml | 2 +- .../cluster-emco-management/emco-services.yaml | 32 ++++++++++++---------- .../site/cluster-emco-management/emco-source.yaml | 2 +- doc/software-bom.md | 2 +- env/lib/common.sh | 2 +- 6 files changed, 22 insertions(+), 20 deletions(-) diff --git a/deploy/site/cluster-emco-compute/emco-monitor.yaml b/deploy/site/cluster-emco-compute/emco-monitor.yaml index 91dc1e6..5a574a0 100644 --- a/deploy/site/cluster-emco-compute/emco-monitor.yaml +++ b/deploy/site/cluster-emco-compute/emco-monitor.yaml @@ -21,4 +21,4 @@ spec: retries: -1 values: registryPrefix: registry.gitlab.com/project-emco/core/emco-base/ - tag: v21.12 + tag: "22.03" diff --git a/deploy/site/cluster-emco-compute/emco-source.yaml b/deploy/site/cluster-emco-compute/emco-source.yaml index f6652aa..cf8fe55 100644 --- a/deploy/site/cluster-emco-compute/emco-source.yaml +++ b/deploy/site/cluster-emco-compute/emco-source.yaml @@ -8,7 +8,7 @@ spec: interval: 1m url: https://gitlab.com/project-emco/core/emco-base.git ref: - tag: v21.12 + tag: "v22.03" ignore: | # exclude all /* diff --git a/deploy/site/cluster-emco-management/emco-services.yaml b/deploy/site/cluster-emco-management/emco-services.yaml index 41ea258..5ff8f87 100644 --- a/deploy/site/cluster-emco-management/emco-services.yaml +++ b/deploy/site/cluster-emco-management/emco-services.yaml @@ -27,34 +27,36 @@ spec: pullPolicy: IfNotPresent loglevel: warn orchestrator: - imageTag: v21.12 + imageTag: "22.03" ncm: - imageTag: v21.12 + imageTag: "22.03" rsync: - imageTag: v21.12 + imageTag: "22.03" clm: - imageTag: v21.12 + imageTag: "22.03" ovnaction: - imageTag: v21.12 + imageTag: "22.03" dcm: - imageTag: v21.12 + imageTag: "22.03" dtc: - imageTag: v21.12 + imageTag: "22.03" nps: - imageTag: v21.12 + imageTag: "22.03" sds: - imageTag: v21.12 + imageTag: "22.03" its: - imageTag: v21.12 + imageTag: "22.03" gac: - imageTag: v21.12 + imageTag: "22.03" sfc: - imageTag: v21.12 + imageTag: "22.03" sfcclient: - imageTag: v21.12 + imageTag: "22.03" hpa-ac: common: repository: registry.gitlab.com/project-emco/core/emco-base/ - imageTag: v21.12 + imageTag: "22.03" hpa-plc: - imageTag: v21.12 + imageTag: "22.03" + workflowmgr: + imageTag: "22.03" diff --git a/deploy/site/cluster-emco-management/emco-source.yaml b/deploy/site/cluster-emco-management/emco-source.yaml index f6652aa..cf8fe55 100644 --- a/deploy/site/cluster-emco-management/emco-source.yaml +++ b/deploy/site/cluster-emco-management/emco-source.yaml @@ -8,7 +8,7 @@ spec: interval: 1m url: https://gitlab.com/project-emco/core/emco-base.git ref: - tag: v21.12 + tag: "v22.03" ignore: | # exclude all /* diff --git a/doc/software-bom.md b/doc/software-bom.md index 25dff6a..e370784 100644 --- a/doc/software-bom.md +++ b/doc/software-bom.md @@ -28,7 +28,7 @@ |Containerized Data Importer|https://github.com/kubevirt/containerized-data-importer|v1.44.1|Apache-2.0| |cert-manager|https://cert-manager.io/|v1.7.1|Apache-2.0| |CPU Manager for Kubernetes|https://github.com/intel/CPU-Manager-for-Kubernetes|v1.4.1|Apache-2.0| -|EMCO|https://gitlab.com/project-emco|v21.12|Apache-2.0| +|EMCO|https://gitlab.com/project-emco|v22.03|Apache-2.0| |Flux|https://fluxcd.io/|0.27.0|Apache-2.0| |Intel Network Adapter Linux Virtual Function Driver for Intel Ethernet Controller 700 and E810 Series|https://www.intel.com/content/www/us/en/download/18159/intel-network-adapter-linux-virtual-function-driver-for-intel-ethernet-controller-700-and-e810-series.html|4.0.2|GPL-2.0| |Intel Network Adapter Virtual Function Driver Installer|https://gerrit.onap.org/r/#/admin/projects/multicloud/k8s|latest|Apache-2.0| diff --git a/env/lib/common.sh b/env/lib/common.sh index 2cd93d6..53180d8 100755 --- a/env/lib/common.sh +++ b/env/lib/common.sh @@ -31,7 +31,7 @@ EMCOREPO="${EMCOREPO:-https://gitlab.com/project-emco/core/emco-base.git}" #Path to clone the EMCO repo EMCOPATH="/opt/src/emco-base" #EMCO version to use -EMCO_VERSION="v21.12" +EMCO_VERSION="v22.03" #Discard existing repo directory FORCE_REPO_UPDATE="${FORCE_REPO_UPDATE:-false}" -- 2.16.6