summaryrefslogtreecommitdiffstats
path: root/kud/deployment_infra/images
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 /kud/deployment_infra/images
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 'kud/deployment_infra/images')
-rw-r--r--kud/deployment_infra/images/multus-daemonset.yml6
-rw-r--r--kud/deployment_infra/images/nfn.yml10
-rw-r--r--kud/deployment_infra/images/sriov-cni.yml6
-rw-r--r--kud/deployment_infra/images/sriov-daemonset.yml6
4 files changed, 23 insertions, 5 deletions
diff --git a/kud/deployment_infra/images/multus-daemonset.yml b/kud/deployment_infra/images/multus-daemonset.yml
index 0c41a052..d6d8d533 100644
--- a/kud/deployment_infra/images/multus-daemonset.yml
+++ b/kud/deployment_infra/images/multus-daemonset.yml
@@ -101,7 +101,7 @@ data:
"kubeconfig": "/etc/cni/net.d/multus.d/multus.kubeconfig"
}
---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: DaemonSet
metadata:
name: kube-multus-ds-amd64
@@ -110,6 +110,10 @@ metadata:
tier: node
app: multus
spec:
+ selector:
+ matchLabels:
+ tier: node
+ app: multus
updateStrategy:
type: RollingUpdate
template:
diff --git a/kud/deployment_infra/images/nfn.yml b/kud/deployment_infra/images/nfn.yml
index 2e033e04..5c5e4442 100644
--- a/kud/deployment_infra/images/nfn.yml
+++ b/kud/deployment_infra/images/nfn.yml
@@ -448,7 +448,7 @@ data:
kubeconfig=/etc/kubernetes/admin.conf
---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: DaemonSet
metadata:
name: ovn4nfv-cni
@@ -456,6 +456,9 @@ metadata:
labels:
app: ovn4nfv
spec:
+ selector:
+ matchLabels:
+ app: ovn4nfv
updateStrategy:
type: RollingUpdate
template:
@@ -505,7 +508,7 @@ spec:
path: ovn4nfv_k8s.conf
---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: DaemonSet
metadata:
name: nfn-agent
@@ -513,6 +516,9 @@ metadata:
labels:
app: nfn-agent
spec:
+ selector:
+ matchLabels:
+ app: nfn-agent
updateStrategy:
type: RollingUpdate
template:
diff --git a/kud/deployment_infra/images/sriov-cni.yml b/kud/deployment_infra/images/sriov-cni.yml
index bd943d04..7503b872 100644
--- a/kud/deployment_infra/images/sriov-cni.yml
+++ b/kud/deployment_infra/images/sriov-cni.yml
@@ -2,7 +2,7 @@
# Based on:
# https://github.com/intel/sriov-cni/blob/master/images/sriov-cni-daemonset.yaml
---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: DaemonSet
metadata:
name: kube-sriov-cni-ds-amd64
@@ -11,6 +11,10 @@ metadata:
tier: node
app: sriov-cni
spec:
+ selector:
+ matchLabels:
+ tier: node
+ app: sriov-cni
template:
metadata:
labels:
diff --git a/kud/deployment_infra/images/sriov-daemonset.yml b/kud/deployment_infra/images/sriov-daemonset.yml
index 72f33869..e392028d 100644
--- a/kud/deployment_infra/images/sriov-daemonset.yml
+++ b/kud/deployment_infra/images/sriov-daemonset.yml
@@ -27,7 +27,7 @@ metadata:
namespace: kube-system
---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: DaemonSet
metadata:
name: kube-sriov-device-plugin-amd64
@@ -36,6 +36,10 @@ metadata:
tier: node
app: sriovdp
spec:
+ selector:
+ matchLabels:
+ tier: node
+ app: sriovdp
template:
metadata:
labels: