Merge pull request #53187 from CaoShuFeng/sample-apiserver-example

Automatic merge from submit-queue (batch tested with PRs 53263, 52967, 53262, 52654, 53187). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix sample-apiserver artifacts The example yaml file for sample-apiserver has some errors. Fix them. **Release note**: ``` NONE ```

Merge pull request #53187 from CaoShuFeng/sample-apiserver-example
030e2330 · Kubernetes Submit Queue · GitHub · 887598c2 · 42b443c5 · 030e2330
Commit 030e2330 authored Sep 29, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 29, 2017
5 changed files
--- a/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-delegator.yaml
+++ b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-delegator.yaml
-apiVersion: rbac.authorization.k8s.io/v1alpha1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
  name: apiextensions:system:auth-delegator
@@ -7,7 +7,6 @@ roleRef:
  kind: ClusterRole
  name: system:auth-delegator
 subjects:
- apiVersion: v1
+- kind: ServiceAccount
-  kind: ServiceAccount
  name: apiserver
  namespace: apiextensions
--- a/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-reader.yaml
+++ b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-reader.yaml
-apiVersion: rbac.authorization.k8s.io/v1alpha1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
  name: apiextensions-auth-reader
@@ -8,7 +8,6 @@ roleRef:
  kind: Role
  name: extension-apiserver-authentication-reader
 subjects:
- apiVersion: v1
+- kind: ServiceAccount
-  kind: ServiceAccount
  name: apiserver
  namespace: apiextensions
--- a/staging/src/k8s.io/sample-apiserver/artifacts/example/auth-delegator.yaml
+++ b/staging/src/k8s.io/sample-apiserver/artifacts/example/auth-delegator.yaml
-apiVersion: rbac.authorization.k8s.io/v1alpha1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
  name: wardle:system:auth-delegator
@@ -7,7 +7,6 @@ roleRef:
  kind: ClusterRole
  name: system:auth-delegator
 subjects:
- apiVersion: v1
+- kind: ServiceAccount
-  kind: ServiceAccount
  name: apiserver
  namespace: wardle
--- a/staging/src/k8s.io/sample-apiserver/artifacts/example/auth-reader.yaml
+++ b/staging/src/k8s.io/sample-apiserver/artifacts/example/auth-reader.yaml
-apiVersion: rbac.authorization.k8s.io/v1alpha1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
  name: wardle-auth-reader
@@ -8,7 +8,6 @@ roleRef:
  kind: Role
  name: extension-apiserver-authentication-reader
 subjects:
- apiVersion: v1
+- kind: ServiceAccount
-  kind: ServiceAccount
  name: apiserver
  namespace: wardle
--- a/staging/src/k8s.io/sample-apiserver/artifacts/example/rc.yaml
+++ b/staging/src/k8s.io/sample-apiserver/artifacts/example/rc.yaml
@@ -19,7 +19,6 @@ spec:
      - name: wardle-server
        image: kube-sample-apiserver:latest
        imagePullPolicy: Never
-        args:
+        command: [ "/kube-sample-apiserver", "--etcd-servers=http://localhost:2379" ]
-        - "--etcd-servers=http://localhost:2379"
      - name: etcd
        image: quay.io/coreos/etcd:v3.0.17