Merge "[HOLMES] Migrate Holmes from Cloudify to Helm"

13 files changed, 46 insertions, 0 deletions

diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index ecc156546b..6034063a0e 100755
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -70,6 +70,10 @@ dependencies:
     version: ~8.x-0
     repository: '@local'
     condition: dcaemod.enabled
+  - name: holmes
+    version: ~8.x-0
+    repository: '@local'
+    condition: holmes.enabled
   - name: dmaap
     version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/onap/resources/environments/core-onap.yaml b/kubernetes/onap/resources/environments/core-onap.yaml
index d77a2897a2..24678e6680 100644
--- a/kubernetes/onap/resources/environments/core-onap.yaml
+++ b/kubernetes/onap/resources/environments/core-onap.yaml
@@ -73,6 +73,8 @@ dcaegen2:
   enabled: false
 dcaegen2-services:
   enabled: false
+holmes:
+  enabled: false
 dmaap:
   enabled: true
 esr:
diff --git a/kubernetes/onap/resources/environments/dev.yaml b/kubernetes/onap/resources/environments/dev.yaml
index 58976ae7a0..df333455d8 100644
--- a/kubernetes/onap/resources/environments/dev.yaml
+++ b/kubernetes/onap/resources/environments/dev.yaml
@@ -77,6 +77,8 @@ dcaegen2:
   enabled: false
 dcaegen2-services:
   enabled: false
+holmes:
+  enabled: false
 dmaap:
   enabled: false
 esr:
diff --git a/kubernetes/onap/resources/environments/disable-allcharts.yaml b/kubernetes/onap/resources/environments/disable-allcharts.yaml
index 63801683b3..af3c11a17e 100644
--- a/kubernetes/onap/resources/environments/disable-allcharts.yaml
+++ b/kubernetes/onap/resources/environments/disable-allcharts.yaml
@@ -47,6 +47,8 @@ dcaegen2:
   enabled: false
 dcaegen2-services:
   enabled: false
+holmes:
+  enabled: false
 dmaap:
   enabled: false
 esr:
diff --git a/kubernetes/onap/resources/environments/minimal-onap.yaml b/kubernetes/onap/resources/environments/minimal-onap.yaml
index 9fd5d3dff1..56ed2fef85 100644
--- a/kubernetes/onap/resources/environments/minimal-onap.yaml
+++ b/kubernetes/onap/resources/environments/minimal-onap.yaml
@@ -68,6 +68,8 @@ dcaegen2:
   enabled: false
 dcaegen2-services:
   enabled: false
+holmes:
+  enabled: false
 dmaap:
   enabled: true
 esr:
diff --git a/kubernetes/onap/resources/environments/public-cloud.yaml b/kubernetes/onap/resources/environments/public-cloud.yaml
index 4a910987a9..b44cb29891 100644
--- a/kubernetes/onap/resources/environments/public-cloud.yaml
+++ b/kubernetes/onap/resources/environments/public-cloud.yaml
@@ -67,6 +67,17 @@ dcaegen2:
       initialDelaySeconds: 120
     readiness:
       initialDelaySeconds: 120
+holmes:
+  holmes-rule-mgmt:
+    liveness:
+      initialDelaySeconds: 120
+    readiness:
+      initialDelaySeconds: 120
+  holmes-engine-mgmt:
+    liveness:
+      initialDelaySeconds: 120
+    readiness:
+      initialDelaySeconds: 120
 dmaap:
   dmaap-bus-controller:
     liveness:
diff --git a/kubernetes/onap/resources/overrides/environment.yaml b/kubernetes/onap/resources/overrides/environment.yaml
index 61b1838b83..278a2da156 100644
--- a/kubernetes/onap/resources/overrides/environment.yaml
+++ b/kubernetes/onap/resources/overrides/environment.yaml
@@ -103,6 +103,17 @@ dcaegen2:
       initialDelaySeconds: 120
     readiness:
       initialDelaySeconds: 120
+holmes:
+  holmes-rule-mgmt:
+    liveness:
+      initialDelaySeconds: 120
+    readiness:
+      initialDelaySeconds: 120
+  holmes-engine-mgmt:
+    liveness:
+      initialDelaySeconds: 120
+    readiness:
+      initialDelaySeconds: 120
 dmaap:
   dmaap-bus-controller:
     liveness:
diff --git a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
index 70e8ac28a1..7f23899c98 100644
--- a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
+++ b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
@@ -100,6 +100,8 @@ dcaegen2:
   enabled: false
 dcaegen2-services:
   enabled: false
+holmes:
+  enabled: false
 dmaap:
   enabled: true
 esr:
diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
index d8153e0971..ea286b09c1 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
@@ -42,6 +42,8 @@ dcaegen2:
   enabled: true
 dcaegen2-services:
   enabled: true
+holmes:
+  enabled: true
 dmaap:
   enabled: true
 esr:
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index 70f7cf8949..d6c447240d 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -52,6 +52,8 @@ dcaegen2-services:
   enabled: true
 dcaemod:
   enabled: true
+holmes:
+  enabled: true
 dmaap:
   enabled: true
 esr:
diff --git a/kubernetes/onap/resources/overrides/onap-vfw.yaml b/kubernetes/onap/resources/overrides/onap-vfw.yaml
index caa76015b4..181a1d18e4 100644
--- a/kubernetes/onap/resources/overrides/onap-vfw.yaml
+++ b/kubernetes/onap/resources/overrides/onap-vfw.yaml
@@ -35,6 +35,8 @@ dcaegen2:
   enabled: true
 dcaegen2-services:
   enabled: true
+holmes:
+  enabled: true
 dmaap:
   enabled: true
 log:
diff --git a/kubernetes/onap/resources/overrides/sm-onap.yaml b/kubernetes/onap/resources/overrides/sm-onap.yaml
index 9c26655c1a..ca98011484 100644
--- a/kubernetes/onap/resources/overrides/sm-onap.yaml
+++ b/kubernetes/onap/resources/overrides/sm-onap.yaml
@@ -72,6 +72,8 @@ dcaegen2:
   enabled: false
 dcaegen2-services:
   enabled: false
+holmes:
+  enabled: false
 esr:
   enabled: false
 log:
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 6ff7d13c6c..b008acf6f3 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -309,6 +309,8 @@ dcaegen2-services:
   enabled: false
 dcaemod:
   enabled: false
+holmes:
+  enabled: false
 dmaap:
   enabled: false
 esr: