Rename arm64 -> aarch64 cpuarch to align with x86_64

openshift · Oct 5, 2022 · e0ecf6d · e0ecf6d
1 parent ab704ee
commit e0ecf6d
Show file tree

Hide file tree

Showing 38 changed files with 134 additions and 137 deletions.
diff --git a/api/v1beta1/agentserviceconfig_types.go b/api/v1beta1/agentserviceconfig_types.go
@@ -36,7 +36,7 @@ type OSImage struct {
 	// +optional
 	// Deprecated: this field is ignored (will be removed in a future release).
 	RootFSUrl string `json:"rootFSUrl"`
-	// The CPU architecture of the image (x86_64/arm64/etc).
+	// The CPU architecture of the image (x86_64/aarch64/etc).
 	// +optional
 	CPUArchitecture string `json:"cpuArchitecture"`
 }

diff --git a/config/crd/bases/agent-install.openshift.io_agentserviceconfigs.yaml b/config/crd/bases/agent-install.openshift.io_agentserviceconfigs.yaml
@@ -582,7 +582,7 @@ spec:
                     version it is associated with.
                   properties:
                     cpuArchitecture:
-                      description: The CPU architecture of the image (x86_64/arm64/etc).
+                      description: The CPU architecture of the image (x86_64/aarch64/etc).
                       type: string
                     openshiftVersion:
                       description: OpenshiftVersion is the Major.Minor version of

diff --git a/config/crd/bases/agent-install.openshift.io_hypershiftagentserviceconfigs.yaml b/config/crd/bases/agent-install.openshift.io_hypershiftagentserviceconfigs.yaml
@@ -594,7 +594,7 @@ spec:
                     version it is associated with.
                   properties:
                     cpuArchitecture:
-                      description: The CPU architecture of the image (x86_64/arm64/etc).
+                      description: The CPU architecture of the image (x86_64/aarch64/etc).
                       type: string
                     openshiftVersion:
                       description: OpenshiftVersion is the Major.Minor version of

diff --git a/config/crd/resources.yaml b/config/crd/resources.yaml
@@ -1600,7 +1600,7 @@ spec:
                     version it is associated with.
                   properties:
                     cpuArchitecture:
-                      description: The CPU architecture of the image (x86_64/arm64/etc).
+                      description: The CPU architecture of the image (x86_64/aarch64/etc).
                       type: string
                     openshiftVersion:
                       description: OpenshiftVersion is the Major.Minor version of
@@ -2265,7 +2265,7 @@ spec:
                     version it is associated with.
                   properties:
                     cpuArchitecture:
-                      description: The CPU architecture of the image (x86_64/arm64/etc).
+                      description: The CPU architecture of the image (x86_64/aarch64/etc).
                       type: string
                     openshiftVersion:
                       description: OpenshiftVersion is the Major.Minor version of

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -43,7 +43,7 @@ spec:
           - name: INSTALLER_IMAGE
             value: quay.io/edge-infrastructure/assisted-installer:latest
           - name: OS_IMAGES
