github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make hyperkube work on all platforms, bump dnsmasq to 1.3 and addon-manager to v3, and always use the latest manifests

Browse Source
This commit is contained in:
Lucas Käldström
2016-06-19 17:15:17 +03:00
parent 8f5d081194
commit 6c53c6a997
18 changed files with 40 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base
View File

@@ -21,22 +21,22 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: kube-dns-v14
name: kube-dns-v15
namespace: kube-system
labels:
k8s-app: kube-dns
version: v14
version: v15
kubernetes.io/cluster-service: "true"
spec:
replicas: __PILLAR__DNS__REPLICAS__
selector:
k8s-app: kube-dns
version: v14
version: v15
template:
metadata:
labels:
k8s-app: kube-dns
version: v14
version: v15
kubernetes.io/cluster-service: "true"
spec:
containers:
@@ -83,7 +83,7 @@ spec:
name: dns-tcp-local
protocol: TCP
- name: dnsmasq
image: gcr.io/google_containers/dnsmasq:1.1
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.3
args:
- --cache-size=1000
- --no-resolv

10
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in
View File

@@ -21,22 +21,22 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: kube-dns-v14
name: kube-dns-v15
namespace: kube-system
labels:
k8s-app: kube-dns
version: v14
version: v15
kubernetes.io/cluster-service: "true"
spec:
replicas: {{ pillar['dns_replicas'] }}
selector:
k8s-app: kube-dns
version: v14
version: v15
template:
metadata:
labels:
k8s-app: kube-dns
version: v14
version: v15
kubernetes.io/cluster-service: "true"
spec:
containers:
@@ -83,7 +83,7 @@ spec:
name: dns-tcp-local
protocol: TCP
- name: dnsmasq
image: gcr.io/google_containers/dnsmasq:1.1
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.3
args:
- --cache-size=1000
- --no-resolv

10
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed
View File

@@ -21,22 +21,22 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: kube-dns-v14
name: kube-dns-v15
namespace: kube-system
labels:
k8s-app: kube-dns
version: v14
version: v15
kubernetes.io/cluster-service: "true"
spec:
replicas: $DNS_REPLICAS
selector:
k8s-app: kube-dns
version: v14
version: v15
template:
metadata:
labels:
k8s-app: kube-dns
version: v14
version: v15
kubernetes.io/cluster-service: "true"
spec:
containers:
@@ -83,7 +83,7 @@ spec:
name: dns-tcp-local
protocol: TCP
- name: dnsmasq
image: gcr.io/google_containers/dnsmasq:1.1
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.3
args:
- --cache-size=1000
- --no-resolv

2
cluster/saltbase/salt/kube-dns/skydns-svc.yaml.base
View File

@@ -30,7 +30,7 @@ metadata:
spec:
selector:
k8s-app: kube-dns
clusterIP: __PILLAR__DNS__SERVER__
clusterIP: __PILLAR__DNS__SERVER__
ports:
- name: dns
port: 53

2
cluster/saltbase/salt/kube-dns/skydns-svc.yaml.in
View File

@@ -30,7 +30,7 @@ metadata:
spec:
selector:
k8s-app: kube-dns
clusterIP: {{ pillar['dns_server'] }}
clusterIP: {{ pillar['dns_server'] }}
ports:
- name: dns
port: 53

2
cluster/saltbase/salt/kube-dns/skydns-svc.yaml.sed
View File

@@ -30,7 +30,7 @@ metadata:
spec:
selector:
k8s-app: kube-dns
clusterIP: $DNS_SERVER_IP
clusterIP: $DNS_SERVER_IP
ports:
- name: dns
port: 53