From: Krzysztof Opasiak <k.opasiak@samsung.com>
Date: Tue, 14 Jul 2020 23:34:38 +0000 (+0000)
Subject: Merge "[POLICY] update released images"
X-Git-Tag: 7.0.0~348
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c54bd76f1f17889485349c0149ee1682ec10e4b6;hp=a7dbd02b66ec12ed43464d05ca04a33a1b9f2492;p=oom.git

Merge "[POLICY] update released images"
---

diff --git a/kubernetes/cds/charts/cds-blueprints-processor/values.yaml b/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
index 500e3a536b..c481a4b1b3 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
@@ -154,7 +154,7 @@ ingress:
   enabled: false
   service:
     - baseaddr: "blueprintsprocessorhttp"
-      name: "blueprints-processor-http"
+      name: "cds-blueprints-processor-http"
       port: 8080
   config:
     ssl: "none"
diff --git a/kubernetes/common/mariadb-galera/resources/create-deployment.yml b/kubernetes/common/mariadb-galera/resources/create-deployment.yml
index 61bfc78945..d81d640b0d 100644
--- a/kubernetes/common/mariadb-galera/resources/create-deployment.yml
+++ b/kubernetes/common/mariadb-galera/resources/create-deployment.yml
@@ -47,4 +47,4 @@ spec:
               key: password
               name: {{ include "common.fullname" . }}-temp-upgrade-root
       subdomain: {{ .Values.service.name }}
-      hostname: {{ .Values.nameOverride }}-upgrade-deployment
\ No newline at end of file
+      hostname: {{ .Values.nameOverride }}-upgrade-deployment
diff --git a/kubernetes/common/mariadb-galera/templates/statefulset.yaml b/kubernetes/common/mariadb-galera/templates/statefulset.yaml
index 855d50e5ea..47d1e0ef3d 100644
--- a/kubernetes/common/mariadb-galera/templates/statefulset.yaml
+++ b/kubernetes/common/mariadb-galera/templates/statefulset.yaml
@@ -14,7 +14,7 @@
 # limitations under the License.
 */}}
 
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ include "common.fullname" . }}
@@ -27,6 +27,9 @@ metadata:
 spec:
   serviceName: {{ .Values.service.name }}
   replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ include "common.fullname" . }}
   template:
     metadata:
       labels:
diff --git a/kubernetes/common/serviceAccount/templates/role.yaml b/kubernetes/common/serviceAccount/templates/role.yaml
index 73f45b5fce..6d12164938 100644
--- a/kubernetes/common/serviceAccount/templates/role.yaml
+++ b/kubernetes/common/serviceAccount/templates/role.yaml
@@ -28,6 +28,7 @@ rules:
   - "" # "" indicates the core API group
   - apps
   - batch
+  - extensions
   resources:
   - pods
   - deployments
@@ -35,6 +36,7 @@ rules:
   - jobs/status
   - statefulsets
   - replicasets
+  - replicasets/status
   - daemonsets
   verbs:
   - get
@@ -46,6 +48,7 @@ rules:
   - "" # "" indicates the core API group
   - apps
   - batch
+  - extensions
   resources:
   - pods
   - deployments
@@ -53,6 +56,7 @@ rules:
   - jobs/status
   - statefulsets
   - replicasets
+  - replicasets/status
   - daemonsets
   - secrets
   verbs:
diff --git a/kubernetes/consul/charts/consul-server/templates/statefulset.yaml b/kubernetes/consul/charts/consul-server/templates/statefulset.yaml
index 5fec6c5b7e..5bdbe0f232 100644
--- a/kubernetes/consul/charts/consul-server/templates/statefulset.yaml
+++ b/kubernetes/consul/charts/consul-server/templates/statefulset.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ include "common.fullname" . }}
diff --git a/kubernetes/consul/templates/deployment.yaml b/kubernetes/consul/templates/deployment.yaml
index 24de33ed8e..a7774e9878 100644
--- a/kubernetes/consul/templates/deployment.yaml
+++ b/kubernetes/consul/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "common.fullname" . }}