Merge "Delay Tiller deployment till after Credentials"

diff --git a/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
index 3b95006..8d18a94 100644 (file)
--- a/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
+++ b/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
@@ -89,6 +89,9 @@ dashboard:
     portalapi:
       username: username
       password: password
+    metrics:
+      url:
+        ac: http://ric-aux-kibana-server:5601/goto/fedcba9876543210?embed=true
     # key.properties
     cipher.enc.key: AGLDdG4D04BKm2IxIWEr8o==
     # portal.properties

diff --git a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml
index 68e1925..7640ffb 100644 (file)
--- a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml
+++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml
@@ -41,6 +41,7 @@ data:
     portalapi.appname  = {{ .Values.dashboard.portalapi.appname  }}
     portalapi.username = {{ .Values.dashboard.portalapi.username }}
     portalapi.password = {{ .Values.dashboard.portalapi.password }}
+    metrics.url.ac     = {{ .Values.dashboard.metrics.url.ac     }}
 
   key.properties: |
     cipher.enc.key     = {{ .Values.dashboard.cipher.enc.key }}

diff --git a/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml
index d0a8817..a4992a0 100644 (file)
--- a/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml
+++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml
@@ -76,3 +76,6 @@ dashboard:
     ecomp_redirect_url: https://portal.api.simpledemo.onap.org:30225/ONAPPORTAL/login.htm
     ecomp_rest_url: http://portal-app.onap:8989/ONAPPORTAL/auxapi
     ueb_app_key: uebkey
+  metrics:
+    url:
+      ac: http://ric-aux-kibana-server:5601/goto/1234567890abcdef?embed=true

diff --git a/ric-infra/00-Kubernetes/etc/infra.rc b/ric-infra/00-Kubernetes/etc/infra.rc
index 2678776..81c20e7 100644 (file)
--- a/ric-infra/00-Kubernetes/etc/infra.rc
+++ b/ric-infra/00-Kubernetes/etc/infra.rc
@@ -1,5 +1,5 @@
 # modify below for RIC infrastructure (docker-k8s-helm) component versions
-INFRA_DOCKER_VERSION="18.09.7-0ubuntu1~16.04.4"
+INFRA_DOCKER_VERSION=""
 INFRA_K8S_VERSION="1.13.3"
 INFRA_CNI_VERSION="0.6.0"
 INFRA_HELM_VERSION="2.12.3"

diff --git a/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh b/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh
index 25550a1..deb33e5 100644 (file)
--- a/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh
+++ b/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh
@@ -125,6 +125,10 @@ DOCKERVERSION="${DOCKERV}"
 curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
 echo 'deb http://apt.kubernetes.io/ kubernetes-xenial main' > /etc/apt/sources.list.d/kubernetes.list
 
+# tell apt to retry 3 times if failed
+mkdir -p /etc/apt/apt.conf.d
+echo "APT::Acquire::Retries \"3\";" > /etc/apt/apt.conf.d/80-retries
+
 # install low latency kernel, docker.io, and kubernetes
 apt-get update
 apt-get install -y virt-what
@@ -133,7 +137,11 @@ if ! echo $(virt-what) | grep "virtualbox"; then
   # install if identifying the VM not being a virtualbox VM.
   apt-get install -y linux-image-4.15.0-45-lowlatency
 fi
-apt-get install -y curl jq netcat docker.io=${DOCKERVERSION}
+if [ -z ${DOCKERVERSION} ]; then
+  apt-get install -y curl jq netcat docker.io
+else
+  apt-get install -y curl jq netcat docker.io=${DOCKERVERSION}
+fi
 apt-get install -y kubernetes-cni=${CNIVERSION}
 apt-get install -y --allow-unauthenticated kubeadm=${KUBEVERSION} kubelet=${KUBEVERSION} kubectl=${KUBEVERSION}
 apt-mark hold docker.io kubernetes-cni kubelet kubeadm kubectl

diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml
index f14d4e2..1d2a49d 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml
@@ -74,11 +74,11 @@ spec:
               protocol: TCP
           livenessProbe:
             httpGet:
-              path: /healthcheck
+              path: /a1-p/healthcheck
               port: http
           readinessProbe:
             httpGet:
-              path: /healthcheck
+              path: /a1-p/healthcheck
               port: http
       volumes:
         - name: "a1conf"

diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml
index 9bebd45..8a58108 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml
+++ b/ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml
@@ -29,7 +29,7 @@ a1mediator:
 
   image:
     name: ric-plt-a1
-    tag: 0.10.2
+    tag: 0.10.3
 
   # Service ports are now defined in
   # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file.