Get rid of v1beta1 API version in ds/deployment

Here are the changes necessary for k8s v1.16.0, but
apiVersion appeared in v1.9, so with current k8s v1.13.0
it should work.

Change-Id: Id5fc215f78fb5ba1dc75f6764d87afa8d5bd23f5
Implements: blueprint move-to-v1-api-from-v1beta1-api
Signed-off-by: Alexey Perevalov <a.perevalov@samsung.com>
This commit is contained in:
Alexey Perevalov
2019-10-03 17:22:33 +03:00
parent 232509ee66
commit a5dafba3e6
2 changed files with 13 additions and 7 deletions

View File

@@ -423,7 +423,7 @@ metadata:
namespace: kube-system namespace: kube-system
--- ---
kind: ClusterRole kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
metadata: metadata:
name: kuryr-controller name: kuryr-controller
rules: rules:
@@ -462,7 +462,7 @@ rules:
- get - get
--- ---
kind: ClusterRoleBinding kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
metadata: metadata:
name: kuryr-controller-global name: kuryr-controller-global
subjects: subjects:
@@ -483,7 +483,7 @@ function generate_controller_deployment() {
mkdir -p "$output_dir" mkdir -p "$output_dir"
rm -f ${output_dir}/controller_deployment.yml rm -f ${output_dir}/controller_deployment.yml
cat >> "${output_dir}/controller_deployment.yml" << EOF cat >> "${output_dir}/controller_deployment.yml" << EOF
apiVersion: apps/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
@@ -492,6 +492,9 @@ metadata:
namespace: kube-system namespace: kube-system
spec: spec:
replicas: ${KURYR_CONTROLLER_REPLICAS:-1} replicas: ${KURYR_CONTROLLER_REPLICAS:-1}
selector:
matchLabels:
name: kuryr-controller
EOF EOF
# When running without HA we should make sure that we won't have more than # When running without HA we should make sure that we won't have more than
@@ -578,20 +581,23 @@ function generate_cni_daemon_set() {
mkdir -p "$output_dir" mkdir -p "$output_dir"
rm -f ${output_dir}/cni_ds.yml rm -f ${output_dir}/cni_ds.yml
cat >> "${output_dir}/cni_ds.yml" << EOF cat >> "${output_dir}/cni_ds.yml" << EOF
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: kuryr-cni-ds name: kuryr-cni-ds
namespace: kube-system namespace: kube-system
labels: labels:
tier: node tier: node
app: kuryr app: kuryr-cni
spec: spec:
selector:
matchLabels:
app: kuryr-cni
template: template:
metadata: metadata:
labels: labels:
tier: node tier: node
app: kuryr app: kuryr-cni
spec: spec:
hostNetwork: true hostNetwork: true
tolerations: tolerations:

View File

@@ -848,7 +848,7 @@ EOF
cat >> "${output_dir}/coredns.yml" << EOF cat >> "${output_dir}/coredns.yml" << EOF
} }
--- ---
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: coredns name: coredns