Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2d739a1

Browse files
afbjorklundmedyagh
afbjorklund
authored and
medyagh
committed
Remove legacy 32-bit arm arch targets
Don't support arm32/v7 (arm), but require arm64/v8. The old machines don't have enough memory anyway...
1 parent af56288 commit 2d739a1

8 files changed

Lines changed: 19 additions & 112 deletions

File tree

‎Makefile‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ export GO111MODULE := on
9090

9191
GOOS ?= $(shell go env GOOS)
9292
GOARCH ?= $(shell go env GOARCH)
93-
GOARM ?= 7 # the default is 5
9493
GOPATH ?= $(shell go env GOPATH)
9594
BUILD_DIR ?= $(PWD)/out
9695
$(shell mkdir -p $(BUILD_DIR))
@@ -210,7 +209,7 @@ endif
210209

211210
out/minikube$(IS_EXE): $(SOURCE_FILES) $(ASSET_FILES) go.mod
212211
ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
213-
$(call DOCKER,$(BUILD_IMAGE),GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) /usr/bin/make $@)
212+
$(call DOCKER,$(BUILD_IMAGE),GOOS=$(GOOS) GOARCH=$(GOARCH) /usr/bin/make $@)
214213
else
215214
$(if $(quiet),@echo " GO $@")
216215
$(Q)go build $(MINIKUBE_GOFLAGS) -tags "$(MINIKUBE_BUILD_TAGS)" -ldflags="$(MINIKUBE_LDFLAGS)" -o $@ k8s.io/minikube/cmd/minikube
@@ -224,14 +223,6 @@ out/minikube-linux-x86_64: out/minikube-linux-amd64
224223
$(if $(quiet),@echo " CP $@")
225224
$(Q)cp $< $@
226225

227-
out/minikube-linux-armhf: out/minikube-linux-arm
228-
$(if $(quiet),@echo " CP $@")
229-
$(Q)cp $< $@
230-
231-
out/minikube-linux-armv7hl: out/minikube-linux-arm
232-
$(if $(quiet),@echo " CP $@")
233-
$(Q)cp $< $@
234-
235226
out/minikube-linux-aarch64: out/minikube-linux-arm64
236227
$(if $(quiet),@echo " CP $@")
237228
$(Q)cp $< $@
@@ -258,7 +249,7 @@ ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
258249
$(call DOCKER,$(BUILD_IMAGE),/usr/bin/make $@)
259250
else
260251
$(if $(quiet),@echo " GO $@")
261-
$(Q)GOOS="$(firstword $(subst -, ,$*))" GOARCH="$(lastword $(subst -, ,$(subst $(IS_EXE), ,$*)))" $(if $(call eq,$(lastword $(subst -, ,$(subst $(IS_EXE), ,$*))),arm),GOARM=$(GOARM)) \
252+
$(Q)GOOS="$(firstword $(subst -, ,$*))" GOARCH="$(lastword $(subst -, ,$(subst $(IS_EXE), ,$*)))" \
262253
go build -tags "$(MINIKUBE_BUILD_TAGS)" -ldflags="$(MINIKUBE_LDFLAGS)" -a -o $@ k8s.io/minikube/cmd/minikube
263254
endif
264255

@@ -413,7 +404,7 @@ extract: ## extract internationalization words for translations
413404
cross: minikube-linux-amd64 minikube-darwin-amd64 minikube-windows-amd64.exe ## Build minikube for all platform
414405

415406
.PHONY: exotic
416-
exotic: out/minikube-linux-arm out/minikube-linux-arm64 out/minikube-linux-ppc64le out/minikube-linux-s390x ## Build minikube for non-amd64 linux
407+
exotic: out/minikube-linux-arm64 out/minikube-linux-ppc64le out/minikube-linux-s390x ## Build minikube for non-amd64 linux
417408

418409
.PHONY: windows
419410
windows: minikube-windows-amd64.exe ## Build minikube for Windows 64bit
@@ -651,7 +642,7 @@ docker-multi-arch-build:
651642
# installs QEMU static binaries to allow docker multi-arch build, see: https://github.com/docker/setup-qemu-action
652643
docker run --rm --privileged tonistiigi/binfmt:latest --install all
653644