-            value: '[{"openshift_version":"4.8","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.8/4.8.14/rhcos-4.8.14-x86_64-live.x86_64.iso","version":"48.84.202109241901-0"},{"openshift_version":"4.9","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.9/4.9.45/rhcos-4.9.45-x86_64-live.x86_64.iso","version":"49.84.202207192205-0"},{"openshift_version":"4.10","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.10/4.10.25/rhcos-4.10.25-x86_64-live.x86_64.iso","version":"410.84.202207061638-0"},{"openshift_version":"4.10","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.10/4.10.25/rhcos-4.10.25-aarch64-live.aarch64.iso","version":"410.84.202207051516-0"},{"openshift_version":"4.11","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.11/4.11.2/rhcos-4.11.2-x86_64-live.x86_64.iso","version":"411.86.202208112011-0"},{"openshift_version":"4.11","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.2/rhcos-4.11.2-aarch64-live.aarch64.iso","version":"411.86.202208111758-0"},{"openshift_version":"4.12","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/pre-release/4.12.0-ec.2/rhcos-4.12.0-ec.2-x86_64-live.x86_64.iso","version":"412.86.202208101039-0"},{"openshift_version":"4.12","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.12.0-ec.2/rhcos-4.12.0-ec.2-aarch64-live.aarch64.iso","version":"412.86.202208101040-0"}]' # os images
+            value: '[{"openshift_version":"4.8","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.8/4.8.14/rhcos-4.8.14-x86_64-live.x86_64.iso","version":"48.84.202109241901-0"},{"openshift_version":"4.9","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.9/4.9.45/rhcos-4.9.45-x86_64-live.x86_64.iso","version":"49.84.202207192205-0"},{"openshift_version":"4.10","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.10/4.10.25/rhcos-4.10.25-x86_64-live.x86_64.iso","version":"410.84.202207061638-0"},{"openshift_version":"4.10","cpu_architecture":"aarch64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.10/4.10.25/rhcos-4.10.25-aarch64-live.aarch64.iso","version":"410.84.202207051516-0"},{"openshift_version":"4.11","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.11/4.11.2/rhcos-4.11.2-x86_64-live.x86_64.iso","version":"411.86.202208112011-0"},{"openshift_version":"4.11","cpu_architecture":"aarch64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.2/rhcos-4.11.2-aarch64-live.aarch64.iso","version":"411.86.202208111758-0"},{"openshift_version":"4.12","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/pre-release/4.12.0-ec.2/rhcos-4.12.0-ec.2-x86_64-live.x86_64.iso","version":"412.86.202208101039-0"},{"openshift_version":"4.12","cpu_architecture":"aarch64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.12.0-ec.2/rhcos-4.12.0-ec.2-aarch64-live.aarch64.iso","version":"412.86.202208101040-0"}]' # os images
           - name: SERVICE_ACCOUNT_NAME
             valueFrom:
               fieldRef:

diff --git a/config/samples/agent-install.openshift.io_v1beta1_agentserviceconfig.yaml b/config/samples/agent-install.openshift.io_v1beta1_agentserviceconfig.yaml
@@ -44,23 +44,23 @@ spec:
     openshiftVersion: '4.10'
     url: https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.10/4.10.25/rhcos-4.10.25-x86_64-live.x86_64.iso
     version: 410.84.202207061638-0
-  - cpuArchitecture: arm64
+  - cpuArchitecture: aarch64
     openshiftVersion: '4.10'
     url: https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.10/4.10.25/rhcos-4.10.25-aarch64-live.aarch64.iso
     version: 410.84.202207051516-0
   - cpuArchitecture: x86_64
     openshiftVersion: '4.11'
     url: https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.11/4.11.2/rhcos-4.11.2-x86_64-live.x86_64.iso
     version: 411.86.202208112011-0
-  - cpuArchitecture: arm64
+  - cpuArchitecture: aarch64
     openshiftVersion: '4.11'
     url: https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.2/rhcos-4.11.2-aarch64-live.aarch64.iso
     version: 411.86.202208111758-0
   - cpuArchitecture: x86_64
     openshiftVersion: '4.12'
     url: https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/pre-release/4.12.0-ec.2/rhcos-4.12.0-ec.2-x86_64-live.x86_64.iso
     version: 412.86.202208101039-0
-  - cpuArchitecture: arm64
+  - cpuArchitecture: aarch64
     openshiftVersion: '4.12'
     url: https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.12.0-ec.2/rhcos-4.12.0-ec.2-aarch64-live.aarch64.iso
     version: 412.86.202208101040-0
diff --git a/data/default_os_images.json b/data/default_os_images.json
@@ -19,7 +19,7 @@
     },
     {
         "openshift_version": "4.10",
-        "cpu_architecture": "arm64",
+        "cpu_architecture": "aarch64",
         "url": "https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.10/4.10.25/rhcos-4.10.25-aarch64-live.aarch64.iso",
         "version": "410.84.202207051516-0"
     },
@@ -31,7 +31,7 @@
     },
     {
         "openshift_version": "4.11",
-        "cpu_architecture": "arm64",
+        "cpu_architecture": "aarch64",
         "url": "https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.2/rhcos-4.11.2-aarch64-live.aarch64.iso",
         "version": "411.86.202208111758-0"
     },
@@ -43,7 +43,7 @@
     },
     {
         "openshift_version": "4.12",
-        "cpu_architecture": "arm64",
+        "cpu_architecture": "aarch64",
         "url": "https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.12.0-ec.2/rhcos-4.12.0-ec.2-aarch64-live.aarch64.iso",
         "version": "412.86.202208101040-0"
     }

diff --git a/data/default_release_images.json b/data/default_release_images.json
@@ -28,9 +28,9 @@
     },
     {
         "openshift_version": "4.10",
-        "cpu_architecture": "arm64",
+        "cpu_architecture": "aarch64",
         "cpu_architectures": [
-            "arm64"
+            "aarch64"
         ],
         "url": "quay.io/openshift-release-dev/ocp-release:4.10.34-aarch64",
         "version": "4.10.34"
@@ -47,9 +47,9 @@
     },
     {
         "openshift_version": "4.11",
-        "cpu_architecture": "arm64",
+        "cpu_architecture": "aarch64",
         "cpu_architectures": [
-            "arm64"
+            "aarch64"
         ],
         "url": "quay.io/openshift-release-dev/ocp-release:4.11.6-aarch64",
         "version": "4.11.6"
@@ -59,7 +59,7 @@
         "cpu_architecture": "multi",
         "cpu_architectures": [
             "x86_64",
-            "arm64",
+            "aarch64",
             "ppc64le",
             "s390x"
         ],
@@ -78,9 +78,9 @@
     },
     {
         "openshift_version": "4.12",
-        "cpu_architecture": "arm64",
+        "cpu_architecture": "aarch64",
         "cpu_architectures": [
-            "arm64"
+            "aarch64"
         ],
         "url": "quay.io/openshift-release-dev/ocp-release:4.12.0-ec.3-aarch64",
         "support_level": "beta",

diff --git a/deploy/olm-catalog/manifests/agent-install.openshift.io_agentserviceconfigs.yaml b/deploy/olm-catalog/manifests/agent-install.openshift.io_agentserviceconfigs.yaml
@@ -580,7 +580,7 @@ spec:
                     version it is associated with.
                   properties:
                     cpuArchitecture:
-                      description: The CPU architecture of the image (x86_64/arm64/etc).
+                      description: The CPU architecture of the image (x86_64/aarch64/etc).
                       type: string
                     openshiftVersion:
                       description: OpenshiftVersion is the Major.Minor version of

diff --git a/deploy/olm-catalog/manifests/agent-install.openshift.io_hypershiftagentserviceconfigs.yaml b/deploy/olm-catalog/manifests/agent-install.openshift.io_hypershiftagentserviceconfigs.yaml
@@ -592,7 +592,7 @@ spec:
                     version it is associated with.
                   properties:
                     cpuArchitecture:
-                      description: The CPU architecture of the image (x86_64/arm64/etc).
+                      description: The CPU architecture of the image (x86_64/aarch64/etc).
                       type: string
                     openshiftVersion:
                       description: OpenshiftVersion is the Major.Minor version of

diff --git a/deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml b/deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml
@@ -78,7 +78,7 @@ metadata:
                 "version": "410.84.202207061638-0"
               },
               {
-                "cpuArchitecture": "arm64",
+                "cpuArchitecture": "aarch64",
                 "openshiftVersion": "4.10",
                 "url": "https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.10/4.10.25/rhcos-4.10.25-aarch64-live.aarch64.iso",
                 "version": "410.84.202207051516-0"
@@ -90,7 +90,7 @@ metadata:
                 "version": "411.86.202208112011-0"
               },
               {
-                "cpuArchitecture": "arm64",
+                "cpuArchitecture": "aarch64",
                 "openshiftVersion": "4.11",
                 "url": "https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.2/rhcos-4.11.2-aarch64-live.aarch64.iso",
                 "version": "411.86.202208111758-0"
@@ -102,7 +102,7 @@ metadata:
                 "version": "412.86.202208101039-0"
               },
               {
-                "cpuArchitecture": "arm64",
+                "cpuArchitecture": "aarch64",
                 "openshiftVersion": "4.12",
                 "url": "https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.12.0-ec.2/rhcos-4.12.0-ec.2-aarch64-live.aarch64.iso",
                 "version": "412.86.202208101040-0"
@@ -772,7 +772,7 @@ spec:
                 - name: INSTALLER_IMAGE
                   value: quay.io/edge-infrastructure/assisted-installer:latest
                 - name: OS_IMAGES
-                  value: '[{"openshift_version":"4.8","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.8/4.8.14/rhcos-4.8.14-x86_64-live.x86_64.iso","version":"48.84.202109241901-0"},{"openshift_version":"4.9","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.9/4.9.45/rhcos-4.9.45-x86_64-live.x86_64.iso","version":"49.84.202207192205-0"},{"openshift_version":"4.10","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.10/4.10.25/rhcos-4.10.25-x86_64-live.x86_64.iso","version":"410.84.202207061638-0"},{"openshift_version":"4.10","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.10/4.10.25/rhcos-4.10.25-aarch64-live.aarch64.iso","version":"410.84.202207051516-0"},{"openshift_version":"4.11","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.11/4.11.2/rhcos-4.11.2-x86_64-live.x86_64.iso","version":"411.86.202208112011-0"},{"openshift_version":"4.11","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.2/rhcos-4.11.2-aarch64-live.aarch64.iso","version":"411.86.202208111758-0"},{"openshift_version":"4.12","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/pre-release/4.12.0-ec.2/rhcos-4.12.0-ec.2-x86_64-live.x86_64.iso","version":"412.86.202208101039-0"},{"openshift_version":"4.12","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.12.0-ec.2/rhcos-4.12.0-ec.2-aarch64-live.aarch64.iso","version":"412.86.202208101040-0"}]'
+                  value: '[{"openshift_version":"4.8","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.8/4.8.14/rhcos-4.8.14-x86_64-live.x86_64.iso","version":"48.84.202109241901-0"},{"openshift_version":"4.9","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.9/4.9.45/rhcos-4.9.45-x86_64-live.x86_64.iso","version":"49.84.202207192205-0"},{"openshift_version":"4.10","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.10/4.10.25/rhcos-4.10.25-x86_64-live.x86_64.iso","version":"410.84.202207061638-0"},{"openshift_version":"4.10","cpu_architecture":"aarch64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.10/4.10.25/rhcos-4.10.25-aarch64-live.aarch64.iso","version":"410.84.202207051516-0"},{"openshift_version":"4.11","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.11/4.11.2/rhcos-4.11.2-x86_64-live.x86_64.iso","version":"411.86.202208112011-0"},{"openshift_version":"4.11","cpu_architecture":"aarch64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.2/rhcos-4.11.2-aarch64-live.aarch64.iso","version":"411.86.202208111758-0"},{"openshift_version":"4.12","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/pre-release/4.12.0-ec.2/rhcos-4.12.0-ec.2-x86_64-live.x86_64.iso","version":"412.86.202208101039-0"},{"openshift_version":"4.12","cpu_architecture":"aarch64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.12.0-ec.2/rhcos-4.12.0-ec.2-aarch64-live.aarch64.iso","version":"412.86.202208101040-0"}]'
                 - name: SERVICE_ACCOUNT_NAME
                   valueFrom:
                     fieldRef: