diff --git a/clr-k8s-examples/8-kata/kata-fc-runtimeClass.yaml b/clr-k8s-examples/8-kata/kata-fc-runtimeClass.yaml index 5ae4d88..dc01988 100644 --- a/clr-k8s-examples/8-kata/kata-fc-runtimeClass.yaml +++ b/clr-k8s-examples/8-kata/kata-fc-runtimeClass.yaml @@ -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 diff --git a/clr-k8s-examples/8-kata/kata-qemu-runtimeClass.yaml b/clr-k8s-examples/8-kata/kata-qemu-runtimeClass.yaml index d3fec57..b5f75f0 100644 --- a/clr-k8s-examples/8-kata/kata-qemu-runtimeClass.yaml +++ b/clr-k8s-examples/8-kata/kata-qemu-runtimeClass.yaml @@ -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 diff --git a/clr-k8s-examples/8-kata/runtimeclass_crd.yaml b/clr-k8s-examples/8-kata/runtimeclass_crd.yaml deleted file mode 100644 index cbb0974..0000000 --- a/clr-k8s-examples/8-kata/runtimeclass_crd.yaml +++ /dev/null @@ -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])?)*)?$' diff --git a/clr-k8s-examples/kubeadm.yaml b/clr-k8s-examples/kubeadm.yaml index 5a0af75..de436b2 100644 --- a/clr-k8s-examples/kubeadm.yaml +++ b/clr-k8s-examples/kubeadm.yaml @@ -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