mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Merge pull request #102466 from pacoxu/dns-1.8.4
kubeadm: update coredns to 1.8.4
This commit is contained in:
commit
cfa0130b9f
@ -55,7 +55,7 @@ dependencies:
|
|||||||
match: k8s.gcr.io/coredns
|
match: k8s.gcr.io/coredns
|
||||||
|
|
||||||
- name: "coredns-kubeadm"
|
- name: "coredns-kubeadm"
|
||||||
version: 1.8.0
|
version: 1.8.4
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: cmd/kubeadm/app/constants/constants.go
|
- path: cmd/kubeadm/app/constants/constants.go
|
||||||
match: CoreDNSVersion =
|
match: CoreDNSVersion =
|
||||||
|
@ -325,7 +325,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.8.0"
|
CoreDNSVersion = "v1.8.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"
|
||||||
|
@ -233,7 +233,7 @@ func TestGetDNSImage(t *testing.T) {
|
|||||||
cfg *kubeadmapi.ClusterConfiguration
|
cfg *kubeadmapi.ClusterConfiguration
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
expected: "foo.io/coredns:v1.8.0",
|
expected: "foo.io/coredns:v1.8.4",
|
||||||
cfg: &kubeadmapi.ClusterConfiguration{
|
cfg: &kubeadmapi.ClusterConfiguration{
|
||||||
ImageRepository: "foo.io",
|
ImageRepository: "foo.io",
|
||||||
DNS: kubeadmapi.DNS{
|
DNS: kubeadmapi.DNS{
|
||||||
@ -242,7 +242,7 @@ func TestGetDNSImage(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
expected: kubeadmapiv1beta2.DefaultImageRepository + "/coredns/coredns:v1.8.0",
|
expected: kubeadmapiv1beta2.DefaultImageRepository + "/coredns/coredns:v1.8.4",
|
||||||
cfg: &kubeadmapi.ClusterConfiguration{
|
cfg: &kubeadmapi.ClusterConfiguration{
|
||||||
ImageRepository: kubeadmapiv1beta2.DefaultImageRepository,
|
ImageRepository: kubeadmapiv1beta2.DefaultImageRepository,
|
||||||
DNS: kubeadmapi.DNS{
|
DNS: kubeadmapi.DNS{
|
||||||
@ -251,7 +251,7 @@ func TestGetDNSImage(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
expected: "foo.io/coredns/coredns:v1.8.0",
|
expected: "foo.io/coredns/coredns:v1.8.4",
|
||||||
cfg: &kubeadmapi.ClusterConfiguration{
|
cfg: &kubeadmapi.ClusterConfiguration{
|
||||||
ImageRepository: "foo.io",
|
ImageRepository: "foo.io",
|
||||||
DNS: kubeadmapi.DNS{
|
DNS: kubeadmapi.DNS{
|
||||||
|
@ -197,6 +197,13 @@ rules:
|
|||||||
- nodes
|
- nodes
|
||||||
verbs:
|
verbs:
|
||||||
- get
|
- get
|
||||||
|
- apiGroups:
|
||||||
|
- discovery.k8s.io
|
||||||
|
resources:
|
||||||
|
- endpointslices
|
||||||
|
verbs:
|
||||||
|
- list
|
||||||
|
- watch
|
||||||
`
|
`
|
||||||
// CoreDNSClusterRoleBinding is the CoreDNS Clusterrolebinding manifest
|
// CoreDNSClusterRoleBinding is the CoreDNS Clusterrolebinding manifest
|
||||||
CoreDNSClusterRoleBinding = `
|
CoreDNSClusterRoleBinding = `
|
||||||
|
Loading…
Reference in New Issue
Block a user