CLOUDP-82639: ARM support (#1361)

* Build multi-arch * Set up emulation * Uncomment s3 dockerfile * Create manifest for github image tags * Multi-arch for ubi agent * Default to UBI distro * Add docstring * Remove comment * Remove whitespace * Reuse dockerfiles * Make multi-arch context images * Use new community images supporting ARM --------- Co-authored-by: Julien Benhaim <[email protected]>
mongodb · Oct 10, 2023 · 1f9193a · 1f9193a
1 parent c1fd94a
commit 1f9193a
Show file tree

Hide file tree

Showing 26 changed files with 729 additions and 65 deletions.
diff --git a/.action_templates/e2e-fork-template.yaml b/.action_templates/e2e-fork-template.yaml
@@ -9,6 +9,7 @@ jobs:
     - template: checkout-fork
     - template: setup-and-install-python
     - template: quay-login
+    - template: set-up-qemu
     - template: build-and-push-development-images
   - template: tests
     steps:

diff --git a/.action_templates/e2e-pr-template.yaml b/.action_templates/e2e-pr-template.yaml
@@ -9,6 +9,7 @@ jobs:
     - template: checkout
     - template: setup-and-install-python
     - template: quay-login
+    - template: set-up-qemu
     - template: build-and-push-development-images
   - template: tests
     steps:

diff --git a/.action_templates/e2e-single-template.yaml b/.action_templates/e2e-single-template.yaml
@@ -6,6 +6,7 @@ jobs:
     - template: checkout
     - template: setup-and-install-python
     - template: quay-login
+    - template: set-up-qemu
     - template: build-and-push-development-images
   - template: single-test
     steps:

diff --git a/.action_templates/steps/build-and-push-development-images.yaml b/.action_templates/steps/build-and-push-development-images.yaml
@@ -1,6 +1,6 @@
 - name: Build and Push Images
   run: |
-    python pipeline.py --image-name ${{ matrix.pipeline-argument }} --release false
+    python pipeline.py --image-name ${{ matrix.pipeline-argument }} --release false --tag ${{ github.run_id }}
   env:
     MONGODB_COMMUNITY_CONFIG: "${{ github.workspace }}/scripts/ci/config.json"
     version_id: "${{ github.run_id }}"
diff --git a/.action_templates/steps/set-up-qemu.yaml b/.action_templates/steps/set-up-qemu.yaml
@@ -0,0 +1,2 @@
+- name: Set up QEMU
+  uses: docker/setup-qemu-action@v2
diff --git a/.github/workflows/e2e-dispatch.yml b/.github/workflows/e2e-dispatch.yml
@@ -70,10 +70,13 @@ jobs:
         registry: quay.io
         username: ${{ secrets.QUAY_USERNAME }}
         password: ${{ secrets.QUAY_ROBOT_TOKEN }}
+    # template: .action_templates/steps/set-up-qemu.yaml
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
     # template: .action_templates/steps/build-and-push-development-images.yaml
     - name: Build and Push Images
       run: |
-        python pipeline.py --image-name ${{ matrix.pipeline-argument }} --release false
+        python pipeline.py --image-name ${{ matrix.pipeline-argument }} --release false --tag ${{ github.run_id }}
       env:
         MONGODB_COMMUNITY_CONFIG: ${{ github.workspace }}/scripts/ci/config.json
         version_id: ${{ github.run_id }}

diff --git a/.github/workflows/e2e-fork.yml b/.github/workflows/e2e-fork.yml
@@ -72,10 +72,13 @@ jobs:
         registry: quay.io
         username: ${{ secrets.QUAY_USERNAME }}
         password: ${{ secrets.QUAY_ROBOT_TOKEN }}
+    # template: .action_templates/steps/set-up-qemu.yaml
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
     # template: .action_templates/steps/build-and-push-development-images.yaml
     - name: Build and Push Images
       run: |
-        python pipeline.py --image-name ${{ matrix.pipeline-argument }} --release false
+        python pipeline.py --image-name ${{ matrix.pipeline-argument }} --release false --tag ${{ github.run_id }}
       env:
         MONGODB_COMMUNITY_CONFIG: ${{ github.workspace }}/scripts/ci/config.json
         version_id: ${{ github.run_id }}

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -78,10 +78,13 @@ jobs:
         registry: quay.io
         username: ${{ secrets.QUAY_USERNAME }}
         password: ${{ secrets.QUAY_ROBOT_TOKEN }}
+    # template: .action_templates/steps/set-up-qemu.yaml
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
     # template: .action_templates/steps/build-and-push-development-images.yaml
     - name: Build and Push Images
       run: |
-        python pipeline.py --image-name ${{ matrix.pipeline-argument }} --release false
+        python pipeline.py --image-name ${{ matrix.pipeline-argument }} --release false --tag ${{ github.run_id }}
       env:
         MONGODB_COMMUNITY_CONFIG: ${{ github.workspace }}/scripts/ci/config.json
         version_id: ${{ github.run_id }}

diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ NAMESPACE := $(shell jq -r .namespace < $(MONGODB_COMMUNITY_CONFIG))
 UPGRADE_HOOK_IMG := $(shell jq -r .version_upgrade_hook_image < $(MONGODB_COMMUNITY_CONFIG))
 READINESS_PROBE_IMG := $(shell jq -r .readiness_probe_image < $(MONGODB_COMMUNITY_CONFIG))
 REGISTRY := $(shell jq -r .repo_url < $(MONGODB_COMMUNITY_CONFIG))
-AGENT_IMAGE_NAME := $(shell jq -r .agent_image_ubuntu < $(MONGODB_COMMUNITY_CONFIG))
+AGENT_IMAGE_NAME := $(shell jq -r .agent_image_ubi < $(MONGODB_COMMUNITY_CONFIG))
 
 HELM_CHART ?= ./helm-charts/charts/community-operator
 

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -53,7 +53,7 @@ spec:
         - name: MONGODB_IMAGE
           value: mongodb-community-server
         - name: MONGODB_REPO_URL
-          value: docker.io/mongodb
+          value: quay.io/mongodb
         image: quay.io/mongodb/mongodb-kubernetes-operator:0.8.2
         imagePullPolicy: Always
         name: mongodb-kubernetes-operator

diff --git a/deploy/openshift/operator_openshift.yaml b/deploy/openshift/operator_openshift.yaml
@@ -55,7 +55,7 @@ spec:
         - name: MONGODB_IMAGE
           value: mongo
         - name: MONGODB_REPO_URL
-          value: docker.io
+          value: quay.io
         image: quay.io/mongodb/mongodb-kubernetes-operator:0.8.2
         imagePullPolicy: Always
         name: mongodb-kubernetes-operator

diff --git a/docs/install-upgrade.md b/docs/install-upgrade.md
@@ -179,9 +179,9 @@ for MongoDB Docker images:
    - MongoDB tests, maintains, and supports them.
 
    | Environment Variable | Description | Default                      |
-   |----|------------------------------|----|
+   |----|------------------------------|------------------------------|
    | `MONGODB_IMAGE` | From the `MONGODB_REPO_URL`, absolute path to the MongoDB Docker image that you want to deploy. | `"mongodb-community-server"` |
-   | `MONGODB_REPO_URL` | URL of the container registry that contains the MongoDB Docker image that you want to deploy. | `"docker.io/mongodb"`        |
+   | `MONGODB_REPO_URL` | URL of the container registry that contains the MongoDB Docker image that you want to deploy. | `"quay.io/mongodb"`          |
 
    ```yaml
        spec:

diff --git a/inventories/e2e-inventory.yaml b/inventories/e2e-inventory.yaml
@@ -2,7 +2,40 @@ vars:
   registry: <registry>
 
 images:
-  - name: e2e
+  - name: e2e-arm64
+    vars:
+      context: .
+      template_context: scripts/dev/templates
+    inputs:
+      - e2e_image
+    platform: linux/arm64
+    stages:
+      - name: e2e-template
+        task_type: dockerfile_template
+        distro: e2e
+
+        inputs:
+          - builder
+          - base_image
+
+        output:
+          - dockerfile: scripts/dev/templates/Dockerfile.ubi-$(inputs.params.version_id)
+
+      - name: e2e-build
+        task_type: docker_build
+
+        dockerfile: scripts/dev/templates/Dockerfile.ubi-$(inputs.params.version_id)
+
+        labels:
+          quay.expires-after: 48h
+
+        output:
+          - registry: $(inputs.params.registry)/$(inputs.params.e2e_image)
+            tag: $(inputs.params.version_id)-arm64
+          - registry: $(inputs.params.registry)/$(inputs.params.e2e_image)
+            tag: latest-arm64
+
+  - name: e2e-amd64
     vars:
       context: .
       template_context: scripts/dev/templates
@@ -31,7 +64,7 @@ images:
 
         output:
           - registry: $(inputs.params.registry)/$(inputs.params.e2e_image)
-            tag: $(inputs.params.version_id)
+            tag: $(inputs.params.version_id)-amd64
           - registry: $(inputs.params.registry)/$(inputs.params.e2e_image)
-            tag: latest
+            tag: latest-amd64
 
diff --git a/inventories/operator-inventory.yaml b/inventories/operator-inventory.yaml
@@ -2,7 +2,7 @@ vars:
   registry: <registry>
 
 images:
-  - name: operator-ubi
+  - name: operator-ubi-amd64
     vars:
       context: .
       template_context: scripts/dev/templates/operator
@@ -30,7 +30,7 @@ images:
 
         output:
         - registry: $(inputs.params.registry)/$(inputs.params.operator_image_dev)
-          tag: $(inputs.params.version_id)-context
+          tag: $(inputs.params.version_id)-context-amd64
 
       - name: operator-template-dev
         task_type: dockerfile_template
@@ -51,16 +51,16 @@ images:
           - version_id
 
         buildargs:
-          imagebase: $(inputs.params.registry)/$(inputs.params.operator_image_dev):$(inputs.params.version_id)-context
+          imagebase: $(inputs.params.registry)/$(inputs.params.operator_image_dev):$(inputs.params.version_id)-context-amd64
 
         labels:
           quay.expires-after: 48h
 
         output:
           - registry: $(inputs.params.registry)/$(inputs.params.operator_image_dev)
-            tag: $(inputs.params.version_id)
+            tag: $(inputs.params.version_id)-amd64
           - registry: $(inputs.params.registry)/$(inputs.params.operator_image_dev)
-            tag: latest
+            tag: latest-amd64
 
 #
 # Release build stages
@@ -83,7 +83,7 @@ images:
 
         output:
           - registry: $(inputs.params.registry)/$(inputs.params.operator_image)
-            tag: $(inputs.params.release_version)-context
+            tag: $(inputs.params.release_version)-context-amd64
 
       - name: operator-template-release
         task_type: dockerfile_template
@@ -107,11 +107,125 @@ images:
         dockerfile: scripts/dev/templates/operator/Dockerfile.operator-$(inputs.params.release_version)
 
         buildargs:
-          imagebase: $(inputs.params.registry)/$(inputs.params.operator_image):$(inputs.params.release_version)-context
+          imagebase: $(inputs.params.registry)/$(inputs.params.operator_image):$(inputs.params.release_version)-context-amd64
 
         labels:
           quay.expires-after: Never
 
         output:
           - registry: $(inputs.params.registry)/$(inputs.params.operator_image)
-            tag: $(inputs.params.release_version)
+            tag: $(inputs.params.release_version)-amd64
+
+  - name: operator-ubi-arm64
+    vars:
+      context: .
+      template_context: scripts/dev/templates/operator
+
+    inputs:
+      - operator_image
+      - operator_image_dev
+
+    platform: linux/arm64
+
+    stages:
+      #
+      # Dev build stages
+      #
+      - name: operator-builder-dev
+        task_type: docker_build
+        tags: [ "ubi" ]
+        dockerfile: scripts/dev/templates/operator/Dockerfile.builder
+
+        buildargs:
+          builder_image: $(inputs.params.builder_image)
+
+        labels:
+          quay.expires-after: 48h
+
+        output:
+          - registry: $(inputs.params.registry)/$(inputs.params.operator_image_dev)
+            tag: $(inputs.params.version_id)-context-arm64
+
+      - name: operator-template-dev
+        task_type: dockerfile_template
+        tags: [ "ubi" ]
+        template_file_extension: operator
+        inputs:
+          - base_image
+
+        output:
+          - dockerfile: scripts/dev/templates/operator/Dockerfile.operator-$(inputs.params.version_id)
+
+      - name: operator-build-dev
+        task_type: docker_build
+        tags: [ "ubi" ]
+        dockerfile: scripts/dev/templates/operator/Dockerfile.operator-$(inputs.params.version_id)
+
+        inputs:
+          - version_id
+
+        buildargs:
+          imagebase: $(inputs.params.registry)/$(inputs.params.operator_image_dev):$(inputs.params.version_id)-context-arm64
+
+        labels:
+          quay.expires-after: 48h
+
+        output:
+          - registry: $(inputs.params.registry)/$(inputs.params.operator_image_dev)
+            tag: $(inputs.params.version_id)-arm64
+          - registry: $(inputs.params.registry)/$(inputs.params.operator_image_dev)
+            tag: latest-arm64
+
+      #
+      # Release build stages
+      #
+      - name: operator-builder-release
+        task_type: docker_build
+        tags: [ "ubi", "release" ]
+
+        inputs:
+          - builder_image
+          - release_version
+
+        dockerfile: scripts/dev/templates/operator/Dockerfile.builder
+
+        labels:
+          quay.expires-after: Never
+
+        buildargs:
+          builder_image: $(inputs.params.builder_image)
+
+        output:
+          - registry: $(inputs.params.registry)/$(inputs.params.operator_image)
+            tag: $(inputs.params.release_version)-context-arm64
+
+      - name: operator-template-release
+        task_type: dockerfile_template
+        tags: [ "ubi", "release" ]
+        template_file_extension: operator
+        inputs:
+          - base_image
+          - release_version
+
+        output:
+          - dockerfile: scripts/dev/templates/operator/Dockerfile.operator-$(inputs.params.release_version)
+          - dockerfile: $(inputs.params.s3_bucket)/mongodb-kubernetes-operator/$(inputs.params.release_version)/ubi/Dockerfile
+
+      - name: operator-build-release
+        task_type: docker_build
+        tags: [ "ubi", "release" ]
+
+        inputs:
+          - release_version
+
+        dockerfile: scripts/dev/templates/operator/Dockerfile.operator-$(inputs.params.release_version)
+
+        buildargs:
+          imagebase: $(inputs.params.registry)/$(inputs.params.operator_image):$(inputs.params.release_version)-context-arm64
+
+        labels:
+          quay.expires-after: Never
+
+        output:
+          - registry: $(inputs.params.registry)/$(inputs.params.operator_image)
+            tag: $(inputs.params.release_version)-arm64
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- name: Set up QEMU
		uses: docker/setup-qemu-action@v2