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
```
This commit is contained in:
Kubernetes Submit Queue 2017-09-29 13:37:34 -07:00 committed by GitHub
commit 030e23306f
5 changed files with 9 additions and 14 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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