654-
KICBASE_ARCH ?= linux/amd64,linux/arm64,linux/s390x,linux/arm,linux/ppc64le
645+
KICBASE_ARCH ?= linux/amd64,linux/arm64,linux/s390x,linux/ppc64le
655646
KICBASE_IMAGE_GCR ?= $(REGISTRY)/kicbase:$(KIC_VERSION)
656647
KICBASE_IMAGE_HUB ?= kicbase/stable:$(KIC_VERSION)
657648
KICBASE_IMAGE_REGISTRIES ?= $(KICBASE_IMAGE_GCR) $(KICBASE_IMAGE_HUB)

‎cmd/minikube/cmd/start.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1473,7 +1473,7 @@ func validateRuntime(rtime string) error {
14731473

14741474
}
14751475

1476-
if (rtime == "crio" || rtime == "cri-o") && (strings.HasPrefix(runtime.GOARCH, "ppc64") || detect.RuntimeArch() == "arm" || strings.HasPrefix(detect.RuntimeArch(), "arm/")) {
1476+
if (rtime == "crio" || rtime == "cri-o") && strings.HasPrefix(runtime.GOARCH, "ppc64") {
14771477
return errors.Errorf("The %s runtime is not compatible with the %s architecture. See https://github.com/cri-o/cri-o/issues/2467 for more details", rtime, runtime.GOARCH)
14781478
}
14791479

‎deploy/kicbase/Dockerfile‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ RUN install -m 0755 -d /etc/apt/keyrings \
160160
RUN sed -i '/^\[Service\]/a LimitNOFILE=1048576' /lib/systemd/system/containerd.service
161161

162162
# install buildkit
163-
RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/armhf/arm-v7/') \
163+
RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/') \
164164
&& echo "Installing buildkit ..." \
165165
&& addgroup --system buildkit \
166166
&& export BUILDKIT_BASE_URL="https://github.com/moby/buildkit/releases/download/${BUILDKIT_VERSION}" \
@@ -193,30 +193,25 @@ RUN export ARCH=$(dpkg --print-architecture) && \
193193
case "$ARCH" in \
194194
amd64) CRICTL_ARCH="amd64" ;; \
195195
arm64) CRICTL_ARCH="arm64" ;; \
196-
armhf) CRICTL_ARCH="armhf" ;; \
197196
ppc64el) CRICTL_ARCH="ppc64le" ;; \
198197
s390x) CRICTL_ARCH="s390x" ;; \
199198
*) echo "Unsupported architecture for crictl: $ARCH" && exit 1 ;; \
200199
esac && \
201-
if [ "$CRICTL_ARCH" != "armhf" ]; then \
202-
curl -fsSL --retry 5 --output /tmp/crictl.tgz "https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRICTL_VERSION}/crictl-${CRICTL_VERSION}-linux-${CRICTL_ARCH}.tar.gz" && \
203-
tar -C /usr/local/bin -xzvf /tmp/crictl.tgz && \
204-
rm -f /tmp/crictl.tgz && \
205-
chmod +x /usr/local/bin/crictl && \
206-
if [ -f /usr/local/bin/critest ]; then chmod +x /usr/local/bin/critest; fi; \
207-
else \
208-
echo "Skipping crictl install for armhf: No asset available in v1.34.0"; \
209-
fi
200+
curl -fsSL --retry 5 --output /tmp/crictl.tgz "https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRICTL_VERSION}/crictl-${CRICTL_VERSION}-linux-${CRICTL_ARCH}.tar.gz" && \
201+
tar -C /usr/local/bin -xzvf /tmp/crictl.tgz && \
202+
rm -f /tmp/crictl.tgz && \
203+
chmod +x /usr/local/bin/crictl && \
204+
if [ -f /usr/local/bin/critest ]; then chmod +x /usr/local/bin/critest; fi
210205
# install containernetworking-plugins
211-
RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/armhf/arm/') && \
206+
RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/') && \
212207
curl -LO "https://github.com/containernetworking/plugins/releases/download/${CNI_PLUGINS_VERSION}/cni-plugins-linux-$ARCH-${CNI_PLUGINS_VERSION}.tgz" && \
213208
mkdir -p /opt/cni/bin && \
214209
tar -xf "cni-plugins-linux-$ARCH-${CNI_PLUGINS_VERSION}.tgz" -C /opt/cni/bin && \
215210
rm "cni-plugins-linux-$ARCH-${CNI_PLUGINS_VERSION}.tgz"
216211

217212
# install cri-o from the OBS repositories
218-
RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/armhf/arm-v7/') && \
219-
if [ "$ARCH" != "ppc64le" ] && [ "$ARCH" != "arm-v7" ]; then \
213+
RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/') && \
214+
if [ "$ARCH" != "ppc64le" ]; then \
220215
mkdir -p /etc/apt/sources.list.d /etc/apt/trusted.gpg.d && \
221216
echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_12/ /' \
222217
> /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list && \
@@ -256,8 +251,8 @@ RUN chmod +x /var/lib/minikube/scheduled-stop/minikube-scheduled-stop
256251
# disable non-docker runtimes by default (since cri-dockerd is default in minikube)
257252
RUN systemctl disable containerd
258253
# disable crio for archs that support it
259-
RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/armhf/arm-v7/') && \
260-
if [ "$ARCH" != "ppc64le" ] && [ "$ARCH" != "arm-v7" ]; then systemctl disable crio && rm -f /etc/crictl.yaml; fi
254+
RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/') && \
255+
if [ "$ARCH" != "ppc64le" ]; then systemctl disable crio && rm -f /etc/crictl.yaml; fi
261256
# enable podman socket on archs that support it
262257
RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/') && if [ "$ARCH" != "ppc64le" ]; then systemctl enable podman.socket; fi
263258
# enable docker which is default

‎hack/jenkins/release_build_and_upload.sh‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,13 @@ env BUILD_IN_DOCKER=y \
6161
out/minikube-installer.exe \
6262
"out/minikube_${DEB_VERSION}-${DEB_REVISION}_amd64.deb" \
6363
"out/minikube_${DEB_VERSION}-${DEB_REVISION}_arm64.deb" \
64-
"out/minikube_${DEB_VERSION}-${DEB_REVISION}_armhf.deb" \
6564
"out/minikube_${DEB_VERSION}-${DEB_REVISION}_ppc64el.deb" \
6665
"out/minikube_${DEB_VERSION}-${DEB_REVISION}_s390x.deb" \
6766

6867
env BUILD_IN_DOCKER=y \
6968
make \
7069
"out/minikube-${RPM_VERSION}-${RPM_REVISION}.x86_64.rpm" \
7170
"out/minikube-${RPM_VERSION}-${RPM_REVISION}.aarch64.rpm" \
72-
"out/minikube-${RPM_VERSION}-${RPM_REVISION}.armv7hl.rpm" \
7371
"out/minikube-${RPM_VERSION}-${RPM_REVISION}.ppc64le.rpm" \
7472
"out/minikube-${RPM_VERSION}-${RPM_REVISION}.s390x.rpm" \
7573

@@ -91,8 +89,6 @@ fi
9189
# Don't upload temporary copies, avoid unused duplicate files in the release storage
9290
rm -f out/minikube-linux-x86_64
9391
rm -f out/minikube-linux-aarch64
94-
rm -f out/minikube-linux-armhf
95-
rm -f out/minikube-linux-armv7hl
9692
rm -f out/minikube-linux-ppc64el
9793
rm -f out/minikube-windows-amd64
9894

@@ -101,13 +97,11 @@ make checksum
10197
# unversioned names to avoid updating upstream Kubernetes documentation each release
10298
cp "out/minikube_${DEB_VERSION}-0_amd64.deb" out/minikube_latest_amd64.deb
10399
cp "out/minikube_${DEB_VERSION}-0_arm64.deb" out/minikube_latest_arm64.deb
104-
cp "out/minikube_${DEB_VERSION}-0_armhf.deb" out/minikube_latest_armhf.deb
105100
cp "out/minikube_${DEB_VERSION}-0_ppc64el.deb" out/minikube_latest_ppc64el.deb
106101
cp "out/minikube_${DEB_VERSION}-0_s390x.deb" out/minikube_latest_s390x.deb
107102

108103
cp "out/minikube-${RPM_VERSION}-0.x86_64.rpm" out/minikube-latest.x86_64.rpm
109104
cp "out/minikube-${RPM_VERSION}-0.aarch64.rpm" out/minikube-latest.aarch64.rpm
110-
cp "out/minikube-${RPM_VERSION}-0.armv7hl.rpm" out/minikube-latest.armv7hl.rpm
111105
cp "out/minikube-${RPM_VERSION}-0.ppc64le.rpm" out/minikube-latest.ppc64le.rpm
112106
cp "out/minikube-${RPM_VERSION}-0.s390x.rpm" out/minikube-latest.s390x.rpm
113107

‎pkg/minikube/constants/constants.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929

3030
var (
3131
// SupportedArchitectures is the list of supported architectures
32-
SupportedArchitectures = [5]string{"amd64", "arm", "arm64", "ppc64le", "s390x"}
32+
SupportedArchitectures = [4]string{"amd64", "arm64", "ppc64le", "s390x"}
3333
)
3434

3535
const (

‎pkg/minikube/detect/detect.go‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828

2929
"github.com/klauspost/cpuid"
3030
"github.com/spf13/viper"
31-
"golang.org/x/sys/cpu"
3231
"k8s.io/klog/v2"
3332
"k8s.io/minikube/pkg/minikube/constants"
3433
"k8s.io/minikube/pkg/minikube/localpath"
@@ -41,18 +40,7 @@ func RuntimeOS() string {
4140

4241
// RuntimeArch returns the runtime architecture
4342
func RuntimeArch() string {
44-
arch := runtime.GOARCH
45-
if arch == "arm" {
46-
// runtime.GOARM
47-
if !cpu.ARM.HasVFP {
48-
return "arm/v5"
49-
}
50-
if !cpu.ARM.HasVFPv3 {
51-
return "arm/v6"
52-
}
53-
// "arm" (== "arm/v7")
54-
}
55-
return arch
43+
return runtime.GOARCH
5644
}
5745

5846
// IsMicrosoftWSL will return true if process is running in WSL in windows

‎pkg/minikube/download/image.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,6 @@ func GHKicbaseTarballToCache(kicBaseVersion string) (string, error) {
234234
fileLock := f + ".lock"
235235

236236
kicbaseArch := runtime.GOARCH
237-
if kicbaseArch == "arm" {
238-
kicbaseArch = "armv7"
239-
}
240237

241238
releaser, err := lockDownload(fileLock)
242239
if err != nil {

‎site/content/en/docs/start/_index.md‎

Lines changed: 1 addition & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ All you need is Docker (or similarly compatible) container or a Virtual Machine
2626
"Linux/ARM64",
2727
"Linux/ppc64",
2828
"Linux/S390x",
29-
"Linux/ARMv7",
3029
"macOS/x86-64",
3130
"macOS/ARM64",
3231
"Windows/x86-64"
@@ -66,7 +65,7 @@ Click on the buttons that describe your target platform. For other architectures
6665
{{% /quiz_row %}}
6766

6867
{{% quiz_row base="/Linux" name="Architecture" %}}
69-
{{% quiz_button option="x86-64" %}} {{% quiz_button option="ARM64" %}} {{% quiz_button option="ARMv7" %}} {{% quiz_button option="ppc64" %}} {{% quiz_button option="S390x" %}}
68+
{{% quiz_button option="x86-64" %}} {{% quiz_button option="ARM64" %}} {{% quiz_button option="ppc64" %}} {{% quiz_button option="S390x" %}}
7069
{{% /quiz_row %}}
7170

7271
{{% quiz_row base="/Linux/x86-64" name="Release type" %}}
@@ -117,18 +116,6 @@ Click on the buttons that describe your target platform. For other architectures
117116
{{% quiz_button option="Binary download" %}} {{% quiz_button option="Debian package" %}} {{% quiz_button option="RPM package" %}}
118117
{{% /quiz_row %}}
119118

120-
{{% quiz_row base="/Linux/ARMv7" name="Release type" %}}
121-
{{% quiz_button option="Stable" %}} {{% quiz_button option="Beta" hide="true" %}}
122-
{{% /quiz_row %}}
123-
124-
{{% quiz_row base="/Linux/ARMv7/Stable" name="Installer type" %}}
125-
{{% quiz_button option="Binary download" %}} {{% quiz_button option="Debian package" %}} {{% quiz_button option="RPM package" %}}
126-
{{% /quiz_row %}}
127-
128-
{{% quiz_row base="/Linux/ARMv7/Beta" name="Installer type" %}}
129-
{{% quiz_button option="Binary download" %}} {{% quiz_button option="Debian package" %}} {{% quiz_button option="RPM package" %}}
130-
{{% /quiz_row %}}
131-
132119
{{% quiz_row base="/macOS" name="Architecture" %}}
133120
{{% quiz_button option="x86-64" %}} {{% quiz_button option="ARM64" %}}
134121
{{% /quiz_row %}}
@@ -353,51 +340,6 @@ curl -L $u > minikube-beta.s390x.rpm && sudo rpm -Uvh minikube-beta.s390x.rpm
353340
```
354341
{{% /quiz_instruction %}}
355342

356-
{{% quiz_instruction id="/Linux/ARMv7/Stable/Binary download" %}}
357-
```shell
358-
curl -LO https://github.com/kubernetes/minikube/releases/latest/download/minikube-linux-arm
359-
sudo install minikube-linux-arm /usr/local/bin/minikube && rm minikube-linux-arm
360-
```
361-
{{% /quiz_instruction %}}
362-
363-
{{% quiz_instruction id="/Linux/ARMv7/Beta/Binary download" %}}
364-
```shell
365-
r=https://api.github.com/repos/kubernetes/minikube/releases
366-
curl -LO $(curl -s $r | grep -o 'http.*download/v.*beta.*/minikube-linux-arm' | head -n1)
367-
sudo install minikube-linux-arm /usr/local/bin/minikube && rm minikube-linux-arm
368-
```
369-
{{% /quiz_instruction %}}
370-
371-
{{% quiz_instruction id="/Linux/ARMv7/Stable/Debian package" %}}
372-
```shell
373-
curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_latest_armhf.deb
374-
sudo dpkg -i minikube_latest_armhf.deb
375-
```
376-
{{% /quiz_instruction %}}
377-
378-
{{% quiz_instruction id="/Linux/ARMv7/Beta/Debian package" %}}
379-
```shell
380-
r=https://api.github.com/repos/kubernetes/minikube/releases
381-
u=$(curl -s $r | grep -o 'http.*download/v.*beta.*/minikube_.*_armhf.deb' | head -n1)
382-
curl -L $u > minikube_beta_armhf.deb && sudo dpkg -i minikube_beta_armhf.deb
383-
```
384-
{{% /quiz_instruction %}}
385-
386-
{{% quiz_instruction id="/Linux/ARMv7/Stable/RPM package" %}}
387-
```shell
388-
curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-latest.armv7hl.rpm
389-
sudo rpm -Uvh minikube-latest.armv7hl.rpm
390-
```
391-
{{% /quiz_instruction %}}
392-
393-
{{% quiz_instruction id="/Linux/ARMv7/Beta/RPM package" %}}
394-
```shell
395-
r=https://api.github.com/repos/kubernetes/minikube/releases
396-
u=$(curl -s $r | grep -o 'http.*download/v.*beta.*/minikube-.*.armv7hl.rpm' | head -n1)
397-
curl -L $u > minikube-beta.armv7hl.rpm && sudo rpm -Uvh minikube-beta.armv7hl.rpm
398-
```
399-
{{% /quiz_instruction %}}
400-
401343
{{% quiz_instruction id="/macOS/x86-64/Stable/Homebrew" %}}
402344
If the [Homebrew Package Manager](https://brew.sh/) is installed:
403345

0 commit comments

Comments
 (0)