runtimeClass updates for kubernetes 1.14

RuntimeClass moved from alpha to beta. Remove the feature gates, remove
the runtimeClass CRD since it is a built in type, and take the new data
structure into account.

Fixes: #77

Signed-off-by: Eric Ernst <eric.ernst@intel.com>
This commit is contained in:
Eric Ernst
2019-03-27 20:10:28 -07:00
committed by Ganesh Maharaj Mahalingam
parent d0c7bb3513
commit f863bb7f1f
4 changed files with 8 additions and 41 deletions
@@ -1,6 +1,5 @@
kind: RuntimeClass
apiVersion: node.k8s.io/v1alpha1
apiVersion: node.k8s.io/v1beta1
metadata:
name: kata-fc
spec:
runtimeHandler: kata-fc
handler: kata-fc
@@ -1,14 +1,12 @@
---
kind: RuntimeClass
apiVersion: node.k8s.io/v1alpha1
apiVersion: node.k8s.io/v1beta1
metadata:
name: kata
spec:
runtimeHandler: kata-qemu
handler: kata
---
kind: RuntimeClass
apiVersion: node.k8s.io/v1alpha1
apiVersion: node.k8s.io/v1beta1
metadata:
name: kata-qemu
spec:
runtimeHandler: kata-qemu
handler: kata-qemu
@@ -1,26 +0,0 @@
kind: CustomResourceDefinition
apiVersion: apiextensions.k8s.io/v1beta1
metadata:
name: runtimeclasses.node.k8s.io
labels:
addonmanager.kubernetes.io/mode: Reconcile
spec:
group: node.k8s.io
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
names:
plural: runtimeclasses
singular: runtimeclass
kind: RuntimeClass
scope: Cluster
validation:
openAPIV3Schema:
properties:
spec:
properties:
runtimeHandler:
type: string
pattern: '^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)?$'
+2 -6
View File
@@ -1,12 +1,10 @@
apiVersion: kubeadm.k8s.io/v1alpha3
apiVersion: kubeadm.k8s.io/v1beta1
kind: InitConfiguration
nodeRegistration:
criSocket: /var/run/crio/crio.sock
---
apiVersion: kubelet.config.k8s.io/v1beta1
kind: KubeletConfiguration
featureGates:
RuntimeClass: true
# Allowing for CPU pinning and isolation in case of guaranteed QoS class
cpuManagerPolicy: static
systemReserved:
@@ -16,11 +14,9 @@ kubeReserved:
cpu: 500m
memory: 256M
---
apiVersion: kubeadm.k8s.io/v1alpha3
apiVersion: kubeadm.k8s.io/v1beta1
kind: ClusterConfiguration
networking:
dnsDomain: cluster.local
podSubnet: 10.244.0.0/16
serviceSubnet: 10.96.0.0/12
apiServerExtraArgs:
feature-gates: RuntimeClass=true