Merge "Sync OOM docker versions with docker-manifest.csv"

diff --combined kubernetes/portal/charts/portal-app/values.yaml
index 84cb08e,1e3e6ea..f9081f6
--- 1/kubernetes/portal/charts/portal-app/values.yaml
--- 2/kubernetes/portal/charts/portal-app/values.yaml
+++ b/kubernetes/portal/charts/portal-app/values.yaml
@@@ -17,6 -17,7 +17,6 @@@
  #################################################################
  global:
    nodePortPrefix: 302
 -  repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
    readinessRepository: oomk8s
    readinessImage: readiness-check:2.0.0
    loggingRepository: docker.elastic.co
@@@ -27,7 -28,7 +27,7 @@@
  #################################################################
  # application image
  repository: nexus3.onap.org:10001
- image: onap/portal-app:2.1-STAGING-latest
+ image: onap/portal-app:v2.2.0
  pullPolicy: Always
  
  # default number of instances

diff --combined kubernetes/portal/charts/portal-mariadb/values.yaml
index 171c215,31a7e16..ff058c8
--- 1/kubernetes/portal/charts/portal-mariadb/values.yaml
--- 2/kubernetes/portal/charts/portal-mariadb/values.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/values.yaml
@@@ -17,13 -17,14 +17,13 @@@
  # Declare variables to be passed into your templates.
  global: # global defaults
    nodePortPrefix: 302
 -  repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
    persistence: {}
    readinessRepository: oomk8s
  
  
  # application image
  repository: nexus3.onap.org:10001
- image: onap/portal-db:2.1-STAGING-latest
+ image: onap/portal-db:v2.2.0
  pullPolicy: Always
  
  readinessImage: "readiness-check:2.0.0"

diff --combined kubernetes/portal/charts/portal-sdk/values.yaml
index 6282b20,e746ac2..d0aae9c
--- 1/kubernetes/portal/charts/portal-sdk/values.yaml
--- 2/kubernetes/portal/charts/portal-sdk/values.yaml
+++ b/kubernetes/portal/charts/portal-sdk/values.yaml
@@@ -17,6 -17,7 +17,6 @@@
  #################################################################
  global:
    nodePortPrefix: 302
 -  repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
    readinessRepository: oomk8s
    readinessImage: readiness-check:2.0.0
    loggingRepository: docker.elastic.co
@@@ -27,7 -28,7 +27,7 @@@
  #################################################################
  # application image
  repository: nexus3.onap.org:10001
- image: onap/portal-sdk:2.1-STAGING-latest
+ image: onap/portal-sdk:v2.2.0
  pullPolicy: Always
  
  # flag to enable debugging - application support required

diff --combined kubernetes/portal/charts/portal-widget/values.yaml
index 7113194,c75414a..b08fd60
--- 1/kubernetes/portal/charts/portal-widget/values.yaml
--- 2/kubernetes/portal/charts/portal-widget/values.yaml
+++ b/kubernetes/portal/charts/portal-widget/values.yaml
@@@ -17,6 -17,7 +17,6 @@@
  #################################################################
  global:
    nodePortPrefix: 302
 -  repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
    readinessRepository: oomk8s
    readinessImage: readiness-check:2.0.0
    loggingRepository: docker.elastic.co
@@@ -28,7 -29,7 +28,7 @@@
  #################################################################
  # application image
  repository: nexus3.onap.org:10001
- image: onap/portal-wms:2.1-STAGING-latest
+ image: onap/portal-wms:v2.2.0
  pullPolicy: Always
  
  # flag to enable debugging - application support required