Skip to content

Commit c190848

Browse files
committed
(ROUGH draft): support user managed worker topology version
1 parent fb0e2da commit c190848

File tree

13 files changed

+57
-2
lines changed

13 files changed

+57
-2
lines changed

api/core/v1beta1/cluster_types.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,10 @@ type MachineDeploymentTopology struct {
682682
// +kubebuilder:validation:MaxLength=256
683683
Class string `json:"class"`
684684

685+
// version is the Kubernetes version of the worker group, can only be used if auto-upgrade is disabled.
686+
// +optional
687+
Version *string `json:"version,omitempty"`
688+
685689
// name is the unique identifier for this MachineDeploymentTopology.
686690
// The value is used with other unique identifiers to create a MachineDeployment's Name
687691
// (e.g. cluster's name, etc). In case the name is greater than the allowed maximum length,

api/core/v1beta1/zz_generated.conversion.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/core/v1beta1/zz_generated.deepcopy.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/core/v1beta1/zz_generated.openapi.go

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/core/v1beta2/cluster_types.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -818,6 +818,12 @@ type MachineDeploymentTopology struct {
818818
// +optional
819819
Metadata ObjectMeta `json:"metadata,omitempty,omitzero"`
820820

821+
//TODO: validation with auto-upgrade
822+
823+
// version is the Kubernetes version of the worker group, can only be used if auto-upgrade is disabled.
824+
// +optional
825+
Version *string `json:"version,omitempty"`
826+
821827
// class is the name of the MachineDeploymentClass used to create the set of worker nodes.
822828
// This should match one of the deployment classes defined in the ClusterClass object
823829
// mentioned in the `Cluster.Spec.Class` field.

api/core/v1beta2/zz_generated.deepcopy.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/core/v1beta2/zz_generated.openapi.go

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bootstrap/kubeadm/config/default/manager_image_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ spec:
77
template:
88
spec:
99
containers:
10-
- image: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:main
10+
- image: igor-test-bootstrap-arm64:dev
1111
name: manager

config/crd/bases/cluster.x-k8s.io_clusters.yaml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/default/manager_image_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ spec:
77
template:
88
spec:
99
containers:
10-
- image: gcr.io/k8s-staging-cluster-api/cluster-api-controller:main
10+
- image: igor-test-arm64:dev
1111
name: manager

0 commit comments

Comments
 (0)