mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-04 11:08:16 -03:30
Add support for k8s v1.16.0-beta.2 (#5148)
Cleaned up deprecated APIs: apps/v1beta1 apps/v1beta2 extensions/v1beta1 for ds,deploy,rs Add workaround for deploying helm using incompatible deployment manifest. Change-Id: I78b36741348f47a999df3841ee63cf4e6f377830
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
637f09f140
commit
27ec548b88
@@ -3,7 +3,7 @@
|
||||
# as the Calico CNI plugins and network config on
|
||||
# each master and worker node in a Kubernetes cluster.
|
||||
kind: DaemonSet
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
metadata:
|
||||
name: calico-node
|
||||
namespace: kube-system
|
||||
|
||||
@@ -21,7 +21,7 @@ spec:
|
||||
|
||||
# This manifest creates a Deployment of Typha to back the above service.
|
||||
|
||||
apiVersion: apps/v1beta1
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: calico-typha
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: DaemonSet
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
metadata:
|
||||
name: canal-node
|
||||
namespace: kube-system
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# This manifest deploys the Contiv API Proxy Server on Kubernetes.
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
kind: DaemonSet
|
||||
metadata:
|
||||
name: contiv-api-proxy
|
||||
@@ -9,6 +9,9 @@ metadata:
|
||||
spec:
|
||||
updateStrategy:
|
||||
type: RollingUpdate
|
||||
selector:
|
||||
matchLabels:
|
||||
k8s-app: contiv-api-proxy
|
||||
template:
|
||||
metadata:
|
||||
name: contiv-api-proxy
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: DaemonSet
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
metadata:
|
||||
name: contiv-cleanup
|
||||
namespace: kube-system
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: DaemonSet
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
metadata:
|
||||
name: contiv-etcd-proxy
|
||||
namespace: kube-system
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: DaemonSet
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
metadata:
|
||||
name: contiv-etcd
|
||||
namespace: kube-system
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: DaemonSet
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
metadata:
|
||||
name: contiv-netmaster
|
||||
namespace: kube-system
|
||||
@@ -9,6 +9,9 @@ metadata:
|
||||
spec:
|
||||
updateStrategy:
|
||||
type: RollingUpdate
|
||||
selector:
|
||||
matchLabels:
|
||||
k8s-app: contiv-netmaster
|
||||
template:
|
||||
metadata:
|
||||
name: contiv-netmaster
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
# as the Contiv CNI plugins and network config on
|
||||
# each master and worker node in a Kubernetes cluster.
|
||||
kind: DaemonSet
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
metadata:
|
||||
name: contiv-netplugin
|
||||
namespace: kube-system
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
apiVersion: apps/v1
|
||||
# This manifest deploys the contiv-ovs pod.
|
||||
kind: DaemonSet
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
metadata:
|
||||
name: contiv-ovs
|
||||
namespace: kube-system
|
||||
|
||||
@@ -37,7 +37,7 @@ data:
|
||||
}
|
||||
}
|
||||
---
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
kind: DaemonSet
|
||||
metadata:
|
||||
name: kube-flannel
|
||||
@@ -46,6 +46,10 @@ metadata:
|
||||
tier: node
|
||||
k8s-app: flannel
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
tier: node
|
||||
k8s-app: flannel
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
|
||||
@@ -41,7 +41,7 @@ data:
|
||||
current-context: kube-router-context
|
||||
|
||||
---
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
kind: DaemonSet
|
||||
metadata:
|
||||
labels:
|
||||
@@ -55,6 +55,10 @@ spec:
|
||||
rollingUpdate:
|
||||
maxUnavailable: 1
|
||||
type: RollingUpdate
|
||||
selector:
|
||||
matchLabels:
|
||||
k8s-app: kube-router
|
||||
tier: node
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: DaemonSet
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
metadata:
|
||||
name: kube-multus-ds-amd64
|
||||
namespace: kube-system
|
||||
@@ -8,6 +8,10 @@ metadata:
|
||||
tier: node
|
||||
app: multus
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
tier: node
|
||||
app: multus
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
|
||||
@@ -101,7 +101,7 @@ items:
|
||||
- kind: ServiceAccount
|
||||
name: weave-net
|
||||
namespace: kube-system
|
||||
- apiVersion: extensions/v1beta1
|
||||
- apiVersion: apps/v1
|
||||
kind: DaemonSet
|
||||
metadata:
|
||||
name: weave-net
|
||||
@@ -110,6 +110,9 @@ items:
|
||||
namespace: kube-system
|
||||
spec:
|
||||
minReadySeconds: 5
|
||||
selector:
|
||||
matchLabels:
|
||||
name: weave-net
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
|
||||
Reference in New Issue
Block a user