@@ -57,15 +57,15 @@ capable to support multiple backends including docker, in-memory, may be also ku
57
57
58
58
The transition will happen in two phases:
59
59
60
- In phase 1, targeting CAPI 1.1 (current release cycle), two new kinds will be introduced in CAPD: ` DevCluster ` and ` DevMachine `
60
+ In phase 1, targeting CAPI 1.10 (current release cycle), three new kinds will be introduced in CAPD: ` DevCluster ` , ` DevMachine ` and ` DevMachinePool ` .
61
61
62
- ` DevCluster ` and ` DevMachine ` will have
63
- - A ` docker ` backend, functionally equivalent to ` DockerCluster ` and ` DockerMachine `
64
- - An ` inMemory ` , functionally equivalent to CAPIM's ` InMemoryCluster ` and ` InMemoryMachine `
62
+ ` DevCluster ` , ` DevMachine ` and ` DevMachinePool ` will have
63
+ - A ` docker ` backend, functionally equivalent to ` DockerCluster ` , ` DockerMachine ` and ` DockerMachinePool ` .
64
+ - An ` inMemory ` backend , functionally equivalent to CAPIM's ` InMemoryCluster ` and ` InMemoryMachine ` (there is no ` InMemoryMachinePool ` ).
65
65
- if and when Maintainers of CAPK(Kubemark) will choose to converge to CAPD(dev), a ` kubemark ` backend,
66
- functionally equivalent to ` KubemarkMachine ` (there is no ` KubemarkCluster ` )
66
+ functionally equivalent to ` KubemarkMachine ` (there is no ` KubemarkCluster ` nor a ` KubemarkMachinePool ` ).
67
67
68
- Below you can fin an example of ` DockerCluster ` and corresponding ` DevMachine ` using the docker backend:
68
+ Below you can find an example of ` DockerMachine ` and corresponding ` DevMachine ` using the docker backend:
69
69
70
70
``` yaml
71
71
apiVersion : infrastructure.cluster.x-k8s.io/v1beta1
@@ -146,14 +146,14 @@ spec:
146
146
` ` `
147
147
148
148
Please note that at the end of phase 1
149
- - ` DockerCluster` and `DockerMachine ` will continue to exist, thus allowing maintainers and users
149
+ - ` DockerCluster` , `DockerMachine` and `DockerMachinePool ` will continue to exist, thus allowing maintainers and users
150
150
time to migrate progressively to the new kinds; however, it is important to notice that
151
- ` DockerCluster` and `DockerMachine ` should be considered as deprecated from now on.
152
- - ` InMemoryCluster` and `InMemoryMachine` will be removed, as well as the entire CAPIM provider.
153
- (CAPIM is used only for CAPI scale tests, so users are not impacted and migration can be executed faster).
151
+ ` DockerCluster` , `DockerMachine` and `DockerMachinePool ` should be considered as deprecated from now on.
152
+ - ` InMemoryCluster` and `InMemoryMachine` will be removed immediately , as well as the entire CAPIM provider.
153
+ (CAPIM is used only for CAPI scale tests, so users are not/less impacted and migration can be executed faster).
154
154
155
- Phase 2 consist of the actual removal of `DockerCluster` and `DockerMachine `; this phase will happen after maintainers
156
- will complete the transition of all the E2E tests to `DevCluster` and `DevMachine `; considering we have upgrade tests using
155
+ Phase 2 consist of the actual removal of `DockerCluster`, `DockerMachine` and `DockerMachinePool `; this phase will happen after maintainers
156
+ will complete the transition of all the E2E tests to `DevCluster`, `DevMachine` and `DevMachinePool `; considering we have upgrade tests using
157
157
older releases of CAPD, completing this phase would likely require a few release cycles, targeting tentatively CAPI 1.13, Apr 2026.
158
158
159
159
# # Implementation History
0 commit comments