Skip ControlPlaneIsStable preflight check for worker machines

Closes #932
k0rdent · Feb 12, 2025 · 0fd5783 · 0fd5783
1 parent c5d6dd4
commit 0fd5783
Show file tree

Hide file tree

Showing 26 changed files with 46 additions and 40 deletions.
diff --git a/config/dev/aws-clusterdeployment.yaml b/config/dev/aws-clusterdeployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: aws-${CLUSTER_NAME_SUFFIX}
   namespace: ${NAMESPACE}
 spec:
-  template: aws-standalone-cp-0-1-0
+  template: aws-standalone-cp-0-1-2
   credential: aws-cluster-identity-cred
   config:
     clusterLabels: {}

diff --git a/config/dev/azure-clusterdeployment.yaml b/config/dev/azure-clusterdeployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: azure-${CLUSTER_NAME_SUFFIX}
   namespace: ${NAMESPACE}
 spec:
-  template: azure-standalone-cp-0-1-0
+  template: azure-standalone-cp-0-1-2
   credential: azure-cluster-identity-cred
   config:
     clusterLabels: {}

diff --git a/config/dev/openstack-clusterdeployment.yaml b/config/dev/openstack-clusterdeployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: openstack-${CLUSTER_NAME_SUFFIX}
   namespace: ${NAMESPACE}
 spec:
-  template: openstack-standalone-cp-0-1-1
+  template: openstack-standalone-cp-0-1-3
   credential: openstack-cluster-identity-cred
   config:
     clusterLabels: {}

diff --git a/config/dev/vsphere-clusterdeployment.yaml b/config/dev/vsphere-clusterdeployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: vsphere-${CLUSTER_NAME_SUFFIX}
   namespace: ${NAMESPACE}
 spec:
-  template: vsphere-standalone-cp-0-1-0
+  template: vsphere-standalone-cp-0-1-2
   credential: vsphere-cluster-identity-cred
   config:
     clusterLabels: {}

diff --git a/templates/cluster/aws-hosted-cp/Chart.yaml b/templates/cluster/aws-hosted-cp/Chart.yaml
@@ -7,7 +7,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/templates/cluster/aws-hosted-cp/templates/machinedeployment.yaml b/templates/cluster/aws-hosted-cp/templates/machinedeployment.yaml
@@ -2,6 +2,9 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
 metadata:
   name: {{ include "machinedeployment.name" . }}
+  annotations:
+    # Temporary fix to address https://github.com/k0sproject/k0smotron/issues/911
+    machineset.cluster.x-k8s.io/skip-preflight-checks: "ControlPlaneIsStable"
 spec:
   clusterName: {{ include "cluster.name" . }}
   replicas: {{ .Values.workersNumber }}

diff --git a/templates/cluster/aws-standalone-cp/Chart.yaml b/templates/cluster/aws-standalone-cp/Chart.yaml
@@ -6,7 +6,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/templates/cluster/aws-standalone-cp/templates/machinedeployment.yaml b/templates/cluster/aws-standalone-cp/templates/machinedeployment.yaml
@@ -2,6 +2,9 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
 metadata:
   name: {{ include "machinedeployment.name" . }}
+  annotations:
+    # Temporary fix to address https://github.com/k0sproject/k0smotron/issues/911
+    machineset.cluster.x-k8s.io/skip-preflight-checks: "ControlPlaneIsStable"
 spec:
   clusterName: {{ include "cluster.name" . }}
   replicas: {{ .Values.workersNumber }}

diff --git a/templates/cluster/azure-hosted-cp/Chart.yaml b/templates/cluster/azure-hosted-cp/Chart.yaml
@@ -7,7 +7,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/templates/cluster/azure-hosted-cp/templates/machinedeployment.yaml b/templates/cluster/azure-hosted-cp/templates/machinedeployment.yaml
@@ -2,6 +2,9 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
 metadata:
   name: {{ include "machinedeployment.name" . }}
+  annotations:
+    # Temporary fix to address https://github.com/k0sproject/k0smotron/issues/911
+    machineset.cluster.x-k8s.io/skip-preflight-checks: "ControlPlaneIsStable"
 spec:
   clusterName: {{ include "cluster.name" . }}
   replicas: {{ .Values.workersNumber }}

diff --git a/templates/cluster/azure-standalone-cp/Chart.yaml b/templates/cluster/azure-standalone-cp/Chart.yaml
@@ -6,7 +6,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/templates/cluster/azure-standalone-cp/templates/machinedeployment.yaml b/templates/cluster/azure-standalone-cp/templates/machinedeployment.yaml
@@ -2,6 +2,9 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
 metadata:
   name: {{ include "machinedeployment.name" . }}
+  annotations:
+    # Temporary fix to address https://github.com/k0sproject/k0smotron/issues/911
+    machineset.cluster.x-k8s.io/skip-preflight-checks: "ControlPlaneIsStable"
 spec:
   clusterName: {{ include "cluster.name" . }}
   replicas: {{ .Values.workersNumber }}

diff --git a/templates/cluster/openstack-standalone-cp/Chart.yaml b/templates/cluster/openstack-standalone-cp/Chart.yaml
@@ -6,7 +6,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.2
+version: 0.1.3
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/templates/cluster/openstack-standalone-cp/templates/machinedeployment.yaml b/templates/cluster/openstack-standalone-cp/templates/machinedeployment.yaml
@@ -2,6 +2,9 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
 metadata:
   name: {{ include "machinedeployment.name" . }}
+  annotations:
+    # Temporary fix to address https://github.com/k0sproject/k0smotron/issues/911
+    machineset.cluster.x-k8s.io/skip-preflight-checks: "ControlPlaneIsStable"
 spec:
   clusterName: {{ include "cluster.name" . }}
   replicas: {{ .Values.workersNumber }}

diff --git a/templates/cluster/vsphere-hosted-cp/Chart.yaml b/templates/cluster/vsphere-hosted-cp/Chart.yaml
@@ -7,7 +7,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/templates/cluster/vsphere-hosted-cp/templates/machinedeployment.yaml b/templates/cluster/vsphere-hosted-cp/templates/machinedeployment.yaml
@@ -2,6 +2,9 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
 metadata:
   name: {{ include "machinedeployment.name" . }}
+  annotations:
+    # Temporary fix to address https://github.com/k0sproject/k0smotron/issues/911
+    machineset.cluster.x-k8s.io/skip-preflight-checks: "ControlPlaneIsStable"
 spec:
   clusterName: {{ include "cluster.name" . }}
   replicas: {{ .Values.workersNumber }}

diff --git a/templates/cluster/vsphere-standalone-cp/Chart.yaml b/templates/cluster/vsphere-standalone-cp/Chart.yaml
@@ -6,7 +6,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/templates/cluster/vsphere-standalone-cp/templates/machinedeployment.yaml b/templates/cluster/vsphere-standalone-cp/templates/machinedeployment.yaml
@@ -2,6 +2,9 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
 metadata:
   name: {{ include "machinedeployment.name" . }}
+  annotations:
+    # Temporary fix to address https://github.com/k0sproject/k0smotron/issues/911
+    machineset.cluster.x-k8s.io/skip-preflight-checks: "ControlPlaneIsStable"
 spec:
   clusterName: {{ include "cluster.name" . }}
   replicas: {{ .Values.workersNumber }}

diff --git a/.../files/templates/aws-hosted-cp-0-1-1.yaml → .../files/templates/aws-hosted-cp-0-1-2.yaml b/.../files/templates/aws-hosted-cp-0-1-1.yaml → .../files/templates/aws-hosted-cp-0-1-2.yaml
@@ -1,14 +1,14 @@
 apiVersion: k0rdent.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: aws-hosted-cp-0-1-1
+  name: aws-hosted-cp-0-1-2
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartSpec:
       chart: aws-hosted-cp
-      version: 0.1.1
+      version: 0.1.2
       interval: 10m0s
       sourceRef:
         kind: HelmRepository

