Skip to content

Commit 5dc0ab2

Browse files
authored
Merge pull request #5999 from MartinForReal/main
✨ Upgrade to Kubernetes 1.23.3 in Quickstart and CI
2 parents 72ef359 + 1f279f4 commit 5dc0ab2

File tree

10 files changed

+21
-21
lines changed

10 files changed

+21
-21
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,10 +391,10 @@ Examples:
391391
```bash
392392
$ kubectl get kubeadmcontrolplane
393393
NAMESPACE NAME INITIALIZED API SERVER AVAILABLE REPLICAS READY UPDATED UNAVAILABLE AGE VERSION
394-
quick-start-d5ufye quick-start-ntysk0-control-plane true true 1 1 1 2m44s v1.23.0
394+
quick-start-d5ufye quick-start-ntysk0-control-plane true true 1 1 1 2m44s v1.23.3
395395
$ kubectl get machinedeployment
396396
NAMESPACE NAME CLUSTER REPLICAS READY UPDATED UNAVAILABLE PHASE AGE VERSION
397-
quick-start-d5ufye quick-start-ntysk0-md-0 quick-start-ntysk0 1 1 1 ScalingUp 3m28s v1.23.0
397+
quick-start-d5ufye quick-start-ntysk0-md-0 quick-start-ntysk0 1 1 1 ScalingUp 3m28s v1.23.3
398398
```
399399

400400
## Google Doc Viewing Permissions

docs/book/src/user/quick-start.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ For the purpose of this tutorial, we'll name our cluster capi-quickstart.
633633
634634
```bash
635635
clusterctl generate cluster capi-quickstart \
636-
--kubernetes-version v1.23.0 \
636+
--kubernetes-version v1.23.3 \
637637
--control-plane-machine-count=3 \
638638
--worker-machine-count=3 \
639639
> capi-quickstart.yaml
@@ -652,7 +652,7 @@ The Docker provider is not designed for production use and is intended for devel
652652
653653
```bash
654654
clusterctl generate cluster capi-quickstart --flavor development \
655-
--kubernetes-version v1.23.0 \
655+
--kubernetes-version v1.23.3 \
656656
--control-plane-machine-count=3 \
657657
--worker-machine-count=3 \
658658
> capi-quickstart.yaml
@@ -662,7 +662,7 @@ To create a Cluster with ClusterClass:
662662
663663
```bash
664664
clusterctl generate cluster capi-quickstart --flavor development-topology \
665-
--kubernetes-version v1.23.0 \
665+
--kubernetes-version v1.23.3 \
666666
--control-plane-machine-count=3 \
667667
--worker-machine-count=3 \
668668
> capi-quickstart.yaml
@@ -722,7 +722,7 @@ You should see an output is similar to this:
722722
723723
```bash
724724
NAME INITIALIZED API SERVER AVAILABLE VERSION REPLICAS READY UPDATED UNAVAILABLE
725-
capi-quickstart-control-plane true v1.23.0 3 3 3
725+
capi-quickstart-control-plane true v1.23.3 3 3 3
726726
```
727727
728728
<aside class="note warning">

test/e2e/config/docker.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,10 @@ variables:
199199
# allowing the same e2e config file to be re-used in different Prow jobs e.g. each one with a K8s version permutation.
200200
# The following Kubernetes versions should be the latest versions with already published kindest/node images.
201201
# This avoids building node images in the default case which improves the test duration significantly.
202-
KUBERNETES_VERSION_MANAGEMENT: "v1.23.0"
203-
KUBERNETES_VERSION: "v1.23.0"
202+
KUBERNETES_VERSION_MANAGEMENT: "v1.23.3"
203+
KUBERNETES_VERSION: "v1.23.3"
204204
KUBERNETES_VERSION_UPGRADE_FROM: "v1.22.4"
205-
KUBERNETES_VERSION_UPGRADE_TO: "v1.23.0"
205+
KUBERNETES_VERSION_UPGRADE_TO: "v1.23.3"
206206
ETCD_VERSION_UPGRADE_TO: "3.5.1-0"
207207
COREDNS_VERSION_UPGRADE_TO: "1.8.4"
208208
DOCKER_SERVICE_DOMAIN: "cluster.local"
@@ -224,7 +224,7 @@ variables:
224224
# NOTE: We test the latest release with a previous contract.
225225
INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.4/clusterctl-{OS}-{ARCH}"
226226
INIT_WITH_PROVIDERS_CONTRACT: "v1alpha4"
227-
INIT_WITH_KUBERNETES_VERSION: "v1.23.0"
227+
INIT_WITH_KUBERNETES_VERSION: "v1.23.3"
228228

229229
intervals:
230230
default/wait-controllers: ["3m", "10s"]

test/framework/bootstrap/kind_provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const (
3737
DefaultNodeImageRepository = "kindest/node"
3838

3939
// DefaultNodeImageVersion is the default Kubernetes version to be used for creating a kind cluster.
40-
DefaultNodeImageVersion = "v1.23.0"
40+
DefaultNodeImageVersion = "v1.23.3"
4141
)
4242

4343
// KindClusterOption is a NewKindClusterProvider option.

test/infrastructure/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ENV GOPROXY=$goproxy
2525
# Gets additional CAPD dependencies
2626
WORKDIR /tmp
2727

28-
RUN curl -LO https://dl.k8s.io/release/v1.23.0/bin/linux/${ARCH}/kubectl && \
28+
RUN curl -LO https://dl.k8s.io/release/v1.23.3/bin/linux/${ARCH}/kubectl && \
2929
chmod +x ./kubectl && \
3030
mv ./kubectl /usr/bin/kubectl
3131

test/infrastructure/docker/examples/machine-pool.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ metadata:
2929
namespace: default
3030
spec:
3131
replicas: 1
32-
version: v1.23.0
32+
version: v1.23.3
3333
machineTemplate:
3434
infrastructureRef:
3535
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -86,7 +86,7 @@ spec:
8686
kind: DockerMachinePool
8787
name: worker-dmp-0
8888
namespace: default
89-
version: v1.23.0
89+
version: v1.23.3
9090
---
9191
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
9292
kind: DockerMachinePool

test/infrastructure/docker/examples/simple-cluster-ipv6.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ metadata:
4444
namespace: default
4545
spec:
4646
replicas: 1
47-
version: v1.23.0
47+
version: v1.23.3
4848
machineTemplate:
4949
infrastructureRef:
5050
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -120,7 +120,7 @@ spec:
120120
cluster.x-k8s.io/cluster-name: my-cluster
121121
template:
122122
spec:
123-
version: v1.23.0
123+
version: v1.23.3
124124
clusterName: my-cluster
125125
bootstrap:
126126
configRef:

test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ metadata:
3838
name: controlplane-0
3939
namespace: default
4040
spec:
41-
version: v1.23.0
41+
version: v1.23.3
4242
clusterName: my-cluster
4343
bootstrap:
4444
configRef:
@@ -106,7 +106,7 @@ spec:
106106
cluster.x-k8s.io/cluster-name: my-cluster
107107
template:
108108
spec:
109-
version: v1.23.0
109+
version: v1.23.3
110110
clusterName: my-cluster
111111
bootstrap:
112112
configRef:

test/infrastructure/docker/examples/simple-cluster.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ metadata:
4444
namespace: default
4545
spec:
4646
replicas: 1
47-
version: v1.23.0
47+
version: v1.23.3
4848
machineTemplate:
4949
infrastructureRef:
5050
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -105,7 +105,7 @@ spec:
105105
cluster.x-k8s.io/cluster-name: my-cluster
106106
template:
107107
spec:
108-
version: v1.23.0
108+
version: v1.23.3
109109
clusterName: my-cluster
110110
bootstrap:
111111
configRef:

test/infrastructure/docker/internal/docker/machine.go

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

4747
const (
4848
defaultImageName = "kindest/node"
49-
defaultImageTag = "v1.23.0"
49+
defaultImageTag = "v1.23.3"
5050
)
5151

5252
type nodeCreator interface {

0 commit comments

Comments
 (0)