Merge pull request #18718 from mikedanese/kube-ui-v4

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-15 15:42:43 -08:00
commit e7e350dce9

View File

@ -1,27 +1,27 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: kube-ui-v3
name: kube-ui-v4
namespace: kube-system
labels:
k8s-app: kube-ui
version: v3
version: v4
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
k8s-app: kube-ui
version: v3
version: v4
template:
metadata:
labels:
k8s-app: kube-ui
version: v3
version: v4
kubernetes.io/cluster-service: "true"
spec:
containers:
- name: kube-ui
image: gcr.io/google_containers/kube-ui:v3
image: gcr.io/google_containers/kube-ui:v4
resources:
limits:
cpu: 100m