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

Merge pull request #68161 from tallclair/runtimeclass-addon
e2e60d27 · Kubernetes Submit Queue · GitHub · 70a0089a · a58008ee · e2e60d27
Unverified Commit e2e60d27 authored Sep 05, 2018 by Kubernetes Submit Queue Committed by GitHub Sep 05, 2018
4 changed files
--- a/cluster/addons/runtimeclass/OWNERS
+++ b/cluster/addons/runtimeclass/OWNERS
+approvers:
+- tallclair
+- dchen1107
+reviewers:
+- sig-node-reviewers
--- a/cluster/addons/runtimeclass/README.md
+++ b/cluster/addons/runtimeclass/README.md
+# 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)]()
--- a/cluster/addons/runtimeclass/runtimeclass_crd.yaml
+++ b/cluster/addons/runtimeclass/runtimeclass_crd.yaml
+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])?)*$'
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -2514,11 +2514,15 @@ EOF
      setup-addon-manifests "addons" "istio/noauth"
    fi
  fi
+  if [[ "${FEATURE_GATES:-}" =~ "RuntimeClass=true" ]]; then
+    setup-addon-manifests "addons" "runtimeclass"
+  fi
  if [[ -n "${EXTRA_ADDONS_URL:-}" ]]; then
    download-extra-addons
    setup-addon-manifests "addons" "gce-extras"
  fi

+
  # Place addon manager pod manifest.
  src_file="${src_dir}/kube-addon-manager.yaml"
  sed -i -e "s@{{kubectl_extra_prune_whitelist}}@${ADDON_MANAGER_PRUNE_WHITELIST:-}@g" "${src_file}"