mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 05:27:21 +00:00
make coredns kubeup default, update manifest
This commit is contained in:
parent
151830e45f
commit
0cfb4bbe2c
@ -27,6 +27,12 @@ rules:
|
|||||||
verbs:
|
verbs:
|
||||||
- list
|
- list
|
||||||
- watch
|
- watch
|
||||||
|
- apiGroups:
|
||||||
|
- ""
|
||||||
|
resources:
|
||||||
|
- nodes
|
||||||
|
verbs:
|
||||||
|
- get
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
@ -108,7 +114,7 @@ spec:
|
|||||||
operator: "Exists"
|
operator: "Exists"
|
||||||
containers:
|
containers:
|
||||||
- name: coredns
|
- name: coredns
|
||||||
image: k8s.gcr.io/coredns:1.2.2
|
image: k8s.gcr.io/coredns:1.2.4
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
|
@ -27,6 +27,12 @@ rules:
|
|||||||
verbs:
|
verbs:
|
||||||
- list
|
- list
|
||||||
- watch
|
- watch
|
||||||
|
- apiGroups:
|
||||||
|
- ""
|
||||||
|
resources:
|
||||||
|
- nodes
|
||||||
|
verbs:
|
||||||
|
- get
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
@ -108,7 +114,7 @@ spec:
|
|||||||
operator: "Exists"
|
operator: "Exists"
|
||||||
containers:
|
containers:
|
||||||
- name: coredns
|
- name: coredns
|
||||||
image: k8s.gcr.io/coredns:1.2.2
|
image: k8s.gcr.io/coredns:1.2.4
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
|
@ -27,6 +27,12 @@ rules:
|
|||||||
verbs:
|
verbs:
|
||||||
- list
|
- list
|
||||||
- watch
|
- watch
|
||||||
|
- apiGroups:
|
||||||
|
- ""
|
||||||
|
resources:
|
||||||
|
- nodes
|
||||||
|
verbs:
|
||||||
|
- get
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
@ -108,7 +114,7 @@ spec:
|
|||||||
operator: "Exists"
|
operator: "Exists"
|
||||||
containers:
|
containers:
|
||||||
- name: coredns
|
- name: coredns
|
||||||
image: k8s.gcr.io/coredns:1.2.2
|
image: k8s.gcr.io/coredns:1.2.4
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
|
@ -261,8 +261,8 @@ if [[ ! -z "${NODE_ACCELERATORS}" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Optional: Install cluster DNS.
|
# Optional: Install cluster DNS.
|
||||||
# Set CLUSTER_DNS_CORE_DNS to 'true' to install CoreDNS instead of kube-dns.
|
# Set CLUSTER_DNS_CORE_DNS to 'false' to install kube-dns instead of CoreDNS.
|
||||||
CLUSTER_DNS_CORE_DNS="${CLUSTER_DNS_CORE_DNS:-false}"
|
CLUSTER_DNS_CORE_DNS="${CLUSTER_DNS_CORE_DNS:-true}"
|
||||||
ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}"
|
ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}"
|
||||||
DNS_SERVER_IP="${KUBE_DNS_SERVER_IP:-10.0.0.10}"
|
DNS_SERVER_IP="${KUBE_DNS_SERVER_IP:-10.0.0.10}"
|
||||||
DNS_DOMAIN="${KUBE_DNS_DOMAIN:-cluster.local}"
|
DNS_DOMAIN="${KUBE_DNS_DOMAIN:-cluster.local}"
|
||||||
|
@ -268,8 +268,8 @@ if [[ ! -z "${NODE_ACCELERATORS}" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Optional: Install cluster DNS.
|
# Optional: Install cluster DNS.
|
||||||
# Set CLUSTER_DNS_CORE_DNS to 'true' to install CoreDNS instead of kube-dns.
|
# Set CLUSTER_DNS_CORE_DNS to 'false' to install kube-dns instead of CoreDNS.
|
||||||
CLUSTER_DNS_CORE_DNS="${CLUSTER_DNS_CORE_DNS:-false}"
|
CLUSTER_DNS_CORE_DNS="${CLUSTER_DNS_CORE_DNS:-true}"
|
||||||
ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}"
|
ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}"
|
||||||
DNS_SERVER_IP="10.0.0.10"
|
DNS_SERVER_IP="10.0.0.10"
|
||||||
DNS_DOMAIN="cluster.local"
|
DNS_DOMAIN="cluster.local"
|
||||||
|
@ -847,7 +847,7 @@ ENABLE_NODE_LOGGING: $(yaml-quote ${ENABLE_NODE_LOGGING:-false})
|
|||||||
LOGGING_DESTINATION: $(yaml-quote ${LOGGING_DESTINATION:-})
|
LOGGING_DESTINATION: $(yaml-quote ${LOGGING_DESTINATION:-})
|
||||||
ELASTICSEARCH_LOGGING_REPLICAS: $(yaml-quote ${ELASTICSEARCH_LOGGING_REPLICAS:-})
|
ELASTICSEARCH_LOGGING_REPLICAS: $(yaml-quote ${ELASTICSEARCH_LOGGING_REPLICAS:-})
|
||||||
ENABLE_CLUSTER_DNS: $(yaml-quote ${ENABLE_CLUSTER_DNS:-false})
|
ENABLE_CLUSTER_DNS: $(yaml-quote ${ENABLE_CLUSTER_DNS:-false})
|
||||||
CLUSTER_DNS_CORE_DNS: $(yaml-quote ${CLUSTER_DNS_CORE_DNS:-false})
|
CLUSTER_DNS_CORE_DNS: $(yaml-quote ${CLUSTER_DNS_CORE_DNS:-true})
|
||||||
DNS_SERVER_IP: $(yaml-quote ${DNS_SERVER_IP:-})
|
DNS_SERVER_IP: $(yaml-quote ${DNS_SERVER_IP:-})
|
||||||
DNS_DOMAIN: $(yaml-quote ${DNS_DOMAIN:-})
|
DNS_DOMAIN: $(yaml-quote ${DNS_DOMAIN:-})
|
||||||
ENABLE_DNS_HORIZONTAL_AUTOSCALER: $(yaml-quote ${ENABLE_DNS_HORIZONTAL_AUTOSCALER:-false})
|
ENABLE_DNS_HORIZONTAL_AUTOSCALER: $(yaml-quote ${ENABLE_DNS_HORIZONTAL_AUTOSCALER:-false})
|
||||||
|
@ -306,7 +306,7 @@ const (
|
|||||||
KubeDNSVersion = "1.14.13"
|
KubeDNSVersion = "1.14.13"
|
||||||
|
|
||||||
// CoreDNSVersion is the version of CoreDNS to be deployed if it is used
|
// CoreDNSVersion is the version of CoreDNS to be deployed if it is used
|
||||||
CoreDNSVersion = "1.2.2"
|
CoreDNSVersion = "1.2.4"
|
||||||
|
|
||||||
// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
|
// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
|
||||||
ClusterConfigurationKind = "ClusterConfiguration"
|
ClusterConfigurationKind = "ClusterConfiguration"
|
||||||
|
@ -331,6 +331,12 @@ rules:
|
|||||||
verbs:
|
verbs:
|
||||||
- list
|
- list
|
||||||
- watch
|
- watch
|
||||||
|
- apiGroups:
|
||||||
|
- ""
|
||||||
|
resources:
|
||||||
|
- nodes
|
||||||
|
verbs:
|
||||||
|
- get
|
||||||
`
|
`
|
||||||
// CoreDNSClusterRoleBinding is the CoreDNS Clusterrolebinding manifest
|
// CoreDNSClusterRoleBinding is the CoreDNS Clusterrolebinding manifest
|
||||||
CoreDNSClusterRoleBinding = `
|
CoreDNSClusterRoleBinding = `
|
||||||
|
@ -168,7 +168,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.10.3",
|
KubeVersion: "v1.10.3",
|
||||||
KubeadmVersion: "v1.10.3",
|
KubeadmVersion: "v1.10.3",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.2.2",
|
DNSVersion: "1.2.4",
|
||||||
EtcdVersion: "3.1.12",
|
EtcdVersion: "3.1.12",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -207,7 +207,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.10.3",
|
KubeVersion: "v1.10.3",
|
||||||
KubeadmVersion: "v1.10.3",
|
KubeadmVersion: "v1.10.3",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.2.2",
|
DNSVersion: "1.2.4",
|
||||||
EtcdVersion: "3.1.12",
|
EtcdVersion: "3.1.12",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -246,7 +246,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.11.0",
|
KubeVersion: "v1.11.0",
|
||||||
KubeadmVersion: "v1.11.0",
|
KubeadmVersion: "v1.11.0",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.2.2",
|
DNSVersion: "1.2.4",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -285,7 +285,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.10.5",
|
KubeVersion: "v1.10.5",
|
||||||
KubeadmVersion: "v1.10.5", // Note: The kubeadm version mustn't be "downgraded" here
|
KubeadmVersion: "v1.10.5", // Note: The kubeadm version mustn't be "downgraded" here
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.2.2",
|
DNSVersion: "1.2.4",
|
||||||
EtcdVersion: "3.1.12",
|
EtcdVersion: "3.1.12",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -305,7 +305,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.11.1",
|
KubeVersion: "v1.11.1",
|
||||||
KubeadmVersion: "v1.11.1",
|
KubeadmVersion: "v1.11.1",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.2.2",
|
DNSVersion: "1.2.4",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -364,7 +364,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.11.0-alpha.2",
|
KubeVersion: "v1.11.0-alpha.2",
|
||||||
KubeadmVersion: "v1.11.0-alpha.2",
|
KubeadmVersion: "v1.11.0-alpha.2",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.2.2",
|
DNSVersion: "1.2.4",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -404,7 +404,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.11.0-alpha.2",
|
KubeVersion: "v1.11.0-alpha.2",
|
||||||
KubeadmVersion: "v1.11.0-alpha.2",
|
KubeadmVersion: "v1.11.0-alpha.2",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.2.2",
|
DNSVersion: "1.2.4",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -445,7 +445,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.11.0-beta.1",
|
KubeVersion: "v1.11.0-beta.1",
|
||||||
KubeadmVersion: "v1.11.0-beta.1",
|
KubeadmVersion: "v1.11.0-beta.1",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.2.2",
|
DNSVersion: "1.2.4",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -486,7 +486,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.11.0-rc.1",
|
KubeVersion: "v1.11.0-rc.1",
|
||||||
KubeadmVersion: "v1.11.0-rc.1",
|
KubeadmVersion: "v1.11.0-rc.1",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.2.2",
|
DNSVersion: "1.2.4",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -527,7 +527,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.11.6-rc.1",
|
KubeVersion: "v1.11.6-rc.1",
|
||||||
KubeadmVersion: "v1.11.6-rc.1",
|
KubeadmVersion: "v1.11.6-rc.1",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.2.2",
|
DNSVersion: "1.2.4",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -568,7 +568,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.11.0-rc.1",
|
KubeVersion: "v1.11.0-rc.1",
|
||||||
KubeadmVersion: "v1.11.0-rc.1",
|
KubeadmVersion: "v1.11.0-rc.1",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.2.2",
|
DNSVersion: "1.2.4",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -588,7 +588,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.12.0-alpha.2",
|
KubeVersion: "v1.12.0-alpha.2",
|
||||||
KubeadmVersion: "v1.12.0-alpha.2",
|
KubeadmVersion: "v1.12.0-alpha.2",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.2.2",
|
DNSVersion: "1.2.4",
|
||||||
EtcdVersion: "3.2.24",
|
EtcdVersion: "3.2.24",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -641,7 +641,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.12.1",
|
KubeVersion: "v1.12.1",
|
||||||
KubeadmVersion: "v1.12.1",
|
KubeadmVersion: "v1.12.1",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.2.2",
|
DNSVersion: "1.2.4",
|
||||||
EtcdVersion: "3.2.24",
|
EtcdVersion: "3.2.24",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -678,7 +678,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.12.0",
|
KubeVersion: "v1.12.0",
|
||||||
KubeadmVersion: "v1.12.0",
|
KubeadmVersion: "v1.12.0",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.2.2",
|
DNSVersion: "1.2.4",
|
||||||
EtcdVersion: "3.2.24",
|
EtcdVersion: "3.2.24",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user