summaryrefslogtreecommitdiffstats
path: root/deployments/helm/onap4k8s
diff options
context:
space:
mode:
authorYao Le <le.yao@intel.com>2020-04-30 22:40:20 +0800
committerYao Le <le.yao@intel.com>2020-05-27 22:10:04 +0800
commit662f6d95a1461d05ad6605599f4f895b5a90f7a1 (patch)
tree853317a2116725667b8cd6c8fc4d9cb0841139ca /deployments/helm/onap4k8s
parent56b6d5b88e4c5c8db7a6fbc8da113a7a205d44ae (diff)
Update the Kubernetes Version to 1.16
Update kubespray to 2.12 to deploy Kubernetes 1.16 Issue-ID: MULTICLOUD-1063 Signed-off-by: Yao Le <le.yao@intel.com> Change-Id: I537f6395e5d05d8b72411dd1e0789e19972f1947
Diffstat (limited to 'deployments/helm/onap4k8s')
-rw-r--r--deployments/helm/onap4k8s/charts/common/templates/_ingress.tpl2
-rw-r--r--deployments/helm/onap4k8s/charts/etcd/Chart.yaml1
-rw-r--r--deployments/helm/onap4k8s/charts/etcd/templates/statefulset.yaml8
-rw-r--r--deployments/helm/onap4k8s/charts/mongo/templates/nfs-provisoner.yaml6
-rw-r--r--deployments/helm/onap4k8s/charts/mongo/templates/statefulset.yaml6
-rw-r--r--deployments/helm/onap4k8s/charts/multicloud-k8s/templates/deployment.yaml6
6 files changed, 24 insertions, 5 deletions
diff --git a/deployments/helm/onap4k8s/charts/common/templates/_ingress.tpl b/deployments/helm/onap4k8s/charts/common/templates/_ingress.tpl
index 9b274ad1..aeae726e 100644
--- a/deployments/helm/onap4k8s/charts/common/templates/_ingress.tpl
+++ b/deployments/helm/onap4k8s/charts/common/templates/_ingress.tpl
@@ -29,7 +29,7 @@
{{- define "common.ingress" -}}
{{- if .Values.ingress -}}
{{- if .Values.ingress.enabled -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: {{ include "common.fullname" . }}-ingress
diff --git a/deployments/helm/onap4k8s/charts/etcd/Chart.yaml b/deployments/helm/onap4k8s/charts/etcd/Chart.yaml
index 7da825ac..012a4e13 100644
--- a/deployments/helm/onap4k8s/charts/etcd/Chart.yaml
+++ b/deployments/helm/onap4k8s/charts/etcd/Chart.yaml
@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+apiVersion: v1
name: etcd
home: https://github.com/coreos/etcd
version: 5.0.0
diff --git a/deployments/helm/onap4k8s/charts/etcd/templates/statefulset.yaml b/deployments/helm/onap4k8s/charts/etcd/templates/statefulset.yaml
index 7190c5bc..a32f0485 100644
--- a/deployments/helm/onap4k8s/charts/etcd/templates/statefulset.yaml
+++ b/deployments/helm/onap4k8s/charts/etcd/templates/statefulset.yaml
@@ -11,7 +11,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/v1beta1
+apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ include "common.fullname" . }}
@@ -23,6 +23,12 @@ metadata:
spec:
serviceName: {{ include "common.servicename" .}}
replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ heritage: "{{ .Release.Service }}"
+ release: "{{ .Release.Name }}"
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+ app: {{ include "common.name" . }}
template:
metadata:
labels:
diff --git a/deployments/helm/onap4k8s/charts/mongo/templates/nfs-provisoner.yaml b/deployments/helm/onap4k8s/charts/mongo/templates/nfs-provisoner.yaml
index 355ad382..a69382e4 100644
--- a/deployments/helm/onap4k8s/charts/mongo/templates/nfs-provisoner.yaml
+++ b/deployments/helm/onap4k8s/charts/mongo/templates/nfs-provisoner.yaml
@@ -15,7 +15,7 @@
*/}}
{{ if not .Values.disableNfsProvisioner }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Values.nfsprovisionerPrefix }}-nfs-provisioner
@@ -26,6 +26,10 @@ metadata:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
+ selector:
+    matchLabels:
+ app: {{ .Values.nfsprovisionerPrefix }}-nfs-provisioner
+ release: {{ .Release.Name }}
#replicas: {{ .Values.replicaCount }}
strategy:
type: Recreate
diff --git a/deployments/helm/onap4k8s/charts/mongo/templates/statefulset.yaml b/deployments/helm/onap4k8s/charts/mongo/templates/statefulset.yaml
index c79739f5..c234ce3e 100644
--- a/deployments/helm/onap4k8s/charts/mongo/templates/statefulset.yaml
+++ b/deployments/helm/onap4k8s/charts/mongo/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,10 @@ metadata:
spec:
serviceName: {{ .Values.service.name }}
replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app: {{ include "common.name" . }}
+ release: {{ .Release.Name }}
template:
metadata:
labels:
diff --git a/deployments/helm/onap4k8s/charts/multicloud-k8s/templates/deployment.yaml b/deployments/helm/onap4k8s/charts/multicloud-k8s/templates/deployment.yaml
index 846a7513..907afd32 100644
--- a/deployments/helm/onap4k8s/charts/multicloud-k8s/templates/deployment.yaml
+++ b/deployments/helm/onap4k8s/charts/multicloud-k8s/templates/deployment.yaml
@@ -14,7 +14,7 @@
# limitations under the License.
*/}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
@@ -26,6 +26,10 @@ metadata:
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app: {{ include "common.name" . }}
+ release: {{ .Release.Name }}
template:
metadata:
labels: