Update EMCO to v21.12

Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: Id1c35e37965665ade251dde5a2efa8ca71be2806

diff --git a/deploy/addons/addons.sh b/deploy/addons/addons.sh
index 75a8ad3..319b970 100755 (executable)
--- a/deploy/addons/addons.sh
+++ b/deploy/addons/addons.sh
@@ -91,6 +91,12 @@ function test_addons {
     clusterctl -n metal3 get kubeconfig ${cluster_name} >${cluster_kubeconfig}
 
     clone_kud_repository
+    # The vFW test in EMCO v21.12 does not use KubeVirt, so patch the
+    # KuD test and continue to use it
+    pushd ${KUDPATH}
+    patch -p1 --forward <${SCRIPTDIR}/plugin_fw_v2.patch || true
+    popd
+
     pushd ${KUDPATH}/kud/tests
     failed_kud_tests=""
     container_runtime=$(KUBECONFIG=${cluster_kubeconfig} kubectl get nodes -o jsonpath='{.items[].status.nodeInfo.containerRuntimeVersion}')

diff --git a/deploy/addons/plugin_fw_v2.patch b/deploy/addons/plugin_fw_v2.patch
new file mode 100644 (file)
index 0000000..461a46d
--- /dev/null
+++ b/deploy/addons/plugin_fw_v2.patch
@@ -0,0 +1,165 @@
+diff --git a/kud/tests/plugin_fw_v2.yaml b/kud/tests/plugin_fw_v2.yaml
+index b4dbf77..940ed6d 100644
+--- a/kud/tests/plugin_fw_v2.yaml
++++ b/kud/tests/plugin_fw_v2.yaml
+@@ -22,7 +22,7 @@ file:
+ version: emco/v2
+ resourceContext:
+   anchor: cluster-providers/{{$.ClusterProvider}}/clusters/{{$cluster.Name}}/labels
+-label-name: {{$.ClusterLabel}}
++clusterLabel: {{$.ClusterLabel}}
+ 
+ ---
+ version: emco/v2
+@@ -104,9 +104,9 @@ resourceContext:
+ metadata:
+   name: {{$cluster.Name}}
+ spec:
+-  cluster-provider: {{$.ClusterProvider}}
+-  cluster-name: {{$cluster.Name}}
+-  loadbalancer-ip: "0.0.0.0"
++  clusterProvider: {{$.ClusterProvider}}
++  cluster: {{$cluster.Name}}
++  loadbalancerIp: "0.0.0.0"
+ {{- end }}
+ 
+ ---
+@@ -116,7 +116,7 @@ resourceContext:
+ metadata:
+   name: {{.CompositeApp}}
+ spec:
+-  version: {{.Version}}
++  compositeAppVersion: {{.Version}}
+ 
+ ---
+ version: emco/v2
+@@ -159,7 +159,7 @@ resourceContext:
+ metadata :
+   name: packetgen-profile
+ spec:
+-  app-name: packetgen
++  app: packetgen
+ file:
+   {{.PackagesPath}}/profile.tar.gz
+ 
+@@ -170,7 +170,7 @@ resourceContext:
+ metadata :
+   name: firewall-profile
+ spec:
+-  app-name: firewall
++  app: firewall
+ file:
+   {{.PackagesPath}}/profile.tar.gz
+ 
+@@ -181,7 +181,7 @@ resourceContext:
+ metadata :
+   name: sink-profile
+ spec:
+-  app-name: sink
++  app: sink
+ file:
+   {{.PackagesPath}}/profile.tar.gz
+ 
+@@ -192,18 +192,18 @@ resourceContext:
+ metadata:
+   name: {{.DeploymentIntentGroup}}
+ spec:
+-  profile: {{.CompositeProfile}}
++  compositeProfile: {{.CompositeProfile}}
+   version: {{.Release}}
+-  logical-cloud: {{.LogicalCloud}}
+-  override-values:
+-    - app-name: packetgen
++  logicalCloud: {{.LogicalCloud}}
++  overrideValues:
++    - app: packetgen
+       values:
+         ".Values.service.ports.nodePort": '30888'
+-    - app-name: firewall
++    - app: firewall
+       values:
+         ".Values.global.dcaeCollectorIp": 1.2.3.4
+         ".Values.global.dcaeCollectorPort": '8888'
+-    - app-name: sink
++    - app: sink
+       values:
+         ".Values.service.ports.nodePort": '30677'
+ 
+@@ -232,8 +232,8 @@ resourceContext:
+ metadata:
+   name: packetgen_workload_intent
+ spec:
+-  application-name: packetgen
+-  workload-resource: {{.Release}}-packetgen
++  app: packetgen
++  workloadResource: {{.Release}}-packetgen
+   type: VirtualMachine
+ 
+ ---
+@@ -243,8 +243,8 @@ resourceContext:
+ metadata:
+   name: firewall_workload_intent
+ spec:
+-  application-name: firewall
+-  workload-resource: {{.Release}}-firewall
++  app: firewall
++  workloadResource: {{.Release}}-firewall
+   type: VirtualMachine
+ 
+ ---
+@@ -254,8 +254,8 @@ resourceContext:
+ metadata:
+   name: sink_workload_intent
+ spec:
+-  application-name: sink
+-  workload-resource: {{.Release}}-sink
++  app: sink
++  workloadResource: {{.Release}}-sink
+   type: Deployment
+ 
+ ---
+@@ -361,11 +361,11 @@ resourceContext:
+ metadata:
+   name: packetgen-placement-intent
+ spec:
+-  app-name: packetgen
++  app: packetgen
+   intent:
+     allOf:
+-      - provider-name: {{.ClusterProvider}}
+-        cluster-label-name: {{.ClusterLabel}}
++      - clusterProvider: {{.ClusterProvider}}
++        clusterLabel: {{.ClusterLabel}}
+ 
+ ---
+ version: emco/v2
+@@ -374,11 +374,11 @@ resourceContext:
+ metadata:
+   name: firewall-placement-intent
+ spec:
+-  app-name: firewall
++  app: firewall
+   intent:
+     allOf:
+-      - provider-name: {{.ClusterProvider}}
+-        cluster-label-name: {{.ClusterLabel}}
++      - clusterProvider: {{.ClusterProvider}}
++        clusterLabel: {{.ClusterLabel}}
+ 
+ ---
+ version: emco/v2
+@@ -387,11 +387,11 @@ resourceContext:
+ metadata:
+   name: sink-placement-intent
+ spec:
+-  app-name: sink
++  app: sink
+   intent:
+     allOf:
+-      - provider-name: {{.ClusterProvider}}
+-        cluster-label-name: {{.ClusterLabel}}
++      - clusterProvider: {{.ClusterProvider}}
++        clusterLabel: {{.ClusterLabel}}
+ 
+ {{- range $index, $cluster := .Clusters }}
+ ---

diff --git a/deploy/site/cluster-icn/emco-db-release.yaml b/deploy/site/cluster-icn/emco-db-release.yaml
index b60368d..65b2361 100644 (file)
--- a/deploy/site/cluster-icn/emco-db-release.yaml
+++ b/deploy/site/cluster-icn/emco-db-release.yaml
@@ -7,7 +7,7 @@ spec:
     interval: 5m
     chart:
         spec:
-            chart: deployments/helm/emcoOpenNESS/emco-db
+            chart: deployments/helm/emcoBase/emco-db
             sourceRef:
                 kind: GitRepository
                 name: emco

diff --git a/deploy/site/cluster-icn/emco-monitor-release.yaml b/deploy/site/cluster-icn/emco-monitor-release.yaml
index d4d27dd..91dc1e6 100644 (file)
--- a/deploy/site/cluster-icn/emco-monitor-release.yaml
+++ b/deploy/site/cluster-icn/emco-monitor-release.yaml
@@ -20,5 +20,5 @@ spec:
     remediation:
       retries: -1
   values:
-    registryPrefix: integratedcloudnative/
-    tag: openness-21.03.06
+    registryPrefix: registry.gitlab.com/project-emco/core/emco-base/
+    tag: v21.12

diff --git a/deploy/site/cluster-icn/emco-services-release.yaml b/deploy/site/cluster-icn/emco-services-release.yaml
index 5312b0c..41ea258 100644 (file)
--- a/deploy/site/cluster-icn/emco-services-release.yaml
+++ b/deploy/site/cluster-icn/emco-services-release.yaml
@@ -8,7 +8,7 @@ spec:
   interval: 5m
   chart:
     spec:
-      chart: deployments/helm/emcoOpenNESS/emco-services
+      chart: deployments/helm/emcoBase/emco-services
       sourceRef:
         kind: GitRepository
         name: emco
@@ -23,30 +23,38 @@ spec:
   - name: db
   values:
     global:
-      repository: integratedcloudnative/
+      repository: registry.gitlab.com/project-emco/core/emco-base/
       pullPolicy: IfNotPresent
       loglevel: warn
     orchestrator:
-      imageTag: openness-21.03.06
+      imageTag: v21.12
     ncm:
-      imageTag: openness-21.03.06
+      imageTag: v21.12
     rsync:
-      imageTag: openness-21.03.06
+      imageTag: v21.12
     clm:
-      imageTag: openness-21.03.06
+      imageTag: v21.12
     ovnaction:
-      imageTag: openness-21.03.06
+      imageTag: v21.12
     dcm:
-      imageTag: openness-21.03.06
+      imageTag: v21.12
     dtc:
-      imageTag: openness-21.03.06
+      imageTag: v21.12
     nps:
-      imageTag: openness-21.03.06
+      imageTag: v21.12
     sds:
-      imageTag: openness-21.03.06
+      imageTag: v21.12
+    its:
+      imageTag: v21.12
     gac:
-      imageTag: openness-21.03.06
+      imageTag: v21.12
     sfc:
-      imageTag: openness-21.03.06
+      imageTag: v21.12
     sfcclient:
-      imageTag: openness-21.03.06
+      imageTag: v21.12
+    hpa-ac:
+      common:
+        repository: registry.gitlab.com/project-emco/core/emco-base/
+        imageTag: v21.12
+    hpa-plc:
+      imageTag: v21.12

diff --git a/deploy/site/cluster-icn/emco-source.yaml b/deploy/site/cluster-icn/emco-source.yaml
index a745cc6..f6652aa 100644 (file)
--- a/deploy/site/cluster-icn/emco-source.yaml
+++ b/deploy/site/cluster-icn/emco-source.yaml
@@ -6,9 +6,9 @@ metadata:
   namespace: emco
 spec:
   interval: 1m
-  url: https://github.com/open-ness/EMCO
+  url: https://gitlab.com/project-emco/core/emco-base.git
   ref:
-    tag: openness-21.03.06
+    tag: v21.12
   ignore: |
     # exclude all
     /*

diff --git a/deploy/site/cluster-icn/emco-tools-release.yaml b/deploy/site/cluster-icn/emco-tools-release.yaml
index 7924b67..bf7c06d 100644 (file)
--- a/deploy/site/cluster-icn/emco-tools-release.yaml
+++ b/deploy/site/cluster-icn/emco-tools-release.yaml
@@ -8,7 +8,7 @@ spec:
   interval: 5m
   chart:
     spec:
-      chart: deployments/helm/emcoOpenNESS/emco-tools
+      chart: deployments/helm/emcoBase/emco-tools
       sourceRef:
         kind: GitRepository
         name: emco
@@ -24,7 +24,7 @@ spec:
   - name: podsecurity
   values:
     global:
-      repository: integratedcloudnative/
+      repository: registry.gitlab.com/project-emco/core/emco-base/
       pullPolicy: IfNotPresent
     fluentd:
       clusterDomain: cluster.local

diff --git a/env/lib/common.sh b/env/lib/common.sh
index 26c9a65..53e278d 100755 (executable)
--- a/env/lib/common.sh
+++ b/env/lib/common.sh
@@ -27,11 +27,11 @@ KUDPATH="/opt/src/github.com/onap/multicloud-k8s"
 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}"