Merge "[EXTAPI] Deploy macromode and E2E slicing code changes"

diff --combined kubernetes/nbi/templates/deployment.yaml
index 631cb7c,fe25e4b..febb8a9
--- 1/kubernetes/nbi/templates/deployment.yaml
--- 2/kubernetes/nbi/templates/deployment.yaml
+++ b/kubernetes/nbi/templates/deployment.yaml
@@@ -1,4 -1,3 +1,4 @@@
 +{{/*
  # Copyright © 2018 Orange
  # Modifications Copyright © 2018  Amdocs, Bell Canada
  # Modifications Copyright © 2020 Nokia
@@@ -14,7 -13,6 +14,7 @@@
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  # See the License for the specific language governing permissions and
  # limitations under the License.
 +*/}}
  
  apiVersion: apps/v1
  kind: Deployment
@@@ -51,7 -49,7 +51,7 @@@ spec
            # so K8s doesn't restart unresponsive container
            {{- if .Values.global.aafEnabled }}
            command:
-           - bash
+           - sh
            args:
            - -c
            - |

diff --combined kubernetes/nbi/values.yaml
index 1fc1600,f80f65b..0f3fd1a
--- 1/kubernetes/nbi/values.yaml
--- 2/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@@ -18,7 -18,8 +18,7 @@@
  #################################################################
  global:
    nodePortPrefix: 302
 -  readinessRepository: oomk8s
 -  readinessImage: readiness-check:2.0.2
 +  readinessImage: onap/oom/readiness:3.0.1
    loggingRepository: docker.elastic.co
    loggingImage: beats/filebeat:5.5.0
    mariadbGalera: &mariadbGalera
@@@ -71,7 -72,7 +71,7 @@@ subChartsOnly
  
  # application image
  repository: nexus3.onap.org:10001
- image: onap/externalapi/nbi:7.0.0
+ image: onap/externalapi/nbi:7.0.2
  pullPolicy: IfNotPresent
  sdc_authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
  aai_authorization: Basic QUFJOkFBSQ==