mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-19 18:02:01 +00:00
Merge pull request #115603 from pacoxu/coredns-v1.10.1
update coredns to v1.10.1
This commit is contained in:
commit
4f76e4a0fd
@ -29,7 +29,7 @@ dependencies:
|
|||||||
|
|
||||||
# CoreDNS
|
# CoreDNS
|
||||||
- name: "coredns-kube-up"
|
- name: "coredns-kube-up"
|
||||||
version: 1.10.0
|
version: 1.10.1
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: cluster/addons/dns/coredns/coredns.yaml.base
|
- path: cluster/addons/dns/coredns/coredns.yaml.base
|
||||||
match: registry.k8s.io/coredns
|
match: registry.k8s.io/coredns
|
||||||
@ -39,7 +39,7 @@ dependencies:
|
|||||||
match: registry.k8s.io/coredns
|
match: registry.k8s.io/coredns
|
||||||
|
|
||||||
- name: "coredns-kubeadm"
|
- name: "coredns-kubeadm"
|
||||||
version: 1.10.0
|
version: 1.10.1
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: cmd/kubeadm/app/constants/constants.go
|
- path: cmd/kubeadm/app/constants/constants.go
|
||||||
match: CoreDNSVersion =
|
match: CoreDNSVersion =
|
||||||
|
@ -139,7 +139,7 @@ spec:
|
|||||||
kubernetes.io/os: linux
|
kubernetes.io/os: linux
|
||||||
containers:
|
containers:
|
||||||
- name: coredns
|
- name: coredns
|
||||||
image: registry.k8s.io/coredns/coredns:v1.10.0
|
image: registry.k8s.io/coredns/coredns:v1.10.1
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
|
@ -139,7 +139,7 @@ spec:
|
|||||||
kubernetes.io/os: linux
|
kubernetes.io/os: linux
|
||||||
containers:
|
containers:
|
||||||
- name: coredns
|
- name: coredns
|
||||||
image: registry.k8s.io/coredns/coredns:v1.10.0
|
image: registry.k8s.io/coredns/coredns:v1.10.1
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
|
@ -139,7 +139,7 @@ spec:
|
|||||||
kubernetes.io/os: linux
|
kubernetes.io/os: linux
|
||||||
containers:
|
containers:
|
||||||
- name: coredns
|
- name: coredns
|
||||||
image: registry.k8s.io/coredns/coredns:v1.10.0
|
image: registry.k8s.io/coredns/coredns:v1.10.1
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
|
@ -345,7 +345,7 @@ const (
|
|||||||
CoreDNSImageName = "coredns"
|
CoreDNSImageName = "coredns"
|
||||||
|
|
||||||
// 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 = "v1.10.0"
|
CoreDNSVersion = "v1.10.1"
|
||||||
|
|
||||||
// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
|
// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
|
||||||
ClusterConfigurationKind = "ClusterConfiguration"
|
ClusterConfigurationKind = "ClusterConfiguration"
|
||||||
|
@ -241,21 +241,21 @@ func TestGetDNSImage(t *testing.T) {
|
|||||||
cfg *kubeadmapi.ClusterConfiguration
|
cfg *kubeadmapi.ClusterConfiguration
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
expected: "foo.io/coredns:v1.10.0",
|
expected: "foo.io/coredns:v1.10.1",
|
||||||
cfg: &kubeadmapi.ClusterConfiguration{
|
cfg: &kubeadmapi.ClusterConfiguration{
|
||||||
ImageRepository: "foo.io",
|
ImageRepository: "foo.io",
|
||||||
DNS: kubeadmapi.DNS{},
|
DNS: kubeadmapi.DNS{},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
expected: kubeadmapiv1beta3.DefaultImageRepository + "/coredns/coredns:v1.10.0",
|
expected: kubeadmapiv1beta3.DefaultImageRepository + "/coredns/coredns:v1.10.1",
|
||||||
cfg: &kubeadmapi.ClusterConfiguration{
|
cfg: &kubeadmapi.ClusterConfiguration{
|
||||||
ImageRepository: kubeadmapiv1beta3.DefaultImageRepository,
|
ImageRepository: kubeadmapiv1beta3.DefaultImageRepository,
|
||||||
DNS: kubeadmapi.DNS{},
|
DNS: kubeadmapi.DNS{},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
expected: "foo.io/coredns/coredns:v1.10.0",
|
expected: "foo.io/coredns/coredns:v1.10.1",
|
||||||
cfg: &kubeadmapi.ClusterConfiguration{
|
cfg: &kubeadmapi.ClusterConfiguration{
|
||||||
ImageRepository: "foo.io",
|
ImageRepository: "foo.io",
|
||||||
DNS: kubeadmapi.DNS{
|
DNS: kubeadmapi.DNS{
|
||||||
|
Loading…
Reference in New Issue
Block a user