Skip to content

Commit 8679825

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-sigs#9160 from chrischdi/pr-1-28-quickstart-capd
✨ v1.28: Prepare quickstart, capd and tests for the new release including kind bump
2 parents e2f1a48 + 5350e79 commit 8679825

File tree

11 files changed

+37
-32
lines changed

11 files changed

+37
-32
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.27.3"
6+
kubernetes_version = "v1.28.0"
77

88
load("ext://uibutton", "cmd_button", "location", "text_input")
99

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ Custom values for variable substitutions can be set using `kustomize_substitutio
330330
```yaml
331331
kustomize_substitutions:
332332
NAMESPACE: "default"
333-
KUBERNETES_VERSION: "v1.27.3"
333+
KUBERNETES_VERSION: "v1.28.0"
334334
CONTROL_PLANE_MACHINE_COUNT: "1"
335335
WORKER_MACHINE_COUNT: "3"
336336
# Note: kustomize substitutions expects the values to be strings. This can be achieved by wrapping the values in quotation marks.

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,7 @@ The Docker provider is not designed for production use and is intended for devel
12171217
12181218
```bash
12191219
clusterctl generate cluster capi-quickstart --flavor development \
1220-
--kubernetes-version v1.27.3 \
1220+
--kubernetes-version v1.28.0 \
12211221
--control-plane-machine-count=3 \
12221222
--worker-machine-count=3 \
12231223
> capi-quickstart.yaml
@@ -1229,7 +1229,7 @@ clusterctl generate cluster capi-quickstart --flavor development \
12291229
```bash
12301230
export CLUSTER_NAME=kind
12311231
export CLUSTER_NAMESPACE=vcluster
1232-
export KUBERNETES_VERSION=1.27.1
1232+
export KUBERNETES_VERSION=1.28.0
12331233
export HELM_VALUES="service:\n type: NodePort"
12341234
12351235
kubectl create namespace ${CLUSTER_NAMESPACE}
@@ -1260,7 +1260,7 @@ clusterctl generate cluster capi-quickstart \
12601260
12611261
```bash
12621262
clusterctl generate cluster capi-quickstart \
1263-
--kubernetes-version v1.27.3 \
1263+
--kubernetes-version v1.28.0 \
12641264
--control-plane-machine-count=3 \
12651265
--worker-machine-count=3 \
12661266
> capi-quickstart.yaml
@@ -1314,7 +1314,7 @@ and see an output similar to this:
13141314
13151315
```bash
13161316
NAME PHASE AGE VERSION
1317-
capi-quickstart Provisioned 8s v1.27.3
1317+
capi-quickstart Provisioned 8s v1.28.0
13181318
```
13191319
13201320
To verify the first control plane is up:
@@ -1327,7 +1327,7 @@ You should see an output is similar to this:
13271327
13281328
```bash
13291329
NAME CLUSTER INITIALIZED API SERVER AVAILABLE REPLICAS READY UPDATED UNAVAILABLE AGE VERSION
1330-
capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.27.3
1330+
capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.28.0
13311331
```
13321332
13331333
<aside class="note warning">
@@ -1536,7 +1536,7 @@ kube-scheduler-capi-quickstart-control-plane-kjjbb 1/1 Running
15361536
15371537
```bash
15381538
kubectl --kubeconfig=./capi-quickstart.kubeconfig \
1539-
apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.24.1/manifests/calico.yaml
1539+
apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.26.1/manifests/calico.yaml
15401540
```
15411541
15421542
After a short while, our nodes should be running and in `Ready` state,
@@ -1547,12 +1547,12 @@ kubectl --kubeconfig=./capi-quickstart.kubeconfig get nodes
15471547
```
15481548
```bash
15491549
NAME STATUS ROLES AGE VERSION
1550-
capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.27.3
1551-
capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.27.3
1552-
capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.27.3
1553-
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.27.3
1554-
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.27.3
1555-
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.27.3
1550+
capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.28.0
1551+
capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.28.0
1552+
capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.28.0
1553+
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.28.0
1554+
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.28.0
1555+
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.28.0
15561556
```
15571557
15581558
{{#/tab }}

‎test/e2e/clusterctl_upgrade_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ var _ = Describe("When testing clusterctl upgrades (v1.5=>current)", func() {
152152
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0/clusterctl-{OS}-{ARCH}",
153153
InitWithProvidersContract: "v1beta1",
154154
// NOTE: If this version is changed here the image and SHA must also be updated in all DockerMachineTemplates in `test/e2e/data/infrastructure-docker/v1.5/bases.
155-
InitWithKubernetesVersion: "v1.27.3",
156-
WorkloadKubernetesVersion: "v1.27.3",
155+
InitWithKubernetesVersion: "v1.28.0",
156+
WorkloadKubernetesVersion: "v1.28.0",
157157
MgmtFlavor: "topology",
158158
WorkloadFlavor: "",
159159
// This check ensures that ownerReference apiVersions are updated for all types after the upgrade.
@@ -183,8 +183,8 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.5=>cur
183183
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0/clusterctl-{OS}-{ARCH}",
184184
InitWithProvidersContract: "v1beta1",
185185
// NOTE: If this version is changed here the image and SHA must also be updated in all DockerMachineTemplates in `test/e2e/data/infrastructure-docker/v1.5/bases.
186-
InitWithKubernetesVersion: "v1.27.3",
187-
WorkloadKubernetesVersion: "v1.27.3",
186+
InitWithKubernetesVersion: "v1.28.0",
187+
WorkloadKubernetesVersion: "v1.28.0",
188188
MgmtFlavor: "topology",
189189
WorkloadFlavor: "topology",
190190
// This check ensures that ownerReference apiVersions are updated for all types after the upgrade.

‎test/e2e/config/docker.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -237,11 +237,11 @@ variables:
237237
# allowing the same e2e config file to be re-used in different Prow jobs e.g. each one with a K8s version permutation.
238238
# The following Kubernetes versions should be the latest versions with already published kindest/node images.
239239
# This avoids building node images in the default case which improves the test duration significantly.
240-
KUBERNETES_VERSION_MANAGEMENT: "v1.27.3"
241-
KUBERNETES_VERSION: "v1.27.3"
242-
KUBERNETES_VERSION_UPGRADE_FROM: "v1.26.6"
243-
KUBERNETES_VERSION_UPGRADE_TO: "v1.27.3"
244-
ETCD_VERSION_UPGRADE_TO: "3.5.7-0"
240+
KUBERNETES_VERSION_MANAGEMENT: "v1.28.0"
241+
KUBERNETES_VERSION: "v1.28.0"
242+
KUBERNETES_VERSION_UPGRADE_FROM: "v1.27.3"
243+
KUBERNETES_VERSION_UPGRADE_TO: "v1.28.0"
244+
ETCD_VERSION_UPGRADE_TO: "3.5.9-0"
245245
COREDNS_VERSION_UPGRADE_TO: "v1.10.1"
246246
DOCKER_SERVICE_DOMAIN: "cluster.local"
247247
IP_FAMILY: "dual"

‎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.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72"
40+
DefaultNodeImageVersion = "v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31"
4141
)
4242

4343
// KindClusterOption is a NewKindClusterProvider option.

‎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.27.3
38+
version: v1.28.0
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.27.3
83+
version: v1.28.0
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.27.3
38+
version: v1.28.0
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.27.3
93+
version: v1.28.0
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.27.3
35+
version: v1.28.0
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.27.3
83+
version: v1.28.0
8484
clusterName: my-cluster
8585
bootstrap:
8686
configRef:

‎test/infrastructure/docker/examples/simple-cluster.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.27.3
38+
version: v1.28.0
3939
machineTemplate:
4040
infrastructureRef:
4141
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -83,7 +83,7 @@ spec:
8383
cluster.x-k8s.io/cluster-name: my-cluster
8484
template:
8585
spec:
86-
version: v1.27.3
86+
version: v1.28.0
8787
clusterName: my-cluster
8888
bootstrap:
8989
configRef:

0 commit comments

Comments
 (0)