diff --git a/docs/book/src/developer/architecture/controllers/bootstrap.md b/docs/book/src/developer/architecture/controllers/bootstrap.md index f6fd60eeb573..3f00e90707bf 100644 --- a/docs/book/src/developer/architecture/controllers/bootstrap.md +++ b/docs/book/src/developer/architecture/controllers/bootstrap.md @@ -7,7 +7,7 @@ Bootstrapping is the process in which: [CAPBK](https://github.com/kubernetes-sigs/cluster-api-bootstrap-provider-kubeadm) is the reference bootstrap provider and is based on `kubeadm`. CAPBK codifies the steps for [creating a cluster](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/) in multiple configurations. -![](../../images/bootstrap-controller.png) +![](../../../images/bootstrap-controller.png) See [proposal](https://github.com/kubernetes-sigs/cluster-api/blob/master/docs/proposals/20190610-machine-states-preboot-bootstrapping.md) for the full details on how the bootstrap process works. diff --git a/docs/book/src/developer/architecture/controllers/cluster.md b/docs/book/src/developer/architecture/controllers/cluster.md index 5506241df060..3deafa90612a 100644 --- a/docs/book/src/developer/architecture/controllers/cluster.md +++ b/docs/book/src/developer/architecture/controllers/cluster.md @@ -1,6 +1,6 @@ # Cluster Controller -![](../../images/cluster-admission-cluster-controller.svg) +![](../../../images/cluster-admission-cluster-controller.png) The Cluster controller's main responsibilities are: diff --git a/docs/book/src/developer/architecture/controllers/control-plane.md b/docs/book/src/developer/architecture/controllers/control-plane.md index ac7c5c0492ac..1e30944efd56 100644 --- a/docs/book/src/developer/architecture/controllers/control-plane.md +++ b/docs/book/src/developer/architecture/controllers/control-plane.md @@ -1,6 +1,6 @@ # Control Plane Controller -![](../../../images/control-plane-controller.svg) +![](../../../images/control-plane-controller.png) The Control Plane controller's main responsibilities are: diff --git a/docs/book/src/developer/architecture/controllers/machine-deployment.md b/docs/book/src/developer/architecture/controllers/machine-deployment.md index 16337048afc6..29ad02004c86 100644 --- a/docs/book/src/developer/architecture/controllers/machine-deployment.md +++ b/docs/book/src/developer/architecture/controllers/machine-deployment.md @@ -10,4 +10,4 @@ Its main responsibilities are: * Scaling down old MachineSets when newer MachineSets replace them * Updating the status of MachineDeployment objects -![](../../images/cluster-admission-machineset-controller.png) +![](../../../images/cluster-admission-machineset-controller.png) diff --git a/docs/book/src/developer/architecture/controllers/machine-set.md b/docs/book/src/developer/architecture/controllers/machine-set.md index ec9c984e5c53..a7156fd0f9bf 100644 --- a/docs/book/src/developer/architecture/controllers/machine-set.md +++ b/docs/book/src/developer/architecture/controllers/machine-set.md @@ -8,4 +8,4 @@ Its main responsibilities are: * Booting a group of N machines * Monitor the status of those booted machines -![](../../images/cluster-admission-machineset-controller.png) +![](../../../images/cluster-admission-machineset-controller.png) diff --git a/docs/book/src/developer/architecture/controllers/machine.md b/docs/book/src/developer/architecture/controllers/machine.md index 585809654111..f5656d4766e3 100644 --- a/docs/book/src/developer/architecture/controllers/machine.md +++ b/docs/book/src/developer/architecture/controllers/machine.md @@ -1,6 +1,6 @@ # Machine Controller -![](../../images/cluster-admission-machine-controller.svg) +![](../../../images/cluster-admission-machine-controller.png) The Machine controller's main responsibilities are: diff --git a/docs/book/src/images/bootstrap-controller.svg b/docs/book/src/images/bootstrap-controller.svg deleted file mode 100644 index 24c957a738d8..000000000000 --- a/docs/book/src/images/bootstrap-controller.svg +++ /dev/null @@ -1,74 +0,0 @@ -Figure 1: State diagram with a generic providerPending- Bootstrap provider watches Machines in "pending" state,generatesBootstrapConfig.Status.BootstrapDataand setsBootstrapConfig.Status.Ready= true.- Machine controller setsMachine.Spec.Bootstrap.DatafromBootstrapConfig.Status.BootstrapData.- Machine controller can now transition to the next state.Provisioning- Infrastructure provider watches Machines in "provisioning"state and starts creating infrastructure for those Machines.- When MachineInfrastructure is ready setsMachineInfrastructure.Status.Ready= true.- Machine controller setsMachine.Status.AddressesfromMachineInfrastructure.Status.Addressesand other fields.Provisioned- Machine controller watches Machines in "provisioning" state andMachineInfrastructure.Status.Ready= true.- Machine controller setsMachine.Status.Phase= "provisioned".Running- Machine controller transitions to this state whenMachine.ProviderIDis set and a Kubernetes Node withthe sameProviderIDhas been found and in Ready state.DeletingDeletedFailedMachine Create \ No newline at end of file diff --git a/docs/book/src/images/cluster-admission-cluster-controller.svg b/docs/book/src/images/cluster-admission-cluster-controller.svg deleted file mode 100644 index 4443feecd0a9..000000000000 --- a/docs/book/src/images/cluster-admission-cluster-controller.svg +++ /dev/null @@ -1,39 +0,0 @@ -Cluster controllerCluster controller enqueues a Reconcile callGet control plane machines for clusterA control plane machine is readyyesnoSet Cluster Ready annotationPatch Cluster back to API serverReturn RequeueErrornoCluster has ready annotationReconcile returned RequeueErroryesReconcile returned erroryesnoError reconciling clusterCluster is readyno no; -if (Reconcile returned error) then (yes) - #Pink:Error reconciling cluster; -else (no) - #LightBlue:Cluster is ready; -endif -stop; - -@enduml - -PlantUML version 1.2019.06(Fri May 24 12:10:25 CDT 2019) -(GPL source distribution) -Java Runtime: Java(TM) SE Runtime Environment -JVM: Java HotSpot(TM) 64-Bit Server VM -Java Version: 1.8.0_191-b12 -Operating System: Mac OS X -OS Version: 10.14.5 -Default Encoding: UTF-8 -Language: en -Country: US ---> \ No newline at end of file diff --git a/docs/book/src/images/cluster-admission-machine-controller.svg b/docs/book/src/images/cluster-admission-machine-controller.svg deleted file mode 100644 index b2fefa59561f..000000000000 --- a/docs/book/src/images/cluster-admission-machine-controller.svg +++ /dev/null @@ -1,50 +0,0 @@ -Machine controllerMachine controller enqueues a Create callCluster has ready annotationyesnoMachine has control plane roleyesnoJoin as control plane memberJoin as worker nodeMachine has control plane roleyesnoCreate control plane config mapControl plane config map already existsyesnoReturn RequeueErrorInit control planeSet ready status on Machine annotationPatch Machine back to API serverReturn RequeueErrorCreate returned RequeueErroryesCreate returned erroryesnoError creating machineMachine has initialized or joined the clusterno no; -if (Create returned error) then (yes) - #Pink:Error creating machine; -else (no) - #LightBlue:Machine has initialized or joined the cluster; -endif -stop; - -@enduml - -PlantUML version 1.2019.06(Fri May 24 12:10:25 CDT 2019) -(GPL source distribution) -Java Runtime: Java(TM) SE Runtime Environment -JVM: Java HotSpot(TM) 64-Bit Server VM -Java Version: 1.8.0_191-b12 -Operating System: Mac OS X -OS Version: 10.14.5 -Default Encoding: UTF-8 -Language: en -Country: US ---> \ No newline at end of file diff --git a/docs/book/src/images/cluster-admission-machineset-controller.svg b/docs/book/src/images/cluster-admission-machineset-controller.svg deleted file mode 100644 index 8e0747cb3891..000000000000 --- a/docs/book/src/images/cluster-admission-machineset-controller.svg +++ /dev/null @@ -1,38 +0,0 @@ -MachineSet controllerMachineSet controller enqueues a Reconcile callList machines specified by selectorAdopt machineyesMachine has no controllerMore machinesyesyesNot enough replicasBoot new machineyesToo many replicasDelete machinesReturn RequeueyesNot all machines are readyCreate returned Requeueyes \ No newline at end of file diff --git a/docs/book/src/images/control-plane-controller.plantuml b/docs/book/src/images/control-plane-controller.plantuml index 42c7dfcf7f5b..264c619489d0 100644 --- a/docs/book/src/images/control-plane-controller.plantuml +++ b/docs/book/src/images/control-plane-controller.plantuml @@ -19,7 +19,7 @@ else (no) :Reconcile control plane; if (Control plane is initialized) then (yes) #LightBlue:Set status.Initialized to true; - if (Control plane is contactable) then (no) + if (Control plane is contactable) then (yes) #LightBlue:Set status.Ready to true; else (no) #Pink:Set status.Ready to false; diff --git a/docs/book/src/images/control-plane-controller.png b/docs/book/src/images/control-plane-controller.png new file mode 100644 index 000000000000..b2aace97a5d0 Binary files /dev/null and b/docs/book/src/images/control-plane-controller.png differ diff --git a/docs/book/src/images/control-plane-controller.svg b/docs/book/src/images/control-plane-controller.svg deleted file mode 100644 index 5553b4a5d4d3..000000000000 --- a/docs/book/src/images/control-plane-controller.svg +++ /dev/null @@ -1,56 +0,0 @@ -Control plane controllerControl plane controller enqueues a Reconcile callDeleted?yesnoReconcile deletionyesHas cluster owner?noDelete implementation-specific finalizerAdd implementation-specific finalizer if neededGet cluster object for control planeReconcile control planeControl plane is initializedyesnoSet status.Initialized to trueControl plane is contactablenonoSet status.Ready to trueSet status.Ready to falseReturn RequeueyesCluster object has status.ControlPlaneEndpoint and status.InfrastructureReady is truenoyesOwnerReferences contains a ClusternoPatch ImplementationControlPlane back to API serverReconcile returned RequeueError?yesError reconciling control planeyesReconcile returned errorno