Skip to content

Commit 357a2c2

Browse files
emosbaughemosbaugh
authored
feat: use chainguard for LAM and utils images (#780)
* feat: use chainguard for LAM image * f * f * f * f * f * f * f * f * f * f * add TestMultiNodeAirgapUpgradeSameK0s to release-dev.yaml * increase restore registry wait timeout
1 parent 5e312db commit 357a2c2

File tree

10 files changed

+331
-47
lines changed

10 files changed

+331
-47
lines changed

‎.github/workflows/pull-request.yaml

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,30 +51,50 @@ jobs:
5151
with:
5252
go-version-file: go.mod
5353

54+
- uses: actions/cache@v4
55+
with:
56+
path: |
57+
build/.melange-cache
58+
key: melange-cache
59+
5460
- name: Set up Docker Buildx
5561
uses: docker/setup-buildx-action@v3
5662

57-
- name: Login to Registry
58-
uses: docker/login-action@v3
59-
with:
60-
registry: registry.staging.replicated.com
61-
username: ${{ secrets.REGISTRY_USERNAME_STAGING }}
62-
password: ${{ secrets.REGISTRY_PASSWORD_STAGING }}
63+
- name: Setup Melange
64+
uses: chainguard-dev/actions/setup-melange@main
6365

6466
- name: Build and push local-artifact-mirror image
6567
run: |
6668
SHA=${{ github.event.pull_request.head.sha }}
6769
export SHORT_SHA=dev-${SHA::7}
68-
export LOCAL_ARTIFACT_MIRROR_IMAGE=registry.staging.replicated.com/library/embedded-cluster-local-artifact-mirror
70+
export LOCAL_ARTIFACT_MIRROR_IMAGE=replicated/embedded-cluster-local-artifact-mirror-staging
71+
export REGISTRY=docker.io
72+
export USERNAME=${{ secrets.DOCKERHUB_USER }}
73+
export PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }}
74+
make apko
6975
make build-and-push-local-artifact-mirror-image VERSION="${SHORT_SHA}"
7076
make build-and-push-local-artifact-mirror-image VERSION="${SHORT_SHA}-previous-k0s"
7177
make build-and-push-local-artifact-mirror-image VERSION="${SHORT_SHA}-upgrade"
7278
79+
- name: Build and push utils image
80+
run: |
81+
SHA=${{ github.event.pull_request.head.sha }}
82+
export SHORT_SHA=dev-${SHA::7}
83+
export EMBEDDED_OPERATOR_UTILS_IMAGE=replicated/embedded-cluster-utils-staging
84+
export REGISTRY=docker.io
85+
export USERNAME=${{ secrets.DOCKERHUB_USER }}
86+
export PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }}
87+
make apko
88+
make build-and-push-utils-image VERSION="${SHORT_SHA}"
89+
make build-and-push-utils-image VERSION="${SHORT_SHA}-previous-k0s"
90+
make build-and-push-utils-image VERSION="${SHORT_SHA}-upgrade"
91+
7392
- name: Build Linux AMD64 and Output Metadata
7493
run: |
7594
SHA=${{ github.event.pull_request.head.sha }}
7695
export SHORT_SHA=dev-${SHA::7}
77-
export LOCAL_ARTIFACT_MIRROR_IMAGE=registry.staging.replicated.com/library/embedded-cluster-local-artifact-mirror
96+
export LOCAL_ARTIFACT_MIRROR_IMAGE=replicated/embedded-cluster-local-artifact-mirror-staging
97+
export EMBEDDED_OPERATOR_UTILS_IMAGE=replicated/embedded-cluster-utils-staging
7898
make -B embedded-cluster-linux-amd64 K0S_VERSION=$(make print-PREVIOUS_K0S_VERSION) K0S_BINARY_SOURCE_OVERRIDE=$(make print-PREVIOUS_K0S_BINARY_SOURCE_OVERRIDE) VERSION="${SHORT_SHA}-previous-k0s"
7999
tar -C output/bin -czvf embedded-cluster-linux-amd64-previous-k0s.tgz embedded-cluster
80100
./output/bin/embedded-cluster version metadata > metadata-previous-k0s.json
@@ -116,7 +136,8 @@ jobs:
116136
run: |
117137
SHA=${{ github.event.pull_request.head.sha }}
118138
export SHORT_SHA=dev-${SHA::7}
119-
export LOCAL_ARTIFACT_MIRROR_IMAGE=registry.staging.replicated.com/library/embedded-cluster-local-artifact-mirror
139+
export LOCAL_ARTIFACT_MIRROR_IMAGE=replicated/embedded-cluster-local-artifact-mirror-staging
140+
export EMBEDDED_OPERATOR_UTILS_IMAGE=replicated/embedded-cluster-utils-staging
120141
echo "# channel release object" > e2e/kots-release-install/release.yaml
121142
echo 'channelID: "2cHXb1RCttzpR0xvnNWyaZCgDBP"' >> e2e/kots-release-install/release.yaml
122143
echo 'channelSlug: "ci"' >> e2e/kots-release-install/release.yaml
@@ -229,7 +250,6 @@ jobs:
229250
- TestSingleNodeAirgapDisasterRecovery
230251
- TestMultiNodeHAInstallation
231252
- TestMultiNodeAirgapHAInstallation
232-
- TestMultiNodeAirgapUpgradeSameK0s
233253
- TestProxiedEnvironment
234254
- TestMultiNodeHADisasterRecovery
235255
- TestMultiNodeAirgapHADisasterRecovery
@@ -239,6 +259,8 @@ jobs:
239259
include:
240260
- test: TestMultiNodeAirgapUpgrade
241261
runner: embedded-cluster
262+
- test: TestMultiNodeAirgapUpgradeSameK0s
263+
runner: embedded-cluster
242264
- test: TestMultiNodeAirgapHAInstallation
243265
runner: embedded-cluster
244266
- test: TestMultiNodeAirgapHADisasterRecovery

