Merge pull request #821 from shyamradhakrishnan/task/oci_arm_support

Add support for Arm based images in OCI

Author: k8s-ci-robot

docs/book/src/capi/providers/oci.md

@@ -9,7 +9,7 @@
 ## Building Images
 
 The build [prerequisites](../capi.md#prerequisites) for using `image-builder` for
-building OCI images are managed by running:
+building OCI images are managed by running the following command from images/capi directory.
 
 ```bash
 make deps-oci
@@ -52,7 +52,7 @@ Create a file with the following contents and name it as `oci.json`
 {
   "compartment_ocid": "Fill compartment OCID here",
   "subnet_ocid": "Fill Subnet OCID here",
-  "availability_domain": "Fill Availbility Domain here"
+  "availability_domain": "Fill Availability Domain here"
 }
 ```
 
@@ -61,3 +61,23 @@ Create a file with the following contents and name it as `oci.json`
 ```bash
 PACKER_VAR_FILES=oci.json make build-oci-oracle-linux-8
 ```
+
+#### Build an Arm based image
+
+Building an Arm based image requires some overrides to use the correct installation files . An example for an 
+`oci.json` file  for Arm is shown below. The parameters for containerd, crictl and kubernetes 
+has to point to the corresponding URL for Arm. The containerd SHA can be changed appropriately, the containerd version
+is defined in images/capi/packer/config/containerd.json.
+
+```json
+{
+  "compartment_ocid": "Fill compartment OCID here",
+  "subnet_ocid": "Fill Subnet OCID here",
+  "availability_domain": "Fill Availability Domain here",
+  "shape": "VM.Standard.A1.Flex",
+  "containerd_url": "https://github.com/containerd/containerd/releases/download/v{{user `containerd_version`}}/cri-containerd-cni-{{user `containerd_version`}}-linux-arm64.tar.gz",
+  "crictl_url": "https://github.com/kubernetes-sigs/cri-tools/releases/download/v{{user `crictl_version`}}/crictl-v{{user `crictl_version`}}-linux-arm64.tar.gz",
+  "kubernetes_rpm_repo": "https://packages.cloud.google.com/yum/repos/kubernetes-el7-aarch64",
+  "containerd_sha256": "9ac616b5f23c1d10353bd45b26cb736efa75dfef31a2113baff2435dbc7becb8"
+}
+```

images/capi/ansible/roles/node/meta/main.yml

@@ -19,8 +19,14 @@ dependencies:
       debs: "{{ common_debs }}"
     when: ansible_distribution == "Amazon"
 
+  - role: setup
+    vars:
+      rpms: "{{ common_rpms }}"
+      debs: "{{ common_debs }}"
+    when: packer_builder_type == "oracle-oci" and ansible_architecture == "aarch64"
+
   - role: setup
     vars:
       rpms: "{{ ( common_photon_rpms + lookup('vars', 'common_' + build_target + '_photon_rpms') ) if ansible_os_family == 'VMware Photon OS' else ( ( common_rpms + rh7_rpms + lookup('vars', 'common_' + build_target + '_rpms') ) if (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7') else ( common_rpms + rh8_rpms + lookup('vars', 'common_' + build_target + '_rpms') ) ) }}"
       debs: "{{ common_debs +  lookup('vars', 'common_' + build_target + '_debs') }}"
-    when: ansible_distribution != "Amazon"
+    when: ansible_distribution != "Amazon" and not (packer_builder_type == "oracle-oci" and ansible_architecture == "aarch64")

images/capi/ansible/roles/setup/tasks/debian.yml

@@ -17,6 +17,9 @@
     src: etc/apt/sources.list.j2
     dest: /etc/apt/sources.list
     mode: 0644
+  # OCI Base images have the required apt sources list embedded inside the image, adding the sources list
+  # from this repo leads to build failures(especially in Arm), hence ignoring the step.
+  when: packer_builder_type != "oracle-oci"
 
 - name: Put templated apt.conf.d/90proxy in place when defined
   template: