Skip to content

added TOOLS_CILIUM_VERSION #3

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

Merged
dimetron merged 1 commit into from
Jul 7, 2025
+58 −3
Merged

added TOOLS_CILIUM_VERSION #3

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
45 changes: 44 additions & 1 deletion .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM mcr.microsoft.com/devcontainers/go:1-1.24-bookworm
ARG TOOLS_GO_VERSION
FROM mcr.microsoft.com/devcontainers/go:1-${TOOLS_GO_VERSION}-bookworm

RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \
Expand All @@ -16,4 +17,46 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
vim \
zsh

ARG TARGETARCH
ARG TOOLS_HELM_VERSION
ARG TOOLS_ISTIO_VERSION
ARG TOOLS_ARGO_ROLLOUTS_VERSION
ARG TOOLS_KUBECTL_VERSION
ARG TOOLS_CILIUM_VERSION

WORKDIR /downloads

RUN curl -LO "https://dl.k8s.io/release/v$TOOLS_KUBECTL_VERSION/bin/linux/$TARGETARCH/kubectl" \
&& mv kubectl /usr/bin/kubectl \
&& chmod +x /usr/bin/kubectl \
&& /usr/bin/kubectl version --client

RUN curl -L https://istio.io/downloadIstio | ISTIO_VERSION=$TOOLS_ISTIO_VERSION TARGET_ARCH=$TARGETARCH sh - \
&& mv istio-*/bin/istioctl /usr/bin/ \
&& rm -rf istio-* \
&& /usr/bin/istioctl --help

# Install Helm
RUN curl -Lo helm.tar.gz https://get.helm.sh/helm-v${TOOLS_HELM_VERSION}-linux-${TARGETARCH}.tar.gz \
&& tar -xvf helm.tar.gz \
&& mv linux-${TARGETARCH}/helm /usr/bin/helm \
&& chmod +x /usr/bin/helm \
&& rm -rf helm.tar.gz linux-${TARGETARCH} \
&& /usr/bin/helm version

# Install kubectl-argo-rollouts
RUN curl -Lo /usr/bin/kubectl-argo-rollouts https://github.com/argoproj/argo-rollouts/releases/download/v${TOOLS_ARGO_ROLLOUTS_VERSION}/kubectl-argo-rollouts-linux-${TARGETARCH} \
&& chmod +x /usr/bin/kubectl-argo-rollouts \
&& /usr/bin/kubectl-argo-rollouts version

# Install Cilium CLI
RUN curl -Lo cilium.tar.gz https://github.com/cilium/cilium-cli/releases/download/v${TOOLS_CILIUM_VERSION}/cilium-linux-${TARGETARCH}.tar.gz \
&& tar -xvf cilium.tar.gz \
&& mv cilium /usr/bin/cilium \
&& chmod +x /usr/bin/cilium \
&& rm -rf cilium.tar.gz \
&& /usr/bin/cilium version

WORKDIR /tools

ENTRYPOINT ["zsh"]
13 changes: 11 additions & 2 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,18 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"TOOLS_GO_VERSION": "1.24.4",
"TOOLS_GO_VERSION": "1.24",
"TOOLS_HELM_VERSION": "3.18.3",
"TOOLS_ISTIO_VERSION": "1.26.2",
"TOOLS_KUBECTL_VERSION": "1.33.2",
"TOOLS_ARGO_ROLLOUTS_VERSION": "1.8.3",
"TOOLS_CILIUM_VERSION": "0.16.29"
}
},
"features": {
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {},
"ghcr.io/mpriscella/features/kind:1": {}
},
"customizations": {
"vscode": {
"extensions": [
Expand Down Expand Up @@ -37,7 +46,7 @@
"remoteUser": "root",

//forward the following ports
//"forwardPorts": [8084],
"forwardPorts": [8084],

//mount docker directly on the host
"mounts": ["source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"],
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ARG TOOLS_HELM_VERSION
ARG TOOLS_ISTIO_VERSION
ARG TOOLS_ARGO_ROLLOUTS_VERSION
ARG TOOLS_KUBECTL_VERSION
ARG TOOLS_CILIUM_VERSION

WORKDIR /downloads

Expand Down
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ TOOLS_ISTIO_VERSION ?= 1.26.2
TOOLS_ARGO_ROLLOUTS_VERSION ?= 1.8.3
TOOLS_KUBECTL_VERSION ?= 1.33.2
TOOLS_HELM_VERSION ?= 3.18.3
TOOLS_CILIUM_VERSION ?= 1.17.5

# build args
TOOLS_IMAGE_BUILD_ARGS = --build-arg VERSION=$(VERSION)
Expand All @@ -112,6 +113,7 @@ TOOLS_IMAGE_BUILD_ARGS += --build-arg TOOLS_ISTIO_VERSION=$(TOOLS_ISTIO_VERSION)
TOOLS_IMAGE_BUILD_ARGS += --build-arg TOOLS_ARGO_ROLLOUTS_VERSION=$(TOOLS_ARGO_ROLLOUTS_VERSION)
TOOLS_IMAGE_BUILD_ARGS += --build-arg TOOLS_KUBECTL_VERSION=$(TOOLS_KUBECTL_VERSION)
TOOLS_IMAGE_BUILD_ARGS += --build-arg TOOLS_HELM_VERSION=$(TOOLS_HELM_VERSION)
TOOLS_IMAGE_BUILD_ARGS += --build-arg TOOLS_CILIUM_VERSION=$(TOOLS_CILIUM_VERSION)

.PHONY: buildx-create
buildx-create:
Expand Down