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

Merge pull request #18733 from ArtfulCoder/kube2sky-ver

Browse Source 
update kube2sky version
This commit is contained in:
Abhi Shah 2015-12-16 13:42:01 -08:00
commit 89670c1df8
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/addons/dns/kube2sky/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
kube2sky

5
cluster/addons/dns/kube2sky/Changelog
View File

@ -1,3 +1,8 @@
## Version 1.12 (Dec 15 2015 Abhishek Shah <abshah@google.com>)
- Gave pods their own cache store. (034ecbd)
- Allow pods to have dns. (717660a)
## Version 1.10 (Jun 19 2015 Tim Hockin <thockin@google.com>) ## Version 1.10 (Jun 19 2015 Tim Hockin <thockin@google.com>)
- Fall back on service account tokens if no other auth is specified. - Fall back on service account tokens if no other auth is specified.

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.11 TAG = 1.12
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-v9 name: kube-dns-v10
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: kube-dns k8s-app: kube-dns
version: v9 version: v10
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: v9 version: v10
template: template:
metadata: metadata:
labels: labels:
k8s-app: kube-dns k8s-app: kube-dns
version: v9 version: v10
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
@ -40,7 +40,7 @@ spec:
- name: etcd-storage - name: etcd-storage
mountPath: /var/etcd/data mountPath: /var/etcd/data
- name: kube2sky - name: kube2sky
image: gcr.io/google_containers/kube2sky:1.11 image: gcr.io/google_containers/kube2sky:1.12
resources: resources:
limits: limits:
cpu: 100m cpu: 100m