Skip to content
This repository was archived by the owner on Aug 12, 2025. It is now read-only.

Commit f1ac0b9

Browse files
authored
Merge pull request #376 from kubernetes-sigs/bump-cluster-api-to-1.1.3
✨ bump cluster-api to 1.1.3
2 parents 13a5c30 + f801f84 commit f1ac0b9

File tree

2 files changed

+38
-14
lines changed

2 files changed

+38
-14
lines changed

test/e2e/config/packet-ci-actions.yaml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ providers:
3131
new: --metrics-addr=:8080
3232
files:
3333
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
34-
- name: v1.1.2 # latest published release in the v1beta1 series
35-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.2/core-components.yaml"
34+
- name: v1.1.3 # latest published release in the v1beta1 series
35+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.3/core-components.yaml"
3636
type: "url"
3737
contract: v1beta1
3838
replacements:
@@ -62,8 +62,8 @@ providers:
6262
new: --metrics-addr=:8080
6363
files:
6464
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
65-
- name: v1.1.2 # latest published release in the v1beta1 series
66-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.2/bootstrap-components.yaml"
65+
- name: v1.1.3 # latest published release in the v1beta1 series
66+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.3/bootstrap-components.yaml"
6767
type: "url"
6868
contract: v1beta1
6969
replacements:
@@ -93,8 +93,8 @@ providers:
9393
new: --metrics-addr=:8080
9494
files:
9595
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
96-
- name: v1.1.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
97-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.2/control-plane-components.yaml"
96+
- name: v1.1.3 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
97+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.3/control-plane-components.yaml"
9898
type: "url"
9999
contract: v1beta1
100100
replacements:
@@ -125,6 +125,17 @@ providers:
125125
- sourcePath: "../data/v1beta1/cluster-template-node-drain.yaml"
126126
- sourcePath: "../data/v1beta1/cluster-template-md-remediation.yaml"
127127
- sourcePath: "../data/v1beta1/cluster-template-kcp-remediation.yaml"
128+
- name: v1.1.99 # next; use manifest from source files
129+
value: "${MANIFEST_PATH:=..}/infrastructure-components.yaml"
130+
type: "url"
131+
contract: v1beta1
132+
files:
133+
- sourcePath: "${MANIFEST_PATH:=..}/metadata.yaml"
134+
- sourcePath: "../data/v1beta1/cluster-template.yaml"
135+
- sourcePath: "../data/v1beta1/cluster-template-kcp-scale-in.yaml"
136+
- sourcePath: "../data/v1beta1/cluster-template-node-drain.yaml"
137+
- sourcePath: "../data/v1beta1/cluster-template-md-remediation.yaml"
138+
- sourcePath: "../data/v1beta1/cluster-template-kcp-remediation.yaml"
128139

129140
variables:
130141
KUBERNETES_VERSION_MANAGEMENT: "v1.23.3"

test/e2e/config/packet-ci.yaml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ providers:
3131
new: --metrics-addr=:8080
3232
files:
3333
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
34-
- name: v1.1.2 # latest published release in the v1beta1 series
35-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.2/core-components.yaml"
34+
- name: v1.1.3 # latest published release in the v1beta1 series
35+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.3/core-components.yaml"
3636
type: "url"
3737
contract: v1beta1
3838
replacements:
@@ -62,8 +62,8 @@ providers:
6262
new: --metrics-addr=:8080
6363
files:
6464
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
65-
- name: v1.1.2 # latest published release in the v1beta1 series
66-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.2/bootstrap-components.yaml"
65+
- name: v1.1.3 # latest published release in the v1beta1 series
66+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.3/bootstrap-components.yaml"
6767
type: "url"
6868
contract: v1beta1
6969
replacements:
@@ -93,8 +93,8 @@ providers:
9393
new: --metrics-addr=:8080
9494
files:
9595
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
96-
- name: v1.1.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
97-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.2/control-plane-components.yaml"
96+
- name: v1.1.3 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
97+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.3/control-plane-components.yaml"
9898
type: "url"
9999
contract: v1beta1
100100
replacements:
@@ -106,15 +106,28 @@ providers:
106106
- name: packet
107107
type: InfrastructureProvider
108108
versions:
109-
- name: v0.3.11
109+
- name: v0.3.11 #latest in the v1alpha1 series
110110
value: "https://github.com/kubernetes-sigs/cluster-api-provider-packet/releases/download/v0.3.11/infrastructure-components.yaml"
111111
type: "url"
112112
contract: v1alpha3
113113
files:
114114
# Add cluster templates
115115
- sourcePath: "../data/v1alpha3/cluster-template-packet-ccm.yaml"
116116
- sourcePath: "../data/v1alpha3/cluster-template-cpem.yaml"
117-
- name: v0.5.0
117+
- name: v0.5.0 #latest in the v1beta1 series
118+
value: "../../../config/default"
119+
replacements:
120+
- old: "image: .*/cluster-api-provider-packet:.*"
121+
new: "image: ${REGISTRY:=ghcr.io}/${IMAGE_NAME:=kubernetes-sigs/cluster-api-provider-packet}:${TAG:=e2e}"
122+
contract: v1beta1
123+
files:
124+
- sourcePath: "../../../metadata.yaml"
125+
- sourcePath: "../data/v1beta1/cluster-template.yaml"
126+
- sourcePath: "../data/v1beta1/cluster-template-kcp-scale-in.yaml"
127+
- sourcePath: "../data/v1beta1/cluster-template-node-drain.yaml"
128+
- sourcePath: "../data/v1beta1/cluster-template-md-remediation.yaml"
129+
- sourcePath: "../data/v1beta1/cluster-template-kcp-remediation.yaml"
130+
- name: v1.1.99 # next; use manifest from source files
118131
value: "../../../config/default"
119132
replacements:
120133
- old: "image: .*/cluster-api-provider-packet:.*"

0 commit comments

Comments
 (0)