‎.github/workflows/release-dev.yaml

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,44 @@ jobs:
2121
- name: Set up Docker Buildx
2222
uses: docker/setup-buildx-action@v3
2323

24-
- name: Login to Registry
25-
uses: docker/login-action@v3
24+
- uses: actions/cache@v4
2625
with:
27-
registry: registry.staging.replicated.com
28-
username: ${{ secrets.REGISTRY_USERNAME_STAGING }}
29-
password: ${{ secrets.REGISTRY_PASSWORD_STAGING }}
26+
path: |
27+
build/.melange-cache
28+
key: melange-cache
29+
30+
- name: Setup Melange
31+
uses: chainguard-dev/actions/setup-melange@main
3032

3133
- name: Build and push local-artifact-mirror image
3234
run: |
3335
export SHORT_SHA=dev-${GITHUB_SHA::7}
34-
export LOCAL_ARTIFACT_MIRROR_IMAGE=registry.staging.replicated.com/library/embedded-cluster-local-artifact-mirror
36+
export LOCAL_ARTIFACT_MIRROR_IMAGE=replicated/embedded-cluster-local-artifact-mirror-staging
37+
export REGISTRY=docker.io
38+
export USERNAME=${{ secrets.DOCKERHUB_USER }}
39+
export PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }}
40+
make apko
3541
make build-and-push-local-artifact-mirror-image VERSION="${SHORT_SHA}"
3642
make build-and-push-local-artifact-mirror-image VERSION="${SHORT_SHA}-previous-k0s"
3743
make build-and-push-local-artifact-mirror-image VERSION="${SHORT_SHA}-upgrade"
3844
45+
- name: Build and push local-artifact-mirror image
46+
run: |
47+
export SHORT_SHA=dev-${GITHUB_SHA::7}
48+
export EMBEDDED_OPERATOR_UTILS_IMAGE=replicated/embedded-cluster-utils-staging
49+
export REGISTRY=docker.io
50+
export USERNAME=${{ secrets.DOCKERHUB_USER }}
51+
export PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }}
52+
make apko
53+
make build-and-push-utils-image VERSION="${SHORT_SHA}"
54+
make build-and-push-utils-image VERSION="${SHORT_SHA}-previous-k0s"
55+
make build-and-push-utils-image VERSION="${SHORT_SHA}-upgrade"
56+
3957
- name: Build Linux AMD64 and Output Metadata
4058
run: |
4159
export SHORT_SHA=dev-${GITHUB_SHA::7}
42-
export LOCAL_ARTIFACT_MIRROR_IMAGE=registry.staging.replicated.com/library/embedded-cluster-local-artifact-mirror
60+
export LOCAL_ARTIFACT_MIRROR_IMAGE=replicated/embedded-cluster-local-artifact-mirror-staging
61+
export EMBEDDED_OPERATOR_UTILS_IMAGE=replicated/embedded-cluster-utils-staging
4362
make -B embedded-cluster-linux-amd64 K0S_VERSION=$(make print-PREVIOUS_K0S_VERSION) K0S_BINARY_SOURCE_OVERRIDE=$(make print-PREVIOUS_K0S_BINARY_SOURCE_OVERRIDE) VERSION="${SHORT_SHA}-previous-k0s"
4463
tar -C output/bin -czvf embedded-cluster-linux-amd64-previous-k0s.tgz embedded-cluster
4564
./output/bin/embedded-cluster version metadata > metadata-previous-k0s.json
@@ -88,7 +107,8 @@ jobs:
88107
- name: Build CI binary
89108
run: |
90109
export SHORT_SHA=dev-${GITHUB_SHA::7}
91-
export LOCAL_ARTIFACT_MIRROR_IMAGE=registry.staging.replicated.com/library/embedded-cluster-local-artifact-mirror
110+
export LOCAL_ARTIFACT_MIRROR_IMAGE=replicated/embedded-cluster-local-artifact-mirror-staging
111+
export EMBEDDED_OPERATOR_UTILS_IMAGE=replicated/embedded-cluster-utils-staging
92112
echo "# channel release object" > e2e/kots-release-install/release.yaml
93113
echo 'channelID: "2cHXb1RCttzpR0xvnNWyaZCgDBP"' >> e2e/kots-release-install/release.yaml
94114
echo 'channelSlug: "ci"' >> e2e/kots-release-install/release.yaml
@@ -174,7 +194,6 @@ jobs:
174194
- TestSingleNodeAirgapDisasterRecovery
175195
- TestMultiNodeHAInstallation
176196
- TestMultiNodeAirgapHAInstallation
177-
- TestMultiNodeAirgapUpgradeSameK0s
178197
- TestProxiedEnvironment
179198
- TestMultiNodeHADisasterRecovery
180199
- TestMultiNodeAirgapHADisasterRecovery
@@ -184,6 +203,8 @@ jobs:
184203
include:
185204
- test: TestMultiNodeAirgapUpgrade
186205
runner: embedded-cluster
206+
- test: TestMultiNodeAirgapUpgradeSameK0s
207+
runner: embedded-cluster
187208
- test: TestMultiNodeAirgapHAInstallation
188209
runner: embedded-cluster
189210
- test: TestMultiNodeAirgapHADisasterRecovery

