Skip to content

Commit c920241

Browse files
authored
Merge pull request #4852 from vincepri/k8s1212
🌱 Start testing with Kubernetes 1.21.2
2 parents 604f598 + 8c0a601 commit c920241

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export GO111MODULE=on
3939
#
4040
# Kubebuilder.
4141
#
42-
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.19.2
42+
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.21.2
4343
export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?= 60s
4444
export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?= 60s
4545

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ providers = {
8181
"third_party",
8282
],
8383
"additional_docker_helper_commands": """
84-
RUN wget -qO- https://dl.k8s.io/v1.19.2/kubernetes-client-linux-amd64.tar.gz | tar xvz
84+
RUN wget -qO- https://dl.k8s.io/v1.21.2/kubernetes-client-linux-amd64.tar.gz | tar xvz
8585
RUN wget -qO- https://get.docker.com | sh
8686
""",
8787
"additional_docker_build_commands": """

docs/book/src/clusterctl/developers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ When selecting the `--kubernetes-version`, ensure that the `kindest/node`
178178
image is available.
179179

180180
For example, on [docker hub][kind-docker-hub] there is no
181-
image for version `v1.19.2`, therefore creating a CAPD workload cluster with
182-
`--kubernetes-version=v1.19.2` will fail. See [issue 3795] for more details.
181+
image for version `v1.21.2`, therefore creating a CAPD workload cluster with
182+
`--kubernetes-version=v1.21.2` will fail. See [issue 3795] for more details.
183183

184184
### Get the kubeconfig for the workload cluster
185185

docs/book/src/developer/tilt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ for the provider and performs a live update of the running container.
240240
docker build. e.g.
241241
242242
``` Dockerfile
243-
RUN wget -qO- https://dl.k8s.io/v1.19.2/kubernetes-client-linux-amd64.tar.gz | tar xvz
243+
RUN wget -qO- https://dl.k8s.io/v1.21.2/kubernetes-client-linux-amd64.tar.gz | tar xvz
244244
RUN wget -qO- https://get.docker.com | sh
245245
```
246246

test/infrastructure/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
5353
# Gets additional CAPD dependencies
5454
WORKDIR /tmp
5555

56-
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.19.2/bin/linux/amd64/kubectl && \
56+
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.21.2/bin/linux/amd64/kubectl && \
5757
chmod +x ./kubectl && \
5858
mv ./kubectl /usr/bin/kubectl
5959

test/infrastructure/docker/Dockerfile.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ENV GOPROXY=$goproxy
2828

2929
WORKDIR /tmp
3030
# install a couple of dependencies
31-
RUN curl -L https://dl.k8s.io/v1.19.2/kubernetes-client-linux-amd64.tar.gz | tar xvz
31+
RUN curl -L https://dl.k8s.io/v1.21.2/kubernetes-client-linux-amd64.tar.gz | tar xvz
3232
RUN mv /tmp/kubernetes/client/bin/kubectl /usr/local/bin
3333
RUN curl https://get.docker.com | sh
3434

0 commit comments

Comments
 (0)