From c401a5d9f1434bffa8442d5dd270dee311b332e4 Mon Sep 17 00:00:00 2001 From: Fish-pro Date: Wed, 31 Jan 2024 20:30:25 +0800 Subject: [PATCH] bump alpine to 3.19.1 to address CVE concerns Signed-off-by: Zechun Chen --- cluster/images/Dockerfile | 2 +- cluster/images/buildx.Dockerfile | 2 +- pkg/karmadactl/cmdinit/kubernetes/deploy.go | 4 ++-- pkg/karmadactl/cmdinit/kubernetes/deploy_test.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cluster/images/Dockerfile b/cluster/images/Dockerfile index 25ddd4f30..fe010027b 100644 --- a/cluster/images/Dockerfile +++ b/cluster/images/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM alpine:3.18.5 +FROM alpine:3.19.1 ARG BINARY diff --git a/cluster/images/buildx.Dockerfile b/cluster/images/buildx.Dockerfile index d5b448d98..5f56a4956 100644 --- a/cluster/images/buildx.Dockerfile +++ b/cluster/images/buildx.Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM alpine:3.18.5 +FROM alpine:3.19.1 ARG BINARY ARG TARGETPLATFORM diff --git a/pkg/karmadactl/cmdinit/kubernetes/deploy.go b/pkg/karmadactl/cmdinit/kubernetes/deploy.go index 393714938..2890fb411 100644 --- a/pkg/karmadactl/cmdinit/kubernetes/deploy.go +++ b/pkg/karmadactl/cmdinit/kubernetes/deploy.go @@ -114,7 +114,7 @@ func init() { karmadaRelease = releaseVer.ReleaseVersion() DefaultCrdURL = fmt.Sprintf("https://github.com/karmada-io/karmada/releases/download/%s/crds.tar.gz", releaseVer.ReleaseVersion()) - DefaultInitImage = "docker.io/alpine:3.18.5" + DefaultInitImage = "docker.io/alpine:3.19.1" DefaultKarmadaSchedulerImage = fmt.Sprintf("docker.io/karmada/karmada-scheduler:%s", releaseVer.ReleaseVersion()) DefaultKarmadaControllerManagerImage = fmt.Sprintf("docker.io/karmada/karmada-controller-manager:%s", releaseVer.ReleaseVersion()) DefaultKarmadaWebhookImage = fmt.Sprintf("docker.io/karmada/karmada-webhook:%s", releaseVer.ReleaseVersion()) @@ -664,7 +664,7 @@ func (i *CommandInitOption) kubeControllerManagerImage() string { // get etcd-init image func (i *CommandInitOption) etcdInitImage() string { if i.ImageRegistry != "" && i.EtcdInitImage == DefaultInitImage { - return i.ImageRegistry + "/alpine:3.18.5" + return i.ImageRegistry + "/alpine:3.19.1" } return i.EtcdInitImage } diff --git a/pkg/karmadactl/cmdinit/kubernetes/deploy_test.go b/pkg/karmadactl/cmdinit/kubernetes/deploy_test.go index 4f2720374..a2a72ef12 100644 --- a/pkg/karmadactl/cmdinit/kubernetes/deploy_test.go +++ b/pkg/karmadactl/cmdinit/kubernetes/deploy_test.go @@ -379,7 +379,7 @@ func TestEtcdInitImage(t *testing.T) { ImageRegistry: "my-registry", EtcdInitImage: DefaultInitImage, }, - expected: "my-registry/alpine:3.18.5", + expected: "my-registry/alpine:3.19.1", }, { name: "EtcdInitImage is set to a non-default value",