summaryrefslogtreecommitdiffstats
path: root/kud/deployment_infra
diff options
context:
space:
mode:
Diffstat (limited to 'kud/deployment_infra')
-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
-rw-r--r--kud/deployment_infra/playbooks/kud-vars.yml4
5 files changed, 25 insertions, 7 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:
diff --git a/kud/deployment_infra/playbooks/kud-vars.yml b/kud/deployment_infra/playbooks/kud-vars.yml
index e5438ae4..4988a473 100644
--- a/kud/deployment_infra/playbooks/kud-vars.yml
+++ b/kud/deployment_infra/playbooks/kud-vars.yml
@@ -57,10 +57,10 @@ cmk_untaint_required: true
#cmk_exclusive_mode: packed # choose between: packed, spread, default: packed
go_version: '1.12.5'
-kubespray_version: 2.10.4
+kubespray_version: 2.12.6
helm_client_version: 2.13.1
# kud playbooks not compatible with 2.8.0 - see MULTICLOUD-634
-ansible_version: 2.7.10
+ansible_version: 2.9.7
sriov_dest: "{{ base_dest }}/sriov"
sriov_driver_source_type: "tarball"