Skip to content

Commit b292922

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #7621 from sbueringer/pr-bump-capd-images
🌱 Use latest kind images for CAPD
2 parents 0a17fa2 + b64e3b1 commit b292922

File tree

12 files changed

+29
-29
lines changed

12 files changed

+29
-29
lines changed

‎Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
envsubst_cmd = "./hack/tools/bin/envsubst"
44
clusterctl_cmd = "./bin/clusterctl"
55
kubectl_cmd = "kubectl"
6-
kubernetes_version = "v1.25.0"
6+
kubernetes_version = "v1.25.3"
77

88
if str(local("command -v " + kubectl_cmd + " || true", quiet = True)) == "":
99
fail("Required command '" + kubectl_cmd + "' not found in PATH")

‎docs/book/src/developer/tilt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ Custom values for variable substitutions can be set using `kustomize_substitutio
312312
```yaml
313313
kustomize_substitutions:
314314
NAMESPACE: default
315-
KUBERNETES_VERSION: v1.25.0
315+
KUBERNETES_VERSION: v1.25.3
316316
CONTROL_PLANE_MACHINE_COUNT: 1
317317
WORKER_MACHINE_COUNT: 3
318318
```

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,7 @@ The Docker provider is not designed for production use and is intended for devel
11221122
11231123
```bash
11241124
clusterctl generate cluster capi-quickstart --flavor development \
1125-
--kubernetes-version v1.25.0 \
1125+
--kubernetes-version v1.25.3 \
11261126
--control-plane-machine-count=3 \
11271127
--worker-machine-count=3 \
11281128
> capi-quickstart.yaml
@@ -1165,7 +1165,7 @@ clusterctl generate cluster capi-quickstart \
11651165
11661166
```bash
11671167
clusterctl generate cluster capi-quickstart \
1168-
--kubernetes-version v1.25.0 \
1168+
--kubernetes-version v1.25.3 \
11691169
--control-plane-machine-count=3 \
11701170
--worker-machine-count=3 \
11711171
> capi-quickstart.yaml
@@ -1225,7 +1225,7 @@ You should see an output is similar to this:
12251225
12261226
```bash
12271227
NAME CLUSTER INITIALIZED API SERVER AVAILABLE REPLICAS READY UPDATED UNAVAILABLE AGE VERSION
1228-
capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.25.0
1228+
capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.25.3
12291229
```
12301230
12311231
<aside class="note warning">
@@ -1427,12 +1427,12 @@ kubectl --kubeconfig=./capi-quickstart.kubeconfig get nodes
14271427
```
14281428
```bash
14291429
NAME STATUS ROLES AGE VERSION
1430-
capi-quickstart-g2trk-9xrjv Ready control-plane 12m v1.25.0
1431-
capi-quickstart-g2trk-bmm9v Ready control-plane 11m v1.25.0
1432-
capi-quickstart-g2trk-hvs9q Ready control-plane 13m v1.25.0
1433-
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 12m v1.25.0
1434-
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 12m v1.25.0
1435-
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 12m v1.25.0
1430+
capi-quickstart-g2trk-9xrjv Ready control-plane 12m v1.25.3
1431+
capi-quickstart-g2trk-bmm9v Ready control-plane 11m v1.25.3
1432+
capi-quickstart-g2trk-hvs9q Ready control-plane 13m v1.25.3
1433+
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 12m v1.25.3
1434+
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 12m v1.25.3
1435+
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 12m v1.25.3
14361436
```
14371437
14381438
{{#/tab }}

‎test/e2e/clusterctl_upgrade_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ var _ = Describe("When testing clusterctl upgrades (v0.4=>current)", func() {
5353
SkipCleanup: skipCleanup,
5454
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.8/clusterctl-{OS}-{ARCH}",
5555
InitWithProvidersContract: "v1alpha4",
56-
InitWithKubernetesVersion: "v1.25.0",
56+
InitWithKubernetesVersion: "v1.25.3",
5757
}
5858
})
5959
})
@@ -68,7 +68,7 @@ var _ = Describe("When testing clusterctl upgrades (v1.2=>current)", func() {
6868
SkipCleanup: skipCleanup,
6969
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.5/clusterctl-{OS}-{ARCH}",
7070
InitWithProvidersContract: "v1beta1",
71-
InitWithKubernetesVersion: "v1.25.0",
71+
InitWithKubernetesVersion: "v1.25.3",
7272
}
7373
})
7474
})
@@ -83,7 +83,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.2=>cur
8383
SkipCleanup: skipCleanup,
8484
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.5/clusterctl-{OS}-{ARCH}",
8585
InitWithProvidersContract: "v1beta1",
86-
InitWithKubernetesVersion: "v1.25.0",
86+
InitWithKubernetesVersion: "v1.25.3",
8787
WorkloadFlavor: "topology",
8888
}
8989
})

‎test/e2e/config/docker.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,10 @@ variables:
215215
# allowing the same e2e config file to be re-used in different Prow jobs e.g. each one with a K8s version permutation.
216216
# The following Kubernetes versions should be the latest versions with already published kindest/node images.
217217
# This avoids building node images in the default case which improves the test duration significantly.
218-
KUBERNETES_VERSION_MANAGEMENT: "v1.25.0"
219-
KUBERNETES_VERSION: "v1.25.0"
220-
KUBERNETES_VERSION_UPGRADE_FROM: "1.24.4"
221-
KUBERNETES_VERSION_UPGRADE_TO: "v1.25.0"
218+
KUBERNETES_VERSION_MANAGEMENT: "v1.25.3"
219+
KUBERNETES_VERSION: "v1.25.3"
220+
KUBERNETES_VERSION_UPGRADE_FROM: "v1.24.7"
221+
KUBERNETES_VERSION_UPGRADE_TO: "v1.25.3"
222222
ETCD_VERSION_UPGRADE_TO: "3.5.4-0"
223223
COREDNS_VERSION_UPGRADE_TO: "v1.9.3"
224224
DOCKER_SERVICE_DOMAIN: "cluster.local"

‎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.25.0"
40+
DefaultNodeImageVersion = "v1.25.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
@@ -33,7 +33,7 @@ ENV GOPROXY=$goproxy
3333
# Gets additional CAPD dependencies
3434
WORKDIR /tmp
3535

36-
RUN curl -LO "https://dl.k8s.io/release/v1.25.0/bin/linux/${ARCH}/kubectl" && \
36+
RUN curl -LO "https://dl.k8s.io/release/v1.25.3/bin/linux/${ARCH}/kubectl" && \
3737
chmod +x ./kubectl && \
3838
mv ./kubectl /usr/bin/kubectl
3939

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ metadata:
3535
namespace: default
3636
spec:
3737
replicas: 1
38-
version: v1.25.0
38+
version: v1.25.3
3939
machineTemplate:
4040
infrastructureRef:
4141
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -80,7 +80,7 @@ spec:
8080
replicas: 2
8181
template:
8282
spec:
83-
version: v1.25.0
83+
version: v1.25.3
8484
clusterName: my-cluster
8585
bootstrap:
8686
configRef:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ metadata:
3535
namespace: default
3636
spec:
3737
replicas: 1
38-
version: v1.25.0
38+
version: v1.25.3
3939
machineTemplate:
4040
infrastructureRef:
4141
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -90,7 +90,7 @@ spec:
9090
cluster.x-k8s.io/cluster-name: my-cluster
9191
template:
9292
spec:
93-
version: v1.25.0
93+
version: v1.25.3
9494
clusterName: my-cluster
9595
bootstrap:
9696
configRef:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ metadata:
3232
name: controlplane-0
3333
namespace: default
3434
spec:
35-
version: v1.25.0
35+
version: v1.25.3
3636
clusterName: my-cluster
3737
bootstrap:
3838
configRef:
@@ -80,7 +80,7 @@ spec:
8080
cluster.x-k8s.io/cluster-name: my-cluster
8181
template:
8282
spec:
83-
version: v1.25.0
83+
version: v1.25.3
8484
clusterName: my-cluster
8585
bootstrap:
8686
configRef:

0 commit comments

Comments
 (0)