‎.github/workflows/release-prod.yaml

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,49 @@ jobs:
2929
- name: Set up Docker Buildx
3030
uses: docker/setup-buildx-action@v3
3131

32-
- name: Login to Registry
33-
uses: docker/login-action@v3
32+
- uses: actions/cache@v4
3433
with:
35-
registry: registry.replicated.com
36-
username: ${{ secrets.REGISTRY_USERNAME_PRODUCTION }}
37-
password: ${{ secrets.REGISTRY_PASSWORD_PRODUCTION }}
34+
path: |
35+
build/.melange-cache
36+
key: melange-cache
37+
38+
- name: Setup Melange
39+
uses: chainguard-dev/actions/setup-melange@main
3840

3941
- name: Build and push local-artifact-mirror image (production)
4042
run: |
43+
export REGISTRY=docker.io
44+
export USERNAME=${{ secrets.DOCKERHUB_USER }}
45+
export PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }}
46+
make apko
4147
make build-and-push-local-artifact-mirror-image VERSION=$TAG_NAME
4248
43-
- name: Login to Registry
44-
uses: docker/login-action@v3
45-
with:
46-
registry: registry.staging.replicated.com
47-
username: ${{ secrets.REGISTRY_USERNAME_STAGING }}
48-
password: ${{ secrets.REGISTRY_PASSWORD_STAGING }}
49-
5049
- name: Build and push local-artifact-mirror image (staging)
5150
run: |
52-
export LOCAL_ARTIFACT_MIRROR_IMAGE=registry.staging.replicated.com/library/embedded-cluster-local-artifact-mirror
51+
export LOCAL_ARTIFACT_MIRROR_IMAGE=replicated/embedded-cluster-local-artifact-mirror-staging
52+
export REGISTRY=docker.io
53+
export USERNAME=${{ secrets.DOCKERHUB_USER }}
54+
export PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }}
55+
make apko
5356
make build-and-push-local-artifact-mirror-image VERSION=$TAG_NAME
5457
58+
- name: Build and push utils image (production)
59+
run: |
60+
export REGISTRY=docker.io
61+
export USERNAME=${{ secrets.DOCKERHUB_USER }}
62+
export PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }}
63+
make apko
64+
make build-and-push-utils-image VERSION=$TAG_NAME
65+
66+
- name: Build and push utils image (staging)
67+
run: |
68+
export EMBEDDED_OPERATOR_UTILS_IMAGE=replicated/embedded-cluster-utils-staging
69+
export REGISTRY=docker.io
70+
export USERNAME=${{ secrets.DOCKERHUB_USER }}
71+
export PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }}
72+
make apko
73+
make build-and-push-utils-image VERSION=$TAG_NAME
74+
5575
- name: Build linux-amd64
5676
run: |
5777
make embedded-cluster-linux-amd64 VERSION=$TAG_NAME

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ pkg/goods/images
77
.pre-commit-config.yaml
88
vendor
99
e2e/kots-release-install/license.yaml
10+
/build/
11+
/bin/

0 commit comments

Comments
 (0)