Skip to content

Commit 63f6853

Browse files
michaelawyumichaelawyu
committed
Resolved conflicts
Signed-off-by: michaelawyu <[email protected]>
2 parents 4617a56 + 196e800 commit 63f6853

File tree

1 file changed

+133
-0
lines changed

1 file changed

+133
-0
lines changed

‎.github/workflows/build-publish-mcr.yml‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ jobs:
5858
labels: [self-hosted, "1ES.Pool=1es-aks-fleet-pool-ubuntu"]
5959
#needs: [publish-images-amd64, publish-images-arm64]
6060
steps:
61+
<<<<<<< HEAD
6162
- name: 'Wait until images are processed'
6263
run: |
6364
echo "Waiting for 10 minutes to ensure that images are fully processed in MCR"
@@ -106,3 +107,135 @@ jobs:
106107
--amend ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}}/crd-installer:${{ needs.prepare-variables.outputs.release_tag }}-amd64 \
107108
--amend ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}}/crd-installer:${{ needs.prepare-variables.outputs.release_tag }}-arm64
108109
docker manifest push ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}}/crd-installer:${{ needs.prepare-variables.outputs.release_tag }}
110+
=======
111+
- uses: actions/checkout@v5
112+
with:
113+
ref: ${{ needs.prepare-variables.outputs.release_tag }}
114+
- name: 'Login the ACR'
115+
run: |
116+
az login --identity
117+
az acr login -n ${{ secrets.AZURE_REGISTRY }}
118+
- name: Build and publish hub-agent
119+
run: |
120+
make docker-build-hub-agent
121+
env:
122+
HUB_AGENT_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }}-amd64
123+
REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}}
124+
- name: Build and publish member-agent
125+
run: |
126+
make docker-build-member-agent
127+
env:
128+
MEMBER_AGENT_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }}-amd64
129+
REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}}
130+
- name: Build and publish refresh-token
131+
run: |
132+
make docker-build-refresh-token
133+
env:
134+
REFRESH_TOKEN_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }}-amd64
135+
REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}}
136+
- name: Build and publish crd-installer
137+
run: |
138+
make docker-build-crd-installer
139+
env:
140+
CRD_INSTALLER_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }}-amd64
141+
REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}}
142+
# Build Arc Extension for member clusters
143+
# Arc-connected clusters can join fleets as member clusters through an Arc Extension.
144+
# An Arc Extension is a packaged Helm chart that gets deployed to Arc clusters.
145+
# This step packages both the fleet member agent and networking agents into a single
146+
# Helm chart for Arc deployment, since Arc Extensions require all components to be bundled together.
147+
- name: Build and publish ARC member cluster agents helm chart
148+
run: |
149+
make helm-package-arc-member-cluster-agents
150+
env:
151+
ARC_MEMBER_AGENT_HELMCHART_VERSION: ${{ needs.prepare-variables.outputs.arc_helmchart_version }}
152+
MEMBER_AGENT_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }}
153+
REFRESH_TOKEN_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }}
154+
CRD_INSTALLER_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }}
155+
MCS_CONTROLLER_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.fleet_networking_version }}
156+
MEMBER_NET_CONTROLLER_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.fleet_networking_version }}
157+
REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.ARC_REGISTRY_REPO}}
158+
159+
publish-images-arm64:
160+
runs-on:
161+
labels: [self-hosted, "1ES.Pool=1es-aks-fleet-pool-ubuntu-arm64"]
162+
needs: prepare-variables
163+
steps:
164+
- uses: actions/checkout@v5
165+
with:
166+
ref: ${{ needs.prepare-variables.outputs.release_tag }}
167+
- name: 'Install the Azure CLI'
168+
# Note (chenyu1): the self-hosted 1ES ARM64 pool, for some reason, does not have Azure CLI installed by default;
169+
# install it manually here.
170+
run:
171+
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
172+
- name: 'Set up build dependencies'
173+
# Note (chenyu1): the self-hosted 1ES ARM64 pool, for some reason, does not have the common build
174+
# tools (e.g., make) installed by default; install them manually.
175+
run: |
176+
sudo apt-get update
177+
sudo apt-get install -y build-essential acl
178+
- name: 'Set up Docker'
179+
# Note (chenyu1): the self-hosted 1ES ARM64 pool, for some reason, does not have Docker installed by default,
180+
# and cannot have Docker installed via the docker/setup-docker-action Github Action, hence the manual setup
181+
# steps here.
182+
run: |
183+
sudo apt-get update
184+
sudo apt-get -y install ca-certificates curl
185+
sudo install -m 0755 -d /etc/apt/keyrings
186+
sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
187+
sudo chmod a+r /etc/apt/keyrings/docker.asc
188+
echo \
189+
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
190+
$(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \
191+
sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
192+
sudo apt-get update
193+
sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
194+
- name: 'Enable Docker access'
195+
# Note (chenyu1): there are situations where the newgrp command will not take effect; set access
196+
# to the docker daemon directly just in case.
197+
run: |
198+
sudo groupadd docker || true
199+
echo "Adding $USER to the docker group"
200+
sudo usermod -aG docker $USER
201+
newgrp docker
202+
sudo setfacl --modify user:$USER:rw /var/run/docker.sock
203+
- name: 'Login the ACR'
204+
# Note (chenyu1): must not use root privileges; the system seems to have some trouble
205+
# retrieving credentials when sudo is used.
206+
run: |
207+
az login --identity
208+
az acr login -n ${{ secrets.AZURE_REGISTRY }}
209+
- name: 'Verify Docker CLI'
210+
run: |
211+
docker version
212+
docker info
213+
- name: Build and publish hub-agent
214+
run: |
215+
make docker-build-hub-agent
216+
env:
217+
HUB_AGENT_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }}-arm64
218+
REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}}
219+
TARGET_ARCH: arm64
220+
- name: Build and publish member-agent
221+
run: |
222+
make docker-build-member-agent
223+
env:
224+
MEMBER_AGENT_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }}-arm64
225+
REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}}
226+
TARGET_ARCH: arm64
227+
- name: Build and publish refresh-token
228+
run: |
229+
make docker-build-refresh-token
230+
env:
231+
REFRESH_TOKEN_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }}-arm64
232+
REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}}
233+
TARGET_ARCH: arm64
234+
- name: Build and publish crd-installer
235+
run: |
236+
make docker-build-crd-installer
237+
env:
238+
CRD_INSTALLER_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }}-arm64
239+
REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}}
240+
TARGET_ARCH: arm64
241+
>>>>>>> 196e800311e4897ab0d38b787557dd6789b812bb

0 commit comments

Comments
 (0)