Upgrade addons to use apps/v1 instead of extensions/v1beta1
extensions/v1beta1 are deprecated and will not be served with kubernetes 1.16 anymore. For Deployment,DaemonSet and StatefulSet the apps/v1 api has been present since kubernetes 1.9. See following blog post for details: https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16/pull/5028/head
parent
21c5218a9b
commit
3056ca2d48
|
|
@ -13,7 +13,7 @@
|
|||
# limitations under the License.
|
||||
|
||||
---
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: nginx-ingress-controller
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: metrics-server
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
kind: DaemonSet
|
||||
metadata:
|
||||
labels:
|
||||
|
|
@ -7,9 +7,14 @@ metadata:
|
|||
name: registry-proxy
|
||||
namespace: kube-system
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
registry-proxy: "true"
|
||||
kubernetes.io/minikube-addons: registry
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
registry-proxy: "true"
|
||||
kubernetes.io/minikube-addons: registry
|
||||
addonmanager.kubernetes.io/mode: Reconcile
|
||||
spec:
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@ metadata:
|
|||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
glusterfs: pod
|
||||
glusterfs-node: pod
|
||||
k8s-app: storage-provisioner-gluster
|
||||
template:
|
||||
metadata:
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ data:
|
|||
|
||||
---
|
||||
kind: Deployment
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
metadata:
|
||||
namespace: storage-gluster
|
||||
name: heketi
|
||||
|
|
@ -100,6 +100,11 @@ metadata:
|
|||
description: Defines how to deploy Heketi
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
glusterfs: heketi-pod
|
||||
heketi: pod
|
||||
k8s-app: storage-provisioner-gluster
|
||||
template:
|
||||
metadata:
|
||||
namespace: storage-gluster
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ subjects:
|
|||
name: glusterfile-provisioner
|
||||
---
|
||||
kind: Deployment
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
metadata:
|
||||
namespace: storage-gluster
|
||||
name: glusterfile-provisioner
|
||||
|
|
@ -89,6 +89,10 @@ metadata:
|
|||
description: Defines how to deploy the glusterfile provisioner pod.
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
glusterfs: file-provisioner-pod
|
||||
glusterfile: provisioner-pod
|
||||
strategy:
|
||||
type: Recreate
|
||||
template:
|
||||
|
|
|
|||
|
|
@ -206,10 +206,7 @@ func testRegistry(t *testing.T) {
|
|||
if err := kapi.WaitForPodsWithLabelRunning(client, "kube-system", rs); err != nil {
|
||||
t.Fatalf("waiting for registry pods: %v", err)
|
||||
}
|
||||
ps, err := labels.Parse("kubernetes.io/minikube-addons=registry,actual-registry!=true")
|
||||
if err != nil {
|
||||
t.Fatalf("Unable to parse selector: %v", err)
|
||||
}
|
||||
ps := labels.SelectorFromSet(labels.Set(map[string]string{"registry-proxy": "true"}))
|
||||
if err := kapi.WaitForPodsWithLabelRunning(client, "kube-system", ps); err != nil {
|
||||
t.Fatalf("waiting for registry-proxy pods: %v", err)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue