🌱 Enable k8s upgrade in self hosted test #1732
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| apiVersion: controlplane.cluster.x-k8s.io/v1beta1 | ||
| kind: KubeadmControlPlane | ||
| metadata: | ||
| name: ${CLUSTER_NAME}-control-plane | ||
| spec: | ||
| machineTemplate: | ||
| infrastructureRef: | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7 | ||
| kind: OpenStackMachineTemplate | ||
| name: ${CLUSTER_NAME}-upgrade-from-control-plane |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| --- | ||
| resources: | ||
| - ../default | ||
| - upgrade-from-template.yaml | ||
| - upgrade-to-template.yaml | ||
|
|
||
| patches: | ||
| - path: kcp-patch.yaml | ||
| - path: md-patch.yaml |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| apiVersion: cluster.x-k8s.io/v1beta1 | ||
| kind: MachineDeployment | ||
| metadata: | ||
| name: ${CLUSTER_NAME}-md-0 | ||
| spec: | ||
| template: | ||
| spec: | ||
| infrastructureRef: | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7 | ||
| kind: OpenStackMachineTemplate | ||
| name: ${CLUSTER_NAME}-upgrade-from-md-0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| --- | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7 | ||
| kind: OpenStackMachineTemplate | ||
| metadata: | ||
| name: ${CLUSTER_NAME}-upgrade-from-control-plane | ||
| spec: | ||
| template: | ||
| spec: | ||
| cloudName: ${OPENSTACK_CLOUD} | ||
| flavor: ${OPENSTACK_CONTROL_PLANE_MACHINE_FLAVOR} | ||
| identityRef: | ||
| kind: Secret | ||
| name: ${CLUSTER_NAME}-cloud-config | ||
| image: ${OPENSTACK_IMAGE_NAME_UPGRADE_FROM} | ||
| sshKeyName: ${OPENSTACK_SSH_KEY_NAME} | ||
| tags: | ||
| - control-plane | ||
| --- | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7 | ||
| kind: OpenStackMachineTemplate | ||
| metadata: | ||
| name: ${CLUSTER_NAME}-upgrade-from-md-0 | ||
| spec: | ||
| template: | ||
| spec: | ||
| cloudName: ${OPENSTACK_CLOUD} | ||
| flavor: ${OPENSTACK_NODE_MACHINE_FLAVOR} | ||
| identityRef: | ||
| kind: Secret | ||
| name: ${CLUSTER_NAME}-cloud-config | ||
| image: ${OPENSTACK_IMAGE_NAME_UPGRADE_FROM} | ||
| sshKeyName: ${OPENSTACK_SSH_KEY_NAME} | ||
| tags: | ||
| - machine |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| # This is just a copy of the normal cluster template OSMTs. | ||
| # It is needed because we need a static name that we can put in the e2e config. | ||
| # The normal templates has the cluster name as part of the OSMT name. | ||
| # See CONTROL_PLANE_MACHINE_TEMPLATE_UPGRADE_TO and WORKERS_MACHINE_TEMPLATE_UPGRADE_TO | ||
| # in the e2e config. | ||
| --- | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7 | ||
| kind: OpenStackMachineTemplate | ||
| metadata: | ||
| name: upgrade-to-control-plane | ||
| labels: | ||
| clusterctl.cluster.x-k8s.io/move: "" | ||
|
There was a problem hiding this comment. This label is important to get the (not yet in use) template moved to the self hosted cluster. Otherwise it would be left behind since it is not part of the owner chain at that point. There was a problem hiding this comment. yes, I think it's something I tried to add into CAPO before, IIRC it's moving stuffs from boostrap to deployed cluster? There was a problem hiding this comment. Exactly. To be clear, it is only needed on this template because it is not part of the cluster owner chain. All resources that are part of the cluster are moved automatically. For example, the OpenStackMachineTemplates that are used when initializing the workload cluster are automatically moved. |
||
| spec: | ||
| template: | ||
| spec: | ||
| cloudName: ${OPENSTACK_CLOUD} | ||
| flavor: ${OPENSTACK_CONTROL_PLANE_MACHINE_FLAVOR} | ||
| identityRef: | ||
| kind: Secret | ||
| name: ${CLUSTER_NAME}-cloud-config | ||
| image: ${OPENSTACK_IMAGE_NAME} | ||
| sshKeyName: ${OPENSTACK_SSH_KEY_NAME} | ||
| tags: | ||
| - control-plane | ||
| --- | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7 | ||
| kind: OpenStackMachineTemplate | ||
| metadata: | ||
| name: upgrade-to-md-0 | ||
| labels: | ||
| clusterctl.cluster.x-k8s.io/move: "" | ||
| spec: | ||
| template: | ||
| spec: | ||
| cloudName: ${OPENSTACK_CLOUD} | ||
| flavor: ${OPENSTACK_NODE_MACHINE_FLAVOR} | ||
| identityRef: | ||
| kind: Secret | ||
| name: ${CLUSTER_NAME}-cloud-config | ||
| image: ${OPENSTACK_IMAGE_NAME} | ||
| sshKeyName: ${OPENSTACK_SSH_KEY_NAME} | ||
| tags: | ||
| - machine | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is very great update
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All credit goes to @wwentland 😊