Skip to content

Commit 1595849

Browse files
authored
fix(image): Fix Operator ARM64 image build (#1538)
# Description To address issue with Operator container image build on ARM64 nodes, this PR fixes the issue by updating the Dockerfile to use the correct base image for ARM64 nodes. Also, the image build ADO pipeline has been updated to use the correct base image for ARM64 nodes. ## Related Issue No GitHub issue is linked to this PR ADO work item: https://msazure.visualstudio.com/One/_workitems/edit/32236163 ## Checklist - [X] I have read the [contributing documentation](https://retina.sh/docs/Contributing/overview). - [X] I signed and signed-off the commits (`git commit -S -s ...`). See [this documentation](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification) on signing commits. - [X] I have correctly attributed the author(s) of the code. - [X] I have tested the changes locally. - [X] I have followed the project's style guidelines. - [ ] I have updated the documentation, if necessary. - [ ] I have added tests, if applicable. ## Screenshots (if applicable) or Testing Completed Deployment on cluster that only has ARM64 nodes ![image](https://github.com/user-attachments/assets/871bc614-468a-426d-816a-bd724e11c867) ## Additional Notes Add any additional notes or context about the pull request here. --- Please refer to the [CONTRIBUTING.md](../CONTRIBUTING.md) file for more information on how to contribute to this project.
1 parent 04e00d7 commit 1595849

File tree

4 files changed

+2
-13
lines changed

4 files changed

+2
-13
lines changed

Diff for: .github/workflows/images.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
strategy:
123123
matrix:
124124
platform: ["linux"]
125-
arch: ["amd64"]
125+
arch: ["amd64", "arm64"]
126126

127127
steps:
128128
- name: Checkout code

Diff for: deploy/hubble/manifests/controller/helm/retina/templates/operator/deployment.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ spec:
3535
requiredDuringSchedulingIgnoredDuringExecution:
3636
nodeSelectorTerms:
3737
- matchExpressions:
38-
- key: kubernetes.io/arch
39-
operator: In
40-
values:
41-
- amd64
4238
- key: kubernetes.io/os
4339
operator: In
4440
values:

Diff for: deploy/standard/manifests/controller/helm/retina/templates/operator.yaml

-7
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,6 @@ spec:
3737
requiredDuringSchedulingIgnoredDuringExecution:
3838
nodeSelectorTerms:
3939
- matchExpressions:
40-
- key: kubernetes.io/arch
41-
operator: In
42-
values:
43-
- amd64
44-
#- arm64
45-
#- ppc64le
46-
#- s390x
4740
- key: kubernetes.io/os
4841
operator: In
4942
values:

Diff for: operator/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ENV GOARCH=${GOARCH}
1919

2020
RUN make manifests
2121
RUN --mount=type=cache,target="/root/.cache/go-build" \
22-
GOOS=linux GOARCH=amd64 go build \
22+
GOOS=$GOOS GOARCH=$GOARCH go build \
2323
-ldflags "-X github.com/microsoft/retina/internal/buildinfo.Version="$VERSION" \
2424
-X "github.com/microsoft/retina/internal/buildinfo.ApplicationInsightsID"="$APP_INSIGHTS_ID"" \
2525
-a -o retina-operator operator/main.go

0 commit comments

Comments
 (0)