mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 05:27:21 +00:00
Update the DNS replication controller to be v1beta3.
This commit is contained in:
parent
1b7749b8d9
commit
07adb84c23
@ -1,63 +1,55 @@
|
|||||||
|
apiVersion: v1beta3
|
||||||
kind: ReplicationController
|
kind: ReplicationController
|
||||||
apiVersion: v1beta1
|
metadata:
|
||||||
id: kube-dns
|
|
||||||
namespace: default
|
|
||||||
labels:
|
labels:
|
||||||
k8s-app: kube-dns
|
k8s-app: kube-dns
|
||||||
kubernetes.io/cluster-service: "true"
|
kubernetes.io/cluster-service: "true"
|
||||||
desiredState:
|
|
||||||
replicas: {{ pillar['dns_replicas'] }}
|
|
||||||
replicaSelector:
|
|
||||||
k8s-app: kube-dns
|
|
||||||
podTemplate:
|
|
||||||
labels:
|
|
||||||
name: kube-dns
|
name: kube-dns
|
||||||
|
namespace: default
|
||||||
|
spec:
|
||||||
|
replicas: {{ pillar['dns_replicas'] }}
|
||||||
|
selector:
|
||||||
|
k8s-app: kube-dns
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
k8s-app: kube-dns
|
k8s-app: kube-dns
|
||||||
kubernetes.io/cluster-service: "true"
|
kubernetes.io/cluster-service: "true"
|
||||||
desiredState:
|
name: kube-dns
|
||||||
manifest:
|
spec:
|
||||||
version: v1beta2
|
|
||||||
id: kube-dns
|
|
||||||
dnsPolicy: "Default" # Don't use cluster DNS.
|
|
||||||
containers:
|
containers:
|
||||||
- name: etcd
|
- name: etcd
|
||||||
image: gcr.io/google_containers/etcd:2.0.9
|
image: gcr.io/google_containers/etcd:2.0.9
|
||||||
command: [
|
command:
|
||||||
"/usr/local/bin/etcd",
|
- /usr/local/bin/etcd
|
||||||
"--addr",
|
- --addr
|
||||||
"127.0.0.1:4001",
|
- 127.0.0.1:4001
|
||||||
"--bind-addr",
|
- --bind-addr
|
||||||
"127.0.0.1:4001",
|
- 127.0.0.1:4001
|
||||||
"-initial-cluster-token=skydns-etcd",
|
- -initial-cluster-token=skydns-etcd
|
||||||
]
|
|
||||||
- name: kube2sky
|
- name: kube2sky
|
||||||
image: gcr.io/google_containers/kube2sky:1.4
|
image: gcr.io/google_containers/kube2sky:1.4
|
||||||
|
args:
|
||||||
|
# entrypoint = "/kube2sky"
|
||||||
|
- -domain={{ pillar['dns_domain'] }}
|
||||||
|
- -kubecfg_file=/etc/dns_token/kubeconfig
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: dns-token
|
- mountPath: /etc/dns_token
|
||||||
mountPath: /etc/dns_token
|
name: dns-token
|
||||||
readOnly: true
|
readOnly: true
|
||||||
command: [
|
|
||||||
# entrypoint = "/kube2sky",
|
|
||||||
"-domain={{ pillar['dns_domain'] }}",
|
|
||||||
"-kubecfg_file=/etc/dns_token/kubeconfig",
|
|
||||||
]
|
|
||||||
- name: skydns
|
- name: skydns
|
||||||
image: gcr.io/google_containers/skydns:2015-03-11-001
|
image: gcr.io/google_containers/skydns:2015-03-11-001
|
||||||
command: [
|
args:
|
||||||
# entrypoint = "/skydns",
|
# entrypoint = "/skydns"
|
||||||
"-machines=http://localhost:4001",
|
- -machines=http://localhost:4001
|
||||||
"-addr=0.0.0.0:53",
|
- -addr=0.0.0.0:53
|
||||||
"-domain={{ pillar['dns_domain'] }}.",
|
- -domain={{ pillar['dns_domain'] }}.
|
||||||
]
|
|
||||||
ports:
|
ports:
|
||||||
- name: dns
|
- containerPort: 53
|
||||||
containerPort: 53
|
name: dns
|
||||||
protocol: UDP
|
protocol: UDP
|
||||||
|
dnsPolicy: Default # Don't use cluster DNS.
|
||||||
volumes:
|
volumes:
|
||||||
- name: dns-token
|
- name: dns-token
|
||||||
source:
|
|
||||||
secret:
|
secret:
|
||||||
target:
|
secretName: token-system-dns
|
||||||
kind: Secret
|
|
||||||
namespace: default
|
|
||||||
name: token-system-dns
|
|
||||||
|
Loading…
Reference in New Issue
Block a user