github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10771 from ArtfulCoder/kube2sky-usev1

Browse Source 
rebuilt kube2sky to use v1 api. new image ver is 1.11
This commit is contained in:
Yu-Ju Hong 2015-07-06 15:00:21 -07:00
commit 4a5b80fcb2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/dns/kube2sky/Makefile
View File

@ -4,7 +4,7 @@
.PHONY: all kube2sky container push clean test .PHONY: all kube2sky container push clean test
TAG = 1.10 TAG = 1.11
PREFIX = gcr.io/google_containers PREFIX = gcr.io/google_containers
all: container all: container

10
cluster/addons/dns/skydns-rc.yaml.in
View File

@ -1,22 +1,22 @@
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: kube-dns-v4 name: kube-dns-v5
namespace: default namespace: default
labels: labels:
k8s-app: kube-dns k8s-app: kube-dns
version: v4 version: v5
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: {{ pillar['dns_replicas'] }} replicas: {{ pillar['dns_replicas'] }}
selector: selector:
k8s-app: kube-dns k8s-app: kube-dns
version: v4 version: v5
template: template:
metadata: metadata:
labels: labels:
k8s-app: kube-dns k8s-app: kube-dns
version: v4 version: v5
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
@ -35,7 +35,7 @@ spec:
- -initial-cluster-token - -initial-cluster-token
- skydns-etcd - skydns-etcd
- name: kube2sky - name: kube2sky
image: gcr.io/google_containers/kube2sky:1.10 image: gcr.io/google_containers/kube2sky:1.11
resources: resources:
limits: limits:
cpu: 100m cpu: 100m