Merge pull request #5276 from jparrill/OCPBUGS-46342

OCPBUGS-46342: Allow ARM64 arch deployment on Agent platform
openshift · Dec 12, 2024 · 2610e5c · 2610e5c
2 parents c5e01a9 + 55c5e71
commit 2610e5c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git a/api/hypershift/v1beta1/nodepool_types.go b/api/hypershift/v1beta1/nodepool_types.go
@@ -79,7 +79,7 @@ type NodePool struct {
 
 // NodePoolSpec is the desired behavior of a NodePool.
 // +kubebuilder:validation:XValidation:rule="!has(oldSelf.arch) || has(self.arch)", message="Arch is required once set"
-// +kubebuilder:validation:XValidation:rule="self.arch != 'arm64' || has(self.platform.aws) || has(self.platform.azure)", message="Setting Arch to arm64 is only supported for AWS and Azure"
+// +kubebuilder:validation:XValidation:rule="self.arch != 'arm64' || has(self.platform.aws) || has(self.platform.azure) || has(self.platform.agent)", message="Setting Arch to arm64 is only supported for AWS, Azure and Agent"
 // +kubebuilder:validation:XValidation:rule="!has(self.replicas) || !has(self.autoScaling)", message="Both replicas or autoScaling should not be set"
 type NodePoolSpec struct {
 	// clusterName is the name of the HostedCluster this NodePool belongs to.

diff --git a/...z_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/AAA_ungated.yaml b/...z_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/AAA_ungated.yaml
@@ -1310,8 +1310,10 @@ spec:
             x-kubernetes-validations:
             - message: Arch is required once set
               rule: '!has(oldSelf.arch) || has(self.arch)'
-            - message: Setting Arch to arm64 is only supported for AWS and Azure
+            - message: Setting Arch to arm64 is only supported for AWS, Azure and
+                Agent
               rule: self.arch != 'arm64' || has(self.platform.aws) || has(self.platform.azure)
+                || has(self.platform.agent)
             - message: Both replicas or autoScaling should not be set
               rule: '!has(self.replicas) || !has(self.autoScaling)'
           status:

diff --git a/.../zz_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/OpenStack.yaml b/.../zz_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/OpenStack.yaml
@@ -1477,8 +1477,10 @@ spec:
             x-kubernetes-validations:
             - message: Arch is required once set
               rule: '!has(oldSelf.arch) || has(self.arch)'
-            - message: Setting Arch to arm64 is only supported for AWS and Azure
+            - message: Setting Arch to arm64 is only supported for AWS, Azure and
+                Agent
               rule: self.arch != 'arm64' || has(self.platform.aws) || has(self.platform.azure)
+                || has(self.platform.agent)
             - message: Both replicas or autoScaling should not be set
               rule: '!has(self.replicas) || !has(self.autoScaling)'
           status:

diff --git a/.../assets/hypershift-operator/zz_generated.crd-manifests/nodepools-CustomNoUpgrade.crd.yaml b/.../assets/hypershift-operator/zz_generated.crd-manifests/nodepools-CustomNoUpgrade.crd.yaml
@@ -1480,8 +1480,10 @@ spec:
             x-kubernetes-validations:
             - message: Arch is required once set
               rule: '!has(oldSelf.arch) || has(self.arch)'
-            - message: Setting Arch to arm64 is only supported for AWS and Azure
+            - message: Setting Arch to arm64 is only supported for AWS, Azure and
+                Agent
               rule: self.arch != 'arm64' || has(self.platform.aws) || has(self.platform.azure)
+                || has(self.platform.agent)
             - message: Both replicas or autoScaling should not be set
               rule: '!has(self.replicas) || !has(self.autoScaling)'
           status:

diff --git a/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/nodepools-Default.crd.yaml b/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/nodepools-Default.crd.yaml
@@ -1313,8 +1313,10 @@ spec:
             x-kubernetes-validations:
             - message: Arch is required once set
               rule: '!has(oldSelf.arch) || has(self.arch)'
-            - message: Setting Arch to arm64 is only supported for AWS and Azure
+            - message: Setting Arch to arm64 is only supported for AWS, Azure and
+                Agent
               rule: self.arch != 'arm64' || has(self.platform.aws) || has(self.platform.azure)
+                || has(self.platform.agent)
             - message: Both replicas or autoScaling should not be set
               rule: '!has(self.replicas) || !has(self.autoScaling)'
           status:

diff --git a/...ts/hypershift-operator/zz_generated.crd-manifests/nodepools-TechPreviewNoUpgrade.crd.yaml b/...ts/hypershift-operator/zz_generated.crd-manifests/nodepools-TechPreviewNoUpgrade.crd.yaml
@@ -1480,8 +1480,10 @@ spec:
             x-kubernetes-validations:
             - message: Arch is required once set
               rule: '!has(oldSelf.arch) || has(self.arch)'
-            - message: Setting Arch to arm64 is only supported for AWS and Azure
+            - message: Setting Arch to arm64 is only supported for AWS, Azure and
+                Agent
               rule: self.arch != 'arm64' || has(self.platform.aws) || has(self.platform.azure)
+                || has(self.platform.agent)
             - message: Both replicas or autoScaling should not be set
               rule: '!has(self.replicas) || !has(self.autoScaling)'
           status:

diff --git a/vendor/github.com/openshift/hypershift/api/hypershift/v1beta1/nodepool_types.go b/vendor/github.com/openshift/hypershift/api/hypershift/v1beta1/nodepool_types.go