Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport PR #2736 to release/v1.7 for update ubuntu version for devcontainer #2750

Merged
merged 1 commit into from
Nov 18, 2024
Merged

Backport PR #2736 to release/v1.7 for update ubuntu version for devcontainer #2750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Makefile.d/helm.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ helm/install: $(BINDIR)/helm

$(BINDIR)/helm:
mkdir -p $(BINDIR)
curl -fsSL "https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3" | HELM_INSTALL_DIR=$(BINDIR) bash
$(eval DARCH := $(subst aarch64,arm64,$(ARCH)))
TAR_NAME=helm-$(HELM_VERSION)-$(OS)-$(subst x86_64,amd64,$(shell echo $(DARCH) | tr '[:upper:]' '[:lower:]')) \
&& cd $(TEMP_DIR) \
&& curl -fsSL "https://get.helm.sh/$${TAR_NAME}.tar.gz" -o "$(TEMP_DIR)/$${TAR_NAME}" \
&& tar -xzvf "$(TEMP_DIR)/$${TAR_NAME}" --strip=1 \
&& mv helm $(BINDIR)/helm

.PHONY: helm-docs/install
## install helm-docs
Expand All @@ -32,7 +37,7 @@ $(BINDIR)/helm-docs:
TAR_NAME=helm-docs_$(HELM_DOCS_VERSION)_$(UNAME)_$(DARCH).tar.gz \
&& cd $(TEMP_DIR) \
&& curl -fsSL "https://github.com/norwoodj/helm-docs/releases/download/v$(HELM_DOCS_VERSION)/$${TAR_NAME}" -o "$(TEMP_DIR)/$${TAR_NAME}"\
&& tar xzvf "$(TEMP_DIR)/$${TAR_NAME}" \
&& tar -xzvf "$(TEMP_DIR)/$${TAR_NAME}" \
&& mv helm-docs $(BINDIR)/helm-docs

.PHONY: helm/package/vald
Expand Down
11 changes: 3 additions & 8 deletions dockers/dev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# DO_NOT_EDIT this Dockerfile is generated by https://github.com/vdaas/vald/blob/main/hack/docker/gen/main.go
ARG UPX_OPTIONS=-9
# skipcq: DOK-DL3026,DOK-DL3007
FROM mcr.microsoft.com/devcontainers/base:ubuntu22.04
FROM mcr.microsoft.com/devcontainers/base:ubuntu24.04
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Reconsider Ubuntu 24.04 upgrade in release branch

Upgrading to Ubuntu 24.04 in a release branch (v1.7) raises concerns:

  1. Ubuntu 24.04 is currently in development/beta phase
  2. This could introduce unexpected stability issues in the development environment
  3. Release branches typically should maintain stable, well-tested configurations

Consider keeping Ubuntu 22.04 LTS for the v1.7 release branch and potentially targeting this upgrade for the next major release instead.

LABEL maintainer="vdaas.org vald team <vald@vdaas.org>"
# skipcq: DOK-DL3002
USER root:root
Expand Down Expand Up @@ -65,15 +65,10 @@ RUN --mount=type=bind,target=.,rw \
&& apt-get update -y \
&& apt-get upgrade -y \
&& apt-get install -y --no-install-recommends --fix-missing \
curl \
gnupg \
software-properties-common \
&& add-apt-repository ppa:ubuntu-toolchain-r/test -y \
&& apt-get update -y \
&& apt-get upgrade -y \
&& apt-get install -y --no-install-recommends --fix-missing \
build-essential \
ca-certificates \
curl \
gnupg \
tzdata \
locales \
git \
Expand Down
15 changes: 3 additions & 12 deletions hack/docker/gen/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,20 +93,12 @@ RUN {{RunMounts .RunMounts}} \
&& apt-get clean \
&& apt-get update -y \
&& apt-get upgrade -y \
{{- if eq (ContainerName .ContainerType) "%s"}}
&& apt-get install -y --no-install-recommends --fix-missing \
curl \
gnupg \
software-properties-common \
&& add-apt-repository ppa:ubuntu-toolchain-r/test -y \
&& apt-get update -y \
&& apt-get upgrade -y \
{{- end}}
&& apt-get install -y --no-install-recommends --fix-missing \
build-essential \
ca-certificates \
{{- if not (eq (ContainerName .ContainerType) "%s")}}
curl \
{{- if eq (ContainerName .ContainerType) "%s"}}
gnupg \
{{- end}}
tzdata \
locales \
Expand Down Expand Up @@ -144,7 +136,6 @@ ENTRYPOINT [{{Entrypoint .Entrypoints}}]
ENTRYPOINT ["{{.BinDir}}/{{.AppName}}"]
{{- end}}
{{- end}}`, DevContainer.String(), CIContainer.String(),
DevContainer.String(),
DevContainer.String(),
DevContainer.String(), CIContainer.String(),
DevContainer.String(), CIContainer.String())
Expand Down Expand Up @@ -239,7 +230,7 @@ const (
defaultBuildStageName = "builder"
maintainerKey = "MAINTAINER"
minimumArgumentLength = 2
ubuntuVersion = "22.04"
ubuntuVersion = "24.04"

goWorkdir = "${GOPATH}/src/github.com"
rustWorkdir = "${HOME}/rust/src/github.com"
Expand Down
Loading