Skip to content

Commit

Permalink
Merge pull request #4600 from Fish-pro/automated-cherry-pick-of-#4598…
Browse files Browse the repository at this point in the history
…-upstream-release-1.7

Automated cherry pick of #4598: bump alpine to 3.19.1 to address CVE concerns
  • Loading branch information
karmada-bot committed Feb 1, 2024
2 parents 364143a + ad73be2 commit 9159adc
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cluster/images/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.18.5
FROM alpine:3.19.1

ARG BINARY

Expand Down
2 changes: 1 addition & 1 deletion cluster/images/buildx.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.18.5
FROM alpine:3.19.1

ARG BINARY
ARG TARGETPLATFORM
Expand Down
4 changes: 2 additions & 2 deletions pkg/karmadactl/cmdinit/kubernetes/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,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())
DefualtKarmadaWebhookImage = fmt.Sprintf("docker.io/karmada/karmada-webhook:%s", releaseVer.ReleaseVersion())
Expand Down Expand Up @@ -579,7 +579,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
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/karmadactl/cmdinit/kubernetes/deploy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,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",
Expand Down

0 comments on commit 9159adc

Please sign in to comment.