Skip to content

Commit c740031

Browse files
committed
Merge remote-tracking branch 'origin/main' into ci/build-arm64-leg
Signed-off-by: Aleksei Sviridkin <[email protected]>
2 parents 5924b3f + 5e32ef3 commit c740031

213 files changed

Lines changed: 6322 additions & 505 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/renovate.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,13 @@
7272
"groupName": "container image & action digests",
7373
"schedule": ["before 6am on monday"]
7474
},
75+
{
76+
"description": "The Harbor rebuilds reproduce one upstream release, so their build bases follow upstream's Makefile at that tag (GOBUILDIMAGE, NODEBUILDIMAGE) rather than the newest image. A golang tag bump builds Harbor with a toolchain upstream never shipped it with, and a node major breaks the Angular portal build. Tag bumps are disabled here; digest refreshes of the same tag still arrive through the digest group above. Move the tags by hand with HARBOR_VERSION.",
77+
"matchManagers": ["dockerfile"],
78+
"matchFileNames": ["packages/system/harbor/images/**"],
79+
"matchUpdateTypes": ["major", "minor", "patch"],
80+
"enabled": false
81+
},
7582
{
7683
"description": "kubevirt.io/csi-driver is pinned to an untagged pseudo-version commit and publishes no release tags, so Renovate's go datasource returns no-result and the lookup failure lingers on the Dependency Dashboard. Disable it; this module is advanced deliberately alongside the kubevirt-csi-driver image build.",
7784
"matchManagers": ["gomod"],

‎.github/workflows/build-main.yaml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,17 @@ jobs:
6161
persist-credentials: false
6262

6363
# Ephemeral runners lack the flux CLI the installer's image-packages step
64-
# shells out to; install if absent (idempotent).
64+
# shells out to; install the pinned version when it is not already present.
6565
- name: Set up build toolchain
66+
env:
67+
FLUX_VERSION: "2.8.6"
6668
run: |
67-
command -v flux >/dev/null \
68-
|| curl -fsSL https://fluxcd.io/install.sh | sudo bash
69+
if ! flux version --client 2>/dev/null | grep -Fqx "flux: v${FLUX_VERSION}"; then
70+
install_script="$(mktemp)"
71+
curl -fsSL https://fluxcd.io/install.sh -o "$install_script"
72+
sudo env "FLUX_VERSION=$FLUX_VERSION" bash "$install_script"
73+
rm -f "$install_script"
74+
fi
6975
7076
- name: Set up Docker config
7177
run: |

‎.github/workflows/build-release.yaml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,17 @@ jobs:
107107
persist-credentials: false
108108

109109
# Ephemeral runners lack the flux CLI the installer's image-packages step
110-
# shells out to; install if absent (idempotent).
110+
# shells out to; install the pinned version when it is not already present.
111111
- name: Set up build toolchain
112+
env:
113+
FLUX_VERSION: "2.8.6"
112114
run: |
113-
command -v flux >/dev/null \
114-
|| curl -fsSL https://fluxcd.io/install.sh | sudo bash
115+
if ! flux version --client 2>/dev/null | grep -Fqx "flux: v${FLUX_VERSION}"; then
116+
install_script="$(mktemp)"
117+
curl -fsSL https://fluxcd.io/install.sh -o "$install_script"
118+
sudo env "FLUX_VERSION=$FLUX_VERSION" bash "$install_script"
119+
rm -f "$install_script"
120+
fi
115121
116122
- name: Set up Docker config
117123
run: |

‎.github/workflows/e2e-fork.yaml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -353,13 +353,13 @@ jobs:
353353
env:
354354
# Pin the flux CLI instead of install.sh's rolling latest. This is the
355355
# one privileged job that runs a remote installer as root right before
356-
# the OCIR token is loaded, so it pins where the rest of CI does not;
356+
# the OCIR token is loaded, where a pinned installer matters most;
357357
# keep it in step with the flux distro cozystack ships
358-
# (packages/system/fluxcd, 2.8.x).
358+
# (internal/fluxinstall/manifests/fluxcd.yaml, v2.8.0).
359359
FLUX_VERSION: "2.8.6"
360360
run: |
361361
command -v skopeo >/dev/null || { sudo apt-get update -qq && sudo apt-get install -y -qq skopeo; }
362-
if ! command -v flux >/dev/null; then
362+
if ! flux version --client 2>/dev/null | grep -Fqx "flux: v${FLUX_VERSION}"; then
363363
s="$(mktemp)"
364364
curl -fsSL https://fluxcd.io/install.sh -o "$s"
365365
sudo env "FLUX_VERSION=$FLUX_VERSION" bash "$s"
@@ -373,6 +373,11 @@ jobs:
373373
ref: refs/pull/${{ needs.resolve.outputs.pr_number }}/merge
374374
fetch-depth: 0
375375
persist-credentials: false
376+
# checkout v4.4.0 and later refuse a fork's code under workflow_run
377+
# without this opt-in. The boundary is the one the header describes:
378+
# no fork-authored script runs in `publish`, and `e2e` holds no push
379+
# token.
380+
allow-unsafe-pr-checkout: true
376381
# Guard against a TOCTOU race: the status is stamped on the SHA `resolve`
377382
# saw, but refs/pull/N/merge tracks the live PR head. If the fork pushed
378383
# again between resolve and here, HEAD^2 (the merge ref's PR-head parent)
@@ -566,6 +571,7 @@ jobs:
566571
ref: refs/pull/${{ needs.resolve.outputs.pr_number }}/merge
567572
fetch-depth: 0
568573
persist-credentials: false
574+
allow-unsafe-pr-checkout: true
569575
# Same TOCTOU guard as `publish`: refuse to test a merge ref that moved off
570576
# the SHA the status is stamped on (see the publish job for the rationale).
571577
- name: Assert checkout matches resolved head SHA

‎.github/workflows/nightly.yaml‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,16 @@ jobs:
5353
packages_digest: ${{ steps.publish.outputs.packages_digest }}
5454
steps:
5555
- name: Set up toolchain (skopeo, flux, yq, helm)
56+
env:
57+
FLUX_VERSION: "2.8.6"
5658
run: |
5759
command -v skopeo >/dev/null || { sudo apt-get update -qq && sudo apt-get install -y -qq skopeo; }
58-
command -v flux >/dev/null || curl -fsSL https://fluxcd.io/install.sh | sudo bash
60+
if ! flux version --client 2>/dev/null | grep -Fqx "flux: v${FLUX_VERSION}"; then
61+
install_script="$(mktemp)"
62+
curl -fsSL https://fluxcd.io/install.sh -o "$install_script"
63+
sudo env "FLUX_VERSION=$FLUX_VERSION" bash "$install_script"
64+
rm -f "$install_script"
65+
fi
5966
command -v yq >/dev/null || { sudo curl -sSL -o /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 && sudo chmod +x /usr/local/bin/yq; }
6067
command -v helm >/dev/null || curl -fsSL https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
6168
@@ -201,6 +208,9 @@ jobs:
201208
# rebuild of any cozystack image.
202209
- name: Build nocloud disk
203210
run: make -C packages/core/talos talos-nocloud
211+
env:
212+
# The e2e sandbox boots amd64 only.
213+
PLATFORM: linux/amd64
204214
- name: Publish disk to GHCR
205215
env:
206216
VERSION: ${{ needs.mirror.outputs.version }}
@@ -241,8 +251,15 @@ jobs:
241251
fetch-depth: 1
242252
persist-credentials: false
243253
- name: Set up toolchain (flux, oras)
254+
env:
255+
FLUX_VERSION: "2.8.6"
244256
run: |
245-
command -v flux >/dev/null || curl -fsSL https://fluxcd.io/install.sh | sudo bash
257+
if ! flux version --client 2>/dev/null | grep -Fqx "flux: v${FLUX_VERSION}"; then
258+
install_script="$(mktemp)"
259+
curl -fsSL https://fluxcd.io/install.sh -o "$install_script"
260+
sudo env "FLUX_VERSION=$FLUX_VERSION" bash "$install_script"
261+
rm -f "$install_script"
262+
fi
246263
command -v oras >/dev/null || { curl -fsSL https://github.com/oras-project/oras/releases/download/v1.2.0/oras_1.2.0_linux_amd64.tar.gz | sudo tar -xz -C /usr/local/bin oras; }
247264
- name: Login to GHCR
248265
env:

‎.github/workflows/pull-requests.yaml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -353,13 +353,15 @@ jobs:
353353
fetch-depth: 0
354354
fetch-tags: true
355355
# installer is built in finalize, but some package image targets shell out
356-
# to flux; install it if absent (idempotent, cheap).
356+
# to flux; install the pinned version when it is not already present.
357357
- name: Set up build toolchain
358+
env:
359+
FLUX_VERSION: "2.8.6"
358360
run: |
359-
if ! command -v flux >/dev/null; then
361+
if ! flux version --client 2>/dev/null | grep -Fqx "flux: v${FLUX_VERSION}"; then
360362
install_script="$(mktemp)"
361363
curl -fsSL https://fluxcd.io/install.sh -o "$install_script"
362-
sudo bash "$install_script"
364+
sudo env "FLUX_VERSION=$FLUX_VERSION" bash "$install_script"
363365
rm -f "$install_script"
364366
fi
365367
- name: Set up Docker config
@@ -522,6 +524,10 @@ jobs:
522524
env:
523525
DOCKER_CONFIG: ${{ runner.temp }}/.docker
524526
BUILDER: ${{ steps.buildx.outputs.name }}
527+
# amd64 only, as in the build job. The arm64 installer needs no QEMU,
528+
# but nothing a PR runs boots it. matchbox still gets the arm64 kernel
529+
# and initramfs.
530+
PLATFORM: linux/amd64
525531
IMAGE_TAG: pr-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}
526532
PUBLISH_VERSIONED: '0'
527533
PUBLISH_FLOATING: '0'
@@ -578,11 +584,13 @@ jobs:
578584
fetch-depth: 0
579585
fetch-tags: true
580586
- name: Set up build toolchain
587+
env:
588+
FLUX_VERSION: "2.8.6"
581589
run: |
582-
if ! command -v flux >/dev/null; then
590+
if ! flux version --client 2>/dev/null | grep -Fqx "flux: v${FLUX_VERSION}"; then
583591
install_script="$(mktemp)"
584592
curl -fsSL https://fluxcd.io/install.sh -o "$install_script"
585-
sudo bash "$install_script"
593+
sudo env "FLUX_VERSION=$FLUX_VERSION" bash "$install_script"
586594
rm -f "$install_script"
587595
fi
588596
- name: Download patch fragments

‎.github/workflows/tags.yaml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,18 @@ jobs:
254254
persist-credentials: false
255255

256256
# Ephemeral runners lack the flux CLI the installer's image-packages step
257-
# shells out to; install if absent (idempotent).
257+
# shells out to; install the pinned version when it is not already present.
258258
- name: Set up build toolchain
259259
if: steps.check_release.outputs.release_exists == 'false'
260+
env:
261+
FLUX_VERSION: "2.8.6"
260262
run: |
261-
command -v flux >/dev/null \
262-
|| curl -fsSL https://fluxcd.io/install.sh | sudo bash
263+
if ! flux version --client 2>/dev/null | grep -Fqx "flux: v${FLUX_VERSION}"; then
264+
install_script="$(mktemp)"
265+
curl -fsSL https://fluxcd.io/install.sh -o "$install_script"
266+
sudo env "FLUX_VERSION=$FLUX_VERSION" bash "$install_script"
267+
rm -f "$install_script"
268+
fi
263269
264270
- name: Login to GHCR
265271
if: steps.check_release.outputs.release_exists == 'false'
@@ -291,6 +297,9 @@ jobs:
291297
run: |
292298
mkdir -p "${PUSHED_TAGS_LOG%/*}"
293299
make build
300+
# The arm64 assets published below install this image, and building
301+
# its arm64 half needs no QEMU, so it is pushed again as both arches.
302+
make -C packages/core/talos image-talos PLATFORM=linux/amd64,linux/arm64
294303
env:
295304
DOCKER_CONFIG: ${{ runner.temp }}/.docker
296305
# Cache manifests are registry-portable (oci-mediatypes=true) — read

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,10 @@ repos:
1313
files: ^(api/|pkg/apis/|pkg/generated/|internal/crdinstall/manifests/|packages/system/cozystack-controller/definitions/|packages/system/application-definition-crd/definition/|packages/system/backup-controller/definitions/|packages/system/backupstrategy-controller/definitions/|hack/update-codegen\.sh$|hack/boilerplate\.go\.txt$|Makefile$)
1414
pass_filenames: false
1515
- id: run-make-generate
16-
name: Run 'make generate' in all app directories
16+
name: Run 'make generate' in all package directories
1717
entry: |
1818
sh -c 'exec flock -x "$(git rev-parse --git-common-dir)/pre-commit.lock" "$@"' -- sh -c '
19-
for dir in ./packages/apps/*/ ./packages/extra/*/; do
20-
if [ -d "$dir" ]; then
21-
echo "Running make generate in $dir"
22-
make generate -C "$dir" || exit $?
23-
fi
24-
done
19+
hack/pre-commit-generate-packages.sh || exit $?
2520
git diff --color=always | cat
2621
'
2722
language: system

‎Makefile‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,22 @@ build: build-deps
1313
make -C packages/apps/mariadb image
1414
make -C packages/apps/clickhouse image
1515
make -C packages/apps/kubernetes image
16+
make -C packages/apps/vpn image
1617
make -C packages/system/cozystack-api image
1718
make -C packages/system/cozystack-controller image
1819
make -C packages/system/backup-controller image
1920
make -C packages/system/backupstrategy-controller image
2021
make -C packages/system/lineage-controller-webhook image
22+
make -C packages/system/migration-controller image
2123
make -C packages/system/flux-shard-operator image
24+
make -C packages/system/flux-plunger image
2225
make -C packages/system/cilium image
2326
make -C packages/system/linstor image
2427
make -C packages/system/linstor-gui image
2528
make -C packages/system/kubeovn image
2629
make -C packages/system/kubeovn-webhook image
2730
make -C packages/system/kubeovn-plunger image
31+
make -C packages/system/kilo image
2832
make -C packages/system/dashboard image
2933
make -C packages/system/metallb image
3034
make -C packages/system/talos-log-collector image
@@ -37,7 +41,10 @@ build: build-deps
3741
make -C packages/system/securitygroup-controller image
3842
make -C packages/system/grafana-operator image
3943
make -C packages/system/redis-operator image
44+
make -C packages/system/harbor image
45+
make -C packages/system/velero image
4046
make -C packages/system/opensearch-operator image
47+
make -C packages/system/keycloak-operator image
4148
make -C packages/core/testing image
4249
make -C packages/core/talos image
4350
make -C packages/core/platform image

‎api/apps/v1alpha1/tenant/types.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)