Skip to content

Commit 6a49574

Browse files
authored
Merge pull request #113 from kkulak/feat/multiplatform-build
feat: multiplatform build setup - linux/arm64
2 parents 7de6839 + b5350f9 commit 6a49574

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,11 @@ jobs:
8282
echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/v}
8383
echo ::set-output name=TAG_NAME::${GITHUB_REF#refs/tags/}
8484
85+
- name: Set up QEMU
86+
uses: docker/setup-qemu-action@v3
87+
8588
- name: Set up Docker Buildx
86-
uses: docker/setup-buildx-action@v1
89+
uses: docker/setup-buildx-action@v3
8790

8891
- name: Create release YAML (gatling-operator.yaml)
8992
env:

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ run: manifests generate fmt vet ## Run a controller from your host.
9797
docker-build: test ## Build docker image with the manager.
9898
docker build -t ${IMG} .
9999

100-
docker-push: docker-build ## Push docker image with the manager.
101-
docker push ${IMG}
100+
docker-push: test ## Push docker image with the manager.
101+
docker buildx build --platform linux/amd64,linux/arm64 -t ${IMG} . --push
102102

103103
kind-load-image: kind-create docker-build ## Load local docker image into the kind cluster
104104
@echo "Loading image into kind"

controllers/gatling_controller.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,8 @@ func (r *GatlingReconciler) newGatlingRunnerJobForCR(gatling *gatlingv1alpha1.Ga
464464
},
465465
Spec: batchv1.JobSpec{
466466
BackoffLimit: &noRestarts,
467-
Parallelism: r.getGatlingRunnerJobParallelism(gatling),
468-
Completions: r.getGatlingRunnerJobParallelism(gatling),
467+
Parallelism: r.getGatlingRunnerJobParallelism(gatling),
468+
Completions: r.getGatlingRunnerJobParallelism(gatling),
469469
Template: corev1.PodTemplateSpec{
470470
ObjectMeta: metav1.ObjectMeta{
471471
Name: r.getObjectMeta(gatling).Name,
@@ -479,7 +479,7 @@ func (r *GatlingReconciler) newGatlingRunnerJobForCR(gatling *gatlingv1alpha1.Ga
479479
InitContainers: []corev1.Container{
480480
{
481481
Name: "gatling-waiter",
482-
Image: "bitnami/kubectl:1.21.8",
482+
Image: "bitnami/kubectl:1.29.3",
483483
Command: []string{"/bin/sh", "-c"},
484484
Args: []string{gatlingWaiterCommand},
485485
Resources: r.getPodResources(gatling),
@@ -531,8 +531,8 @@ func (r *GatlingReconciler) newGatlingRunnerJobForCR(gatling *gatlingv1alpha1.Ga
531531
},
532532
Spec: batchv1.JobSpec{
533533
BackoffLimit: &noRestarts,
534-
Parallelism: &gatling.Spec.TestScenarioSpec.Parallelism,
535-
Completions: &gatling.Spec.TestScenarioSpec.Parallelism,
534+
Parallelism: &gatling.Spec.TestScenarioSpec.Parallelism,
535+
Completions: &gatling.Spec.TestScenarioSpec.Parallelism,
536536
Template: corev1.PodTemplateSpec{
537537
ObjectMeta: metav1.ObjectMeta{
538538
Name: r.getObjectMeta(gatling).Name,
@@ -546,7 +546,7 @@ func (r *GatlingReconciler) newGatlingRunnerJobForCR(gatling *gatlingv1alpha1.Ga
546546
InitContainers: []corev1.Container{
547547
{
548548
Name: "gatling-waiter",
549-
Image: "bitnami/kubectl:1.21.8",
549+
Image: "bitnami/kubectl:1.29.3",
550550
Command: []string{"/bin/sh", "-c"},
551551
Args: []string{gatlingWaiterCommand},
552552
Resources: r.getPodResources(gatling),

0 commit comments

Comments
 (0)