diff --git a/build/dependencies.yaml b/build/dependencies.yaml index eb4fd33f46b4..02e8d3e93748 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -19,7 +19,7 @@ dependencies: - path: cmd/kubeadm/app/constants/constants.go - path: hack/lib/etcd.sh match: ETCD_VERSION= - - path: staging/src/k8s.io/sample-apiserver/artifacts/example/rc.yaml + - path: staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml match: quay.io/coreos/etcd - path: test/e2e/framework/nodes_util.go match: const etcdImage diff --git a/staging/src/k8s.io/sample-apiserver/README.md b/staging/src/k8s.io/sample-apiserver/README.md index b1e942e7f3d4..cd09302eb019 100644 --- a/staging/src/k8s.io/sample-apiserver/README.md +++ b/staging/src/k8s.io/sample-apiserver/README.md @@ -119,7 +119,7 @@ docker push MYPREFIX/kube-sample-apiserver:MYTAG ### Deploy into a Kubernetes Cluster -Edit `artifacts/example/rc.yaml`, updating the pod template's image +Edit `artifacts/example/deployment.yaml`, updating the pod template's image reference to match what you pushed and setting the `imagePullPolicy` to something suitable. Then call: diff --git a/staging/src/k8s.io/sample-apiserver/artifacts/example/rc.yaml b/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml similarity index 90% rename from staging/src/k8s.io/sample-apiserver/artifacts/example/rc.yaml rename to staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml index c2f05b748052..6dbcc2c6cd4e 100644 --- a/staging/src/k8s.io/sample-apiserver/artifacts/example/rc.yaml +++ b/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml @@ -1,5 +1,5 @@ -apiVersion: v1 -kind: ReplicationController +apiVersion: apps/v1 +kind: Deployment metadata: name: wardle-server namespace: wardle @@ -8,7 +8,8 @@ metadata: spec: replicas: 1 selector: - apiserver: "true" + matchLabels: + apiserver: "true" template: metadata: labels: diff --git a/staging/src/k8s.io/sample-apiserver/docs/minikube-walkthrough.md b/staging/src/k8s.io/sample-apiserver/docs/minikube-walkthrough.md index 48751b2528ed..0485be144b8e 100644 --- a/staging/src/k8s.io/sample-apiserver/docs/minikube-walkthrough.md +++ b/staging/src/k8s.io/sample-apiserver/docs/minikube-walkthrough.md @@ -48,7 +48,7 @@ docker push /kube-sample-apiserver ## Modify the replication controller -You need to modify the [artifacts/example/rc.yaml](/artifacts/example/rc.yaml) file to change the ```imagePullPolicy``` to ```Always``` or ```IfNotPresent```. +You need to modify the [artifacts/example/deployment.yaml](/artifacts/example/deployment.yaml) file to change the ```imagePullPolicy``` to ```Always``` or ```IfNotPresent```. You also need to change the image from ```kube-sample-apiserver:latest``` to ```/kube-sample-apiserver:latest```. For example: @@ -83,7 +83,7 @@ kubectl create -f artifacts/example/rbac.yaml kubectl create -f artifacts/example/rbac-bind.yaml # create the service and replication controller -kubectl create -f artifacts/example/rc.yaml -n wardle +kubectl create -f artifacts/example/deployment.yaml -n wardle kubectl create -f artifacts/example/service.yaml -n wardle # create the apiservice object that tells kubernetes about your api extension and where in the cluster the server is located