From 941c78f411a994d2a8f0f9c3ea280bd3746733b7 Mon Sep 17 00:00:00 2001 From: calvin0327 Date: Sun, 26 Sep 2021 11:44:22 +0800 Subject: [PATCH] Update corefile-migration to v1.0.14 and update coredns to 1.8.6 --- build/dependencies.yaml | 2 +- cmd/kubeadm/app/constants/constants.go | 2 +- cmd/kubeadm/app/images/images_test.go | 6 +-- go.mod | 4 +- go.sum | 4 +- .../corefile-migration/migration/versions.go | 46 +++++++++++++++++++ vendor/modules.txt | 4 +- 7 files changed, 57 insertions(+), 11 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index c73dd9e7679..08dd07faa03 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -39,7 +39,7 @@ dependencies: match: k8s.gcr.io/coredns - name: "coredns-kubeadm" - version: 1.8.4 + version: 1.8.6 refPaths: - path: cmd/kubeadm/app/constants/constants.go match: CoreDNSVersion = diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 52a98897a88..db5a2dd2395 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -330,7 +330,7 @@ const ( CoreDNSImageName = "coredns" // CoreDNSVersion is the version of CoreDNS to be deployed if it is used - CoreDNSVersion = "v1.8.4" + CoreDNSVersion = "v1.8.6" // ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct ClusterConfigurationKind = "ClusterConfiguration" diff --git a/cmd/kubeadm/app/images/images_test.go b/cmd/kubeadm/app/images/images_test.go index 2fd9d3f53a2..2b8affce236 100644 --- a/cmd/kubeadm/app/images/images_test.go +++ b/cmd/kubeadm/app/images/images_test.go @@ -233,7 +233,7 @@ func TestGetDNSImage(t *testing.T) { cfg *kubeadmapi.ClusterConfiguration }{ { - expected: "foo.io/coredns:v1.8.4", + expected: "foo.io/coredns:v1.8.6", cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: "foo.io", DNS: kubeadmapi.DNS{ @@ -242,7 +242,7 @@ func TestGetDNSImage(t *testing.T) { }, }, { - expected: kubeadmapiv1beta2.DefaultImageRepository + "/coredns/coredns:v1.8.4", + expected: kubeadmapiv1beta2.DefaultImageRepository + "/coredns/coredns:v1.8.6", cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: kubeadmapiv1beta2.DefaultImageRepository, DNS: kubeadmapi.DNS{ @@ -251,7 +251,7 @@ func TestGetDNSImage(t *testing.T) { }, }, { - expected: "foo.io/coredns/coredns:v1.8.4", + expected: "foo.io/coredns/coredns:v1.8.6", cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: "foo.io", DNS: kubeadmapi.DNS{ diff --git a/go.mod b/go.mod index 4172591a7aa..b6467de1f4b 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313 github.com/container-storage-interface/spec v1.5.0 github.com/containernetworking/cni v0.8.1 - github.com/coredns/corefile-migration v1.0.12 + github.com/coredns/corefile-migration v1.0.14 github.com/coreos/go-oidc v2.1.0+incompatible github.com/coreos/go-systemd/v22 v22.3.2 github.com/cpuguy83/go-md2man/v2 v2.0.0 @@ -207,7 +207,7 @@ replace ( github.com/containerd/typeurl => github.com/containerd/typeurl v1.0.2 github.com/containernetworking/cni => github.com/containernetworking/cni v0.8.1 github.com/coredns/caddy => github.com/coredns/caddy v1.1.0 - github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.12 + github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.14 github.com/coreos/go-oidc => github.com/coreos/go-oidc v2.1.0+incompatible github.com/coreos/go-semver => github.com/coreos/go-semver v0.3.0 github.com/coreos/go-systemd/v22 => github.com/coreos/go-systemd/v22 v22.3.2 diff --git a/go.sum b/go.sum index 335cfc2656d..077ce77e62a 100644 --- a/go.sum +++ b/go.sum @@ -114,8 +114,8 @@ github.com/containernetworking/cni v0.8.1 h1:7zpDnQ3T3s4ucOuJ/ZCLrYBxzkg0AELFfII github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= github.com/coredns/caddy v1.1.0 h1:ezvsPrT/tA/7pYDBZxu0cT0VmWk75AfIaf6GSYCNMf0= github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4= -github.com/coredns/corefile-migration v1.0.12 h1:TJGATo0YLQJVIKJZLajXE1IrhRFtYTR1cYsGIT1YNEk= -github.com/coredns/corefile-migration v1.0.12/go.mod h1:NJOI8ceUF/NTgEwtjD+TUq3/BnH/GF7WAM3RzCa3hBo= +github.com/coredns/corefile-migration v1.0.14 h1:Tz3WZhoj2NdP8drrQH86NgnCng+VrPjNeg2Oe1ALKag= +github.com/coredns/corefile-migration v1.0.14/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE= github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= diff --git a/vendor/github.com/coredns/corefile-migration/migration/versions.go b/vendor/github.com/coredns/corefile-migration/migration/versions.go index b9c7a139117..e70cd1c971f 100644 --- a/vendor/github.com/coredns/corefile-migration/migration/versions.go +++ b/vendor/github.com/coredns/corefile-migration/migration/versions.go @@ -30,7 +30,53 @@ type release struct { // Versions holds a map of plugin/option migrations per CoreDNS release (since 1.1.4) var Versions = map[string]release{ + "1.8.6": { + priorVersion: "1.8.5", + dockerImageSHA: "5b6ec0d6de9baaf3e92d0f66cd96a25b9edbce8716f5f15dcd1a616b3abd590e", + plugins: map[string]plugin{ + "errors": plugins["errors"]["v2"], + "log": plugins["log"]["v1"], + "health": plugins["health"]["v1"], + "ready": {}, + "autopath": {}, + "kubernetes": plugins["kubernetes"]["v8"], + "k8s_external": plugins["k8s_external"]["v1"], + "prometheus": {}, + "forward": plugins["forward"]["v3"], + "cache": plugins["cache"]["v1"], + "loop": {}, + "reload": {}, + "loadbalance": {}, + "hosts": plugins["hosts"]["v1"], + "rewrite": plugins["rewrite"]["v2"], + "transfer": plugins["transfer"]["v1"], + }, + }, + "1.8.5": { + nextVersion: "1.8.6", + priorVersion: "1.8.4", + dockerImageSHA: "43a9f52f5dce39bf1816afe6141724cc2d08811e466dd46e6628c925e2419bdc", + plugins: map[string]plugin{ + "errors": plugins["errors"]["v2"], + "log": plugins["log"]["v1"], + "health": plugins["health"]["v1"], + "ready": {}, + "autopath": {}, + "kubernetes": plugins["kubernetes"]["v8"], + "k8s_external": plugins["k8s_external"]["v1"], + "prometheus": {}, + "forward": plugins["forward"]["v3"], + "cache": plugins["cache"]["v1"], + "loop": {}, + "reload": {}, + "loadbalance": {}, + "hosts": plugins["hosts"]["v1"], + "rewrite": plugins["rewrite"]["v2"], + "transfer": plugins["transfer"]["v1"], + }, + }, "1.8.4": { + nextVersion: "1.8.5", priorVersion: "1.8.3", dockerImageSHA: "6e5a02c21641597998b4be7cb5eb1e7b02c0d8d23cce4dd09f4682d463798890", plugins: map[string]plugin{ diff --git a/vendor/modules.txt b/vendor/modules.txt index 8bf74f6ec50..a20c809e4f6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -205,7 +205,7 @@ github.com/containernetworking/cni/pkg/utils github.com/containernetworking/cni/pkg/version # github.com/coredns/caddy v1.1.0 => github.com/coredns/caddy v1.1.0 github.com/coredns/caddy/caddyfile -# github.com/coredns/corefile-migration v1.0.12 => github.com/coredns/corefile-migration v1.0.12 +# github.com/coredns/corefile-migration v1.0.14 => github.com/coredns/corefile-migration v1.0.14 ## explicit github.com/coredns/corefile-migration/migration github.com/coredns/corefile-migration/migration/corefile @@ -2472,7 +2472,7 @@ sigs.k8s.io/yaml # github.com/containerd/typeurl => github.com/containerd/typeurl v1.0.2 # github.com/containernetworking/cni => github.com/containernetworking/cni v0.8.1 # github.com/coredns/caddy => github.com/coredns/caddy v1.1.0 -# github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.12 +# github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.14 # github.com/coreos/go-oidc => github.com/coreos/go-oidc v2.1.0+incompatible # github.com/coreos/go-semver => github.com/coreos/go-semver v0.3.0 # github.com/coreos/go-systemd/v22 => github.com/coreos/go-systemd/v22 v22.3.2