diff --git a/...es/templates/aws-standalone-cp-0-1-1.yaml → ...es/templates/aws-standalone-cp-0-1-2.yaml b/...es/templates/aws-standalone-cp-0-1-1.yaml → ...es/templates/aws-standalone-cp-0-1-2.yaml
@@ -1,14 +1,14 @@
 apiVersion: k0rdent.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: aws-standalone-cp-0-1-1
+  name: aws-standalone-cp-0-1-2
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartSpec:
       chart: aws-standalone-cp
-      version: 0.1.1
+      version: 0.1.2
       interval: 10m0s
       sourceRef:
         kind: HelmRepository

diff --git a/...iles/templates/azure-hosted-cp-0-1-1.yaml → ...iles/templates/azure-hosted-cp-0-1-2.yaml b/...iles/templates/azure-hosted-cp-0-1-1.yaml → ...iles/templates/azure-hosted-cp-0-1-2.yaml
@@ -1,14 +1,14 @@
 apiVersion: k0rdent.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: azure-hosted-cp-0-1-1
+  name: azure-hosted-cp-0-1-2
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartSpec:
       chart: azure-hosted-cp
-      version: 0.1.1
+      version: 0.1.2
       interval: 10m0s
       sourceRef:
         kind: HelmRepository

diff --git a/.../templates/azure-standalone-cp-0-1-1.yaml → .../templates/azure-standalone-cp-0-1-2.yaml b/.../templates/azure-standalone-cp-0-1-1.yaml → .../templates/azure-standalone-cp-0-1-2.yaml
@@ -1,14 +1,14 @@
 apiVersion: k0rdent.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: azure-standalone-cp-0-1-1
+  name: azure-standalone-cp-0-1-2
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartSpec:
       chart: azure-standalone-cp
-      version: 0.1.1
+      version: 0.1.2
       interval: 10m0s
       sourceRef:
         kind: HelmRepository

diff --git a/templates/provider/kcm-templates/files/templates/openstack-standalone-cp-0-1-2.yaml b/templates/provider/kcm-templates/files/templates/openstack-standalone-cp-0-1-2.yaml
diff --git a/...plates/openstack-standalone-cp-0-1-1.yaml → ...plates/openstack-standalone-cp-0-1-3.yaml b/...plates/openstack-standalone-cp-0-1-1.yaml → ...plates/openstack-standalone-cp-0-1-3.yaml
@@ -1,14 +1,14 @@
 apiVersion: k0rdent.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: openstack-standalone-cp-0-1-1
+  name: openstack-standalone-cp-0-1-3
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartSpec:
       chart: openstack-standalone-cp
-      version: 0.1.1
+      version: 0.1.3
       interval: 10m0s
       sourceRef:
         kind: HelmRepository

diff --git a/...es/templates/vsphere-hosted-cp-0-1-1.yaml → ...es/templates/vsphere-hosted-cp-0-1-2.yaml b/...es/templates/vsphere-hosted-cp-0-1-1.yaml → ...es/templates/vsphere-hosted-cp-0-1-2.yaml
@@ -1,14 +1,14 @@
 apiVersion: k0rdent.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: vsphere-hosted-cp-0-1-1
+  name: vsphere-hosted-cp-0-1-2
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartSpec:
       chart: vsphere-hosted-cp
-      version: 0.1.1
+      version: 0.1.2
       interval: 10m0s
       sourceRef:
         kind: HelmRepository

diff --git a/...emplates/vsphere-standalone-cp-0-1-1.yaml → ...emplates/vsphere-standalone-cp-0-1-2.yaml b/...emplates/vsphere-standalone-cp-0-1-1.yaml → ...emplates/vsphere-standalone-cp-0-1-2.yaml
@@ -1,14 +1,14 @@
 apiVersion: k0rdent.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: vsphere-standalone-cp-0-1-1
+  name: vsphere-standalone-cp-0-1-2
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartSpec:
       chart: vsphere-standalone-cp
-      version: 0.1.1
+      version: 0.1.2
       interval: 10m0s
       sourceRef:
         kind: HelmRepository