From 9585a1b1a0500897a1e8060d33a5ed6bb174902b Mon Sep 17 00:00:00 2001 From: Arthur Le Roux Date: Fri, 26 Jan 2024 11:49:49 +0100 Subject: [PATCH] feat: introduce extra node option --- README.md | 10 ++++++++++ docker/24-dind/Containerfile | 10 +++++----- docker/24-dind/kind.yaml | 1 + 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b38557d..3a99732 100644 --- a/README.md +++ b/README.md @@ -88,3 +88,13 @@ curl -k https://127.0.0.1:8443 rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' ``` + +## Add Extra Nodes + +Define the environment variable : +```bash +CLUSTER_EXTRA_NODES=" #Mind the EOL + - role: worker + - role: worker + - role: worker" +``` diff --git a/docker/24-dind/Containerfile b/docker/24-dind/Containerfile index a3fff43..02338d5 100644 --- a/docker/24-dind/Containerfile +++ b/docker/24-dind/Containerfile @@ -1,17 +1,17 @@ -FROM docker:24.0.4-dind as build +FROM docker:24.0.8-dind as build ARG KIND_VERSION=v0.20.0 -RUN apk add --no-cache go=1.20.10-r0 \ +RUN apk add --no-cache go=1.21.6-r0 \ && go install "sigs.k8s.io/kind@${KIND_VERSION}" -FROM docker:24.0.4-dind as base +FROM docker:24.0.8-dind as base COPY --from=build /root/go/bin/kind /usr/local/bin/kind RUN apk add --no-cache ca-certificates=20230506-r0 \ - gettext=0.21.1-r7 \ - bash=5.2.15-r5 + gettext=0.22.3-r0 \ + bash=5.2.21-r0 WORKDIR /app diff --git a/docker/24-dind/kind.yaml b/docker/24-dind/kind.yaml index 38374a5..ef84e4f 100644 --- a/docker/24-dind/kind.yaml +++ b/docker/24-dind/kind.yaml @@ -16,6 +16,7 @@ nodes: # Propagate (hopefully) images cache - containerPath: /var/lib/docker/image/overlay2 hostPath: /var/lib/docker/image/overlay2 + #Extra Nodes (if needed) ${CLUSTER_EXTRA_NODES} kubeadmConfigPatchesJSON6902: - group: kubeadm.k8s.io version: v1beta2