Skip to content

Commit 1f9193a

Browse files
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]>
1 parent c1fd94a commit 1f9193a

26 files changed

+729
-65
lines changed

.action_templates/e2e-fork-template.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
- template: checkout-fork
1010
- template: setup-and-install-python
1111
- template: quay-login
12+
- template: set-up-qemu
1213
- template: build-and-push-development-images
1314
- template: tests
1415
steps:

.action_templates/e2e-pr-template.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
- template: checkout
1010
- template: setup-and-install-python
1111
- template: quay-login
12+
- template: set-up-qemu
1213
- template: build-and-push-development-images
1314
- template: tests
1415
steps:

.action_templates/e2e-single-template.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ jobs:
66
- template: checkout
77
- template: setup-and-install-python
88
- template: quay-login
9+
- template: set-up-qemu
910
- template: build-and-push-development-images
1011
- template: single-test
1112
steps:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
- name: Build and Push Images
22
run: |
3-
python pipeline.py --image-name ${{ matrix.pipeline-argument }} --release false
3+
python pipeline.py --image-name ${{ matrix.pipeline-argument }} --release false --tag ${{ github.run_id }}
44
env:
55
MONGODB_COMMUNITY_CONFIG: "${{ github.workspace }}/scripts/ci/config.json"
66
version_id: "${{ github.run_id }}"
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- name: Set up QEMU
2+
uses: docker/setup-qemu-action@v2

.github/workflows/e2e-dispatch.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,13 @@ jobs:
7070
registry: quay.io
7171
username: ${{ secrets.QUAY_USERNAME }}
7272
password: ${{ secrets.QUAY_ROBOT_TOKEN }}
73+
# template: .action_templates/steps/set-up-qemu.yaml
74+
- name: Set up QEMU
75+
uses: docker/setup-qemu-action@v2
7376
# template: .action_templates/steps/build-and-push-development-images.yaml
7477
- name: Build and Push Images
7578
run: |
76-
python pipeline.py --image-name ${{ matrix.pipeline-argument }} --release false
79+
python pipeline.py --image-name ${{ matrix.pipeline-argument }} --release false --tag ${{ github.run_id }}
7780
env:
7881
MONGODB_COMMUNITY_CONFIG: ${{ github.workspace }}/scripts/ci/config.json
7982
version_id: ${{ github.run_id }}

.github/workflows/e2e-fork.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,13 @@ jobs:
7272
registry: quay.io
7373
username: ${{ secrets.QUAY_USERNAME }}
7474
password: ${{ secrets.QUAY_ROBOT_TOKEN }}
75+
# template: .action_templates/steps/set-up-qemu.yaml
76+
- name: Set up QEMU
77+
uses: docker/setup-qemu-action@v2
7578
# template: .action_templates/steps/build-and-push-development-images.yaml
7679
- name: Build and Push Images
7780
run: |
78-
python pipeline.py --image-name ${{ matrix.pipeline-argument }} --release false
81+
python pipeline.py --image-name ${{ matrix.pipeline-argument }} --release false --tag ${{ github.run_id }}
7982
env:
8083
MONGODB_COMMUNITY_CONFIG: ${{ github.workspace }}/scripts/ci/config.json
8184
version_id: ${{ github.run_id }}

.github/workflows/e2e.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,13 @@ jobs:
7878
registry: quay.io
7979
username: ${{ secrets.QUAY_USERNAME }}
8080
password: ${{ secrets.QUAY_ROBOT_TOKEN }}
81+
# template: .action_templates/steps/set-up-qemu.yaml
82+
- name: Set up QEMU
83+
uses: docker/setup-qemu-action@v2
8184
# template: .action_templates/steps/build-and-push-development-images.yaml
8285
- name: Build and Push Images
8386
run: |
84-
python pipeline.py --image-name ${{ matrix.pipeline-argument }} --release false
87+
python pipeline.py --image-name ${{ matrix.pipeline-argument }} --release false --tag ${{ github.run_id }}
8588
env:
8689
MONGODB_COMMUNITY_CONFIG: ${{ github.workspace }}/scripts/ci/config.json
8790
version_id: ${{ github.run_id }}

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ NAMESPACE := $(shell jq -r .namespace < $(MONGODB_COMMUNITY_CONFIG))
99
UPGRADE_HOOK_IMG := $(shell jq -r .version_upgrade_hook_image < $(MONGODB_COMMUNITY_CONFIG))
1010
READINESS_PROBE_IMG := $(shell jq -r .readiness_probe_image < $(MONGODB_COMMUNITY_CONFIG))
1111
REGISTRY := $(shell jq -r .repo_url < $(MONGODB_COMMUNITY_CONFIG))
12-
AGENT_IMAGE_NAME := $(shell jq -r .agent_image_ubuntu < $(MONGODB_COMMUNITY_CONFIG))
12+
AGENT_IMAGE_NAME := $(shell jq -r .agent_image_ubi < $(MONGODB_COMMUNITY_CONFIG))
1313

1414
HELM_CHART ?= ./helm-charts/charts/community-operator
1515

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ spec:
5353
- name: MONGODB_IMAGE
5454
value: mongodb-community-server
5555
- name: MONGODB_REPO_URL
56-
value: docker.io/mongodb
56+
value: quay.io/mongodb
5757
image: quay.io/mongodb/mongodb-kubernetes-operator:0.8.2
5858
imagePullPolicy: Always
5959
name: mongodb-kubernetes-operator

0 commit comments

Comments
 (0)