10 files changed, 26 insertions, 14 deletions
diff --git a/deployments/_functions.sh b/deployments/_functions.sh
index 47074433..c0feed0d 100755
--- a/deployments/_functions.sh
+++ b/deployments/_functions.sh
@@ -34,3 +34,14 @@ EOF
 function start_all {
     docker-compose up -d
 }
+
+function wait_for_service {
+    for try in {0..59}; do
+        echo "$(date +%H:%M:%S) - Waiting for service up"
+        sleep 1
+        if $(curl http://localhost:9015/v1 &>/dev/null); then
+            return 0
+        fi
+    done
+    exit 1
+}
diff --git a/deployments/helm/onap4k8s/charts/etcd/values.yaml b/deployments/helm/onap4k8s/charts/etcd/values.yaml
index ab891da7..fd459f0a 100644
--- a/deployments/helm/onap4k8s/charts/etcd/values.yaml
+++ b/deployments/helm/onap4k8s/charts/etcd/values.yaml
@@ -25,7 +25,7 @@ global:
 
 #repository: etcd
 repository: "k8s.gcr.io"
-image: "etcd-amd64:3.2.24"
+image: "etcd-amd64:3.3.17"
 pullPolicy: Always
 
 # default number of instances in the StatefulSet
diff --git a/deployments/helm/onap4k8s/charts/mongo/values.yaml b/deployments/helm/onap4k8s/charts/mongo/values.yaml
index d6938c1e..14376143 100644
--- a/deployments/helm/onap4k8s/charts/mongo/values.yaml
+++ b/deployments/helm/onap4k8s/charts/mongo/values.yaml
@@ -19,7 +19,7 @@ global:
   nodePortPrefix: 302
   persistence: {}
   readinessRepository: oomk8s
-  readinessImage: readiness-check:2.0.0
+  readinessImage: readiness-check:2.2.2
 
 
 #################################################################
@@ -27,7 +27,7 @@ global:
 #################################################################
 
 dockerHubRepository: registry.hub.docker.com
-image: library/mongo:4.0.8
+image: library/mongo:4.4.1
 pullPolicy: Always
 
 # application configuration
@@ -110,7 +110,7 @@ resources: {}
 
 
 nfsprovisionerRepository: quay.io
-nfsprovisionerImage: kubernetes_incubator/nfs-provisioner:v1.0.8
+nfsprovisionerImage: kubernetes_incubator/nfs-provisioner:v2.3.0
 nfsprovisionerPrefix: mongo
 
 sdnctlPrefix: mongo
diff --git a/deployments/helm/onap4k8s/charts/multicloud-k8s/values.yaml b/deployments/helm/onap4k8s/charts/multicloud-k8s/values.yaml
index 30d70092..5fa51284 100644
--- a/deployments/helm/onap4k8s/charts/multicloud-k8s/values.yaml
+++ b/deployments/helm/onap4k8s/charts/multicloud-k8s/values.yaml
@@ -18,16 +18,16 @@
 global:
   nodePortPrefixExt: 304
   readinessRepository: oomk8s
-  readinessImage: readiness-check:2.0.0
+  readinessImage: readiness-check:2.2.2
   loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
+  loggingImage: beats/filebeat:7.9.3
   persistence: {}
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
 repository: registry.hub.docker.com
-image: onap/multicloud-k8s:0.5.0
+image: onap/multicloud-k8s:0.7.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/deployments/helm/v2/emco/Chart.yaml b/deployments/helm/v2/emco/Chart.yaml
index 6998dcaa..9c015819 100644
--- a/deployments/helm/v2/emco/Chart.yaml
+++ b/deployments/helm/v2/emco/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
-name: onap4k8s
+name: emco
 version: 0.1.0
diff --git a/deployments/helm/v2/emco/etcd/values.yaml b/deployments/helm/v2/emco/etcd/values.yaml
index ef9494b9..682af0d5 100644
--- a/deployments/helm/v2/emco/etcd/values.yaml
+++ b/deployments/helm/v2/emco/etcd/values.yaml
@@ -25,7 +25,7 @@ global:
 
 #repository: etcd
 repository: "k8s.gcr.io"
-image: "etcd-amd64:3.2.26"
+image: "etcd-amd64:3.3.17"
 pullPolicy: Always
 
 # default number of instances in the StatefulSet
diff --git a/deployments/helm/v2/emco/fluentd/values-production.yaml b/deployments/helm/v2/emco/fluentd/values-production.yaml
index d1bc5e26..0df1dab1 100644
--- a/deployments/helm/v2/emco/fluentd/values-production.yaml
+++ b/deployments/helm/v2/emco/fluentd/values-production.yaml
@@ -13,7 +13,7 @@ global: {}
 image:
   registry: docker.io
   repository: bitnami/fluentd
-  tag: 1.10.2-debian-10-r11
+  tag: 1.11.4-debian-10-r7
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
diff --git a/deployments/helm/v2/emco/fluentd/values.yaml b/deployments/helm/v2/emco/fluentd/values.yaml
index 1feb2a19..6f9770d4 100644
--- a/deployments/helm/v2/emco/fluentd/values.yaml
+++ b/deployments/helm/v2/emco/fluentd/values.yaml
@@ -13,7 +13,7 @@ global: {}
 image:
   registry: docker.io
   repository: bitnami/fluentd
-  tag: 1.10.2-debian-10-r11
+  tag: 1.11.4-debian-10-r7
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
diff --git a/deployments/helm/v2/emco/mongo/values.yaml b/deployments/helm/v2/emco/mongo/values.yaml
index 0a6f8570..71cbadda 100644
--- a/deployments/helm/v2/emco/mongo/values.yaml
+++ b/deployments/helm/v2/emco/mongo/values.yaml
@@ -19,7 +19,7 @@ global:
   nodePortPrefix: 302
   persistence: {}
   readinessRepository: oomk8s
-  readinessImage: readiness-check:2.0.0
+  readinessImage: readiness-check:2.2.2
 
 
 #################################################################
@@ -27,7 +27,7 @@ global:
 #################################################################
 
 dockerHubRepository: registry.hub.docker.com
-image: library/mongo:4.0.8
+image: library/mongo:4.4.1
 pullPolicy: Always
 
 # application configuration
@@ -98,7 +98,7 @@ resources: {}
 
 
 nfsprovisionerRepository: quay.io
-nfsprovisionerImage: kubernetes_incubator/nfs-provisioner:v1.0.8
+nfsprovisionerImage: kubernetes_incubator/nfs-provisioner:v2.3.0
 nfsprovisionerPrefix: mongo
 
 sdnctlPrefix: mongo
diff --git a/deployments/start.sh b/deployments/start.sh
index e7ff1334..61af504c 100755
--- a/deployments/start.sh
+++ b/deployments/start.sh
@@ -21,3 +21,4 @@ stop_all
 start_mongo
 generate_k8sconfig
 start_all
+wait_for_service