Skip to content

K
k3s
Unverified Commit e2e60d27 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #68161 from tallclair/runtimeclass-addon

Automatic merge from submit-queue (batch tested with PRs 68161, 68023, 67909, 67955, 67731). If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md. Register RuntimeClass CRD as an addon **What this PR does / why we need it**: Register the RuntimeClass CRD when the RuntimeClass feature gate is enabled. This is done in through the addon manager. This is an alternative approach to https://github.com/kubernetes/kubernetes/pull/67924 **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: For https://github.com/kubernetes/features/issues/585 **Release note**: Covered by #67737 ```release-note NONE ``` /sig node /kind feature /priority important-soon /milestone v1.12
parents 70a0089a a58008ee
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 0 deletions
cluster/addons/runtimeclass/OWNERS 0 → 100644
View file @ e2e60d27
approvers:
- tallclair
- dchen1107
reviewers:
- sig-node-reviewers
cluster/addons/runtimeclass/README.md 0 → 100644
View file @ e2e60d27
# RuntimeClass
RuntimeClass is an alpha feature for supporting multiple container runtimes within a cluster. When
enabled, pods can select a RuntimeClass to run with using the `PodSpec.RuntimeClassName` field.
To enable RuntimeClass, set the feature gate `RuntimeClass=true`, and ensure the CRD defined in this
directory is installed.
For more information, see:
https://github.com/kubernetes/community/blob/master/keps/sig-node/0014-runtime-class.md
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/addons/runtimeclass/README.md?pixel)]()
cluster/addons/runtimeclass/runtimeclass_crd.yaml 0 → 100644
View file @ e2e60d27
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])?)*$'
cluster/gce/gci/configure-helper.sh
View file @ e2e60d27
...@@ -2514,11 +2514,15 @@ EOF ...@@ -2514,11 +2514,15 @@ EOF
setup-addon-manifests "addons" "istio/noauth" setup-addon-manifests "addons" "istio/noauth"
fi fi
fi fi
if [[ "${FEATURE_GATES:-}" =~ "RuntimeClass=true" ]]; then
setup-addon-manifests "addons" "runtimeclass"
fi
if [[ -n "${EXTRA_ADDONS_URL:-}" ]]; then if [[ -n "${EXTRA_ADDONS_URL:-}" ]]; then
download-extra-addons download-extra-addons
setup-addon-manifests "addons" "gce-extras" setup-addon-manifests "addons" "gce-extras"
fi fi
# Place addon manager pod manifest. # Place addon manager pod manifest.
src_file="${src_dir}/kube-addon-manager.yaml" src_file="${src_dir}/kube-addon-manager.yaml"
sed -i -e "s@{{kubectl_extra_prune_whitelist}}@${ADDON_MANAGER_PRUNE_WHITELIST:-}@g" "${src_file}" sed -i -e "s@{{kubectl_extra_prune_whitelist}}@${ADDON_MANAGER_PRUNE_WHITELIST:-}@g" "${src_file}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment