karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4376 from zhzhuang-zju/image 

bump alpine to 3.18.5 to address CVE concerns
This commit is contained in:
karmada-bot 2023-12-06 11:56:05 +08:00 committed by GitHub
parent cb483a9b95 d4bc240e91
commit edbea75557
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/images/Dockerfile
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM alpine:3.18.3 FROM alpine:3.18.5
ARG BINARY ARG BINARY

2
cluster/images/buildx.Dockerfile
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM alpine:3.18.3 FROM alpine:3.18.5
ARG BINARY ARG BINARY
ARG TARGETPLATFORM ARG TARGETPLATFORM

4
pkg/karmadactl/cmdinit/kubernetes/deploy.go
View File

@ -114,7 +114,7 @@ func init() {
karmadaRelease = releaseVer.ReleaseVersion() karmadaRelease = releaseVer.ReleaseVersion()
DefaultCrdURL = fmt.Sprintf("https://github.com/karmada-io/karmada/releases/download/%s/crds.tar.gz", releaseVer.ReleaseVersion()) DefaultCrdURL = fmt.Sprintf("https://github.com/karmada-io/karmada/releases/download/%s/crds.tar.gz", releaseVer.ReleaseVersion())
DefaultInitImage = "docker.io/alpine:3.15.1" DefaultInitImage = "docker.io/alpine:3.18.5"
DefaultKarmadaSchedulerImage = fmt.Sprintf("docker.io/karmada/karmada-scheduler:%s", releaseVer.ReleaseVersion()) DefaultKarmadaSchedulerImage = fmt.Sprintf("docker.io/karmada/karmada-scheduler:%s", releaseVer.ReleaseVersion())
DefaultKarmadaControllerManagerImage = fmt.Sprintf("docker.io/karmada/karmada-controller-manager:%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()) DefualtKarmadaWebhookImage = fmt.Sprintf("docker.io/karmada/karmada-webhook:%s", releaseVer.ReleaseVersion())
@ -665,7 +665,7 @@ func (i *CommandInitOption) kubeControllerManagerImage() string {
// get etcd-init image // get etcd-init image
func (i *CommandInitOption) etcdInitImage() string { func (i *CommandInitOption) etcdInitImage() string {
if i.ImageRegistry != "" && i.EtcdInitImage == DefaultInitImage { if i.ImageRegistry != "" && i.EtcdInitImage == DefaultInitImage {
return i.ImageRegistry + "/alpine:3.15.1" return i.ImageRegistry + "/alpine:3.18.5"
} }
return i.EtcdInitImage return i.EtcdInitImage
} }

2
pkg/karmadactl/cmdinit/kubernetes/deploy_test.go
View File

@ -379,7 +379,7 @@ func TestEtcdInitImage(t *testing.T) {
ImageRegistry: "my-registry", ImageRegistry: "my-registry",
EtcdInitImage: DefaultInitImage, EtcdInitImage: DefaultInitImage,
}, },
expected: "my-registry/alpine:3.15.1", expected: "my-registry/alpine:3.18.5",
}, },
{ {
name: "EtcdInitImage is set to a non-default value", name: "EtcdInitImage is set to a non-default value",