Skip to content

Commit b5a08a6

Browse files
authored
Merge pull request #4598 from Fish-pro/image
bump alpine to 3.19.1 to address CVE concerns
2 parents 0126b90 + c401a5d commit b5a08a6

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Diff for: cluster/images/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM alpine:3.18.5
15+
FROM alpine:3.19.1
1616

1717
ARG BINARY
1818

Diff for: cluster/images/buildx.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM alpine:3.18.5
15+
FROM alpine:3.19.1
1616

1717
ARG BINARY
1818
ARG TARGETPLATFORM

Diff for: pkg/karmadactl/cmdinit/kubernetes/deploy.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func init() {
114114
karmadaRelease = releaseVer.ReleaseVersion()
115115

116116
DefaultCrdURL = fmt.Sprintf("https://github.com/karmada-io/karmada/releases/download/%s/crds.tar.gz", releaseVer.ReleaseVersion())
117-
DefaultInitImage = "docker.io/alpine:3.18.5"
117+
DefaultInitImage = "docker.io/alpine:3.19.1"
118118
DefaultKarmadaSchedulerImage = fmt.Sprintf("docker.io/karmada/karmada-scheduler:%s", releaseVer.ReleaseVersion())
119119
DefaultKarmadaControllerManagerImage = fmt.Sprintf("docker.io/karmada/karmada-controller-manager:%s", releaseVer.ReleaseVersion())
120120
DefaultKarmadaWebhookImage = fmt.Sprintf("docker.io/karmada/karmada-webhook:%s", releaseVer.ReleaseVersion())
@@ -664,7 +664,7 @@ func (i *CommandInitOption) kubeControllerManagerImage() string {
664664
// get etcd-init image
665665
func (i *CommandInitOption) etcdInitImage() string {
666666
if i.ImageRegistry != "" && i.EtcdInitImage == DefaultInitImage {
667-
return i.ImageRegistry + "/alpine:3.18.5"
667+
return i.ImageRegistry + "/alpine:3.19.1"
668668
}
669669
return i.EtcdInitImage
670670
}

Diff for: pkg/karmadactl/cmdinit/kubernetes/deploy_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ func TestEtcdInitImage(t *testing.T) {
379379
ImageRegistry: "my-registry",
380380
EtcdInitImage: DefaultInitImage,
381381
},
382-
expected: "my-registry/alpine:3.18.5",
382+
expected: "my-registry/alpine:3.19.1",
383383
},
384384
{
385385
name: "EtcdInitImage is set to a non-default value",

0 commit comments

Comments
 (0)