From 42b443c51a421e2a5a380b826dd93bd3ed6b8cef Mon Sep 17 00:00:00 2001
From: Cao Shufeng <caosf.fnst@cn.fujitsu.com>
Date: Thu, 28 Sep 2017 16:31:55 +0800
Subject: [PATCH] fix sample-apiserver artifacts

---
 .../artifacts/example/auth-delegator.yaml                    | 5 ++---
 .../artifacts/example/auth-reader.yaml                       | 5 ++---
 .../sample-apiserver/artifacts/example/auth-delegator.yaml   | 5 ++---
 .../sample-apiserver/artifacts/example/auth-reader.yaml      | 5 ++---
 .../src/k8s.io/sample-apiserver/artifacts/example/rc.yaml    | 3 +--
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-delegator.yaml b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-delegator.yaml
index f910f903a75..ef608eced02 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-delegator.yaml
+++ b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-delegator.yaml
@@ -1,4 +1,4 @@
-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
diff --git a/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-reader.yaml b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-reader.yaml
index 9c897b62418..4f0f0e2b64b 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-reader.yaml
+++ b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-reader.yaml
@@ -1,4 +1,4 @@
-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
diff --git a/staging/src/k8s.io/sample-apiserver/artifacts/example/auth-delegator.yaml b/staging/src/k8s.io/sample-apiserver/artifacts/example/auth-delegator.yaml
index 49767b92629..25116156bd9 100644
--- a/staging/src/k8s.io/sample-apiserver/artifacts/example/auth-delegator.yaml
+++ b/staging/src/k8s.io/sample-apiserver/artifacts/example/auth-delegator.yaml
@@ -1,4 +1,4 @@
-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
diff --git a/staging/src/k8s.io/sample-apiserver/artifacts/example/auth-reader.yaml b/staging/src/k8s.io/sample-apiserver/artifacts/example/auth-reader.yaml
index 2cadd4250cf..3482bc03259 100644
--- a/staging/src/k8s.io/sample-apiserver/artifacts/example/auth-reader.yaml
+++ b/staging/src/k8s.io/sample-apiserver/artifacts/example/auth-reader.yaml
@@ -1,4 +1,4 @@
-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
diff --git a/staging/src/k8s.io/sample-apiserver/artifacts/example/rc.yaml b/staging/src/k8s.io/sample-apiserver/artifacts/example/rc.yaml
index 9b5ac8c8314..04238c9afbd 100644
--- 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:
-        - "--etcd-servers=http://localhost:2379"
+        command: [ "/kube-sample-apiserver", "--etcd-servers=http://localhost:2379" ]
       - name: etcd
         image: quay.io/coreos/etcd:v3.0.17