mirror of
https://github.com/cozystack/cozystack.git
synced 2026-11-22 12:43:32 +09:00
pull-requests.yaml said the QEMU substrate "is not wired into any workflow now" and that prepare-cluster and hack/e2e-prepare-cluster.bats stay in the tree for a nightly lane that will carry the coverage. Both halves are wrong in the direction that costs the most: nightly.yaml and e2e-tag.yaml already run `make prepare-env`, which calls prepare-cluster, so anyone trusting that comment deletes live code and takes nightly and every release-candidate run with it. docs/agents/e2e-testing.md states it correctly, so the tree disagreed with itself. hack/e2e-platform-packages.sh said the lane replaces "only LINSTOR with an otherwise-identical Package". It replaces two, and the kubevirt-cdi one is not identical: it raises the importer memory limit from CDI's 600M to 4Gi and the request from 60M to 256Mi. The consequence belongs next to the override -- the merge-gating lane does not exercise the shipped CDI default, and whether a tenant worker disk imports at 600M is answered by the QEMU lanes, which take no override. Also drops the dead half of `resolve_assets`. It resolved nocloud-amd64.raw.xz and exported disk_id; the container lane boots no disk and nothing in this workflow reads that output any more, so all the lookup could still do was fail a release-labelled PR over an asset it does not use. The job stays -- e2e's release arm gates on its result -- and now proves what is still worth proving, that the draft release exists. e2e-tag.yaml keeps resolving the asset, because it consumes it. Signed-off-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com> Assisted-By: LLM
92 lines
2.7 KiB
Bash
Executable File
92 lines
2.7 KiB
Bash
Executable File
#!/bin/sh
|
|
set -eu
|
|
|
|
api_server_endpoint=${COZY_APISERVER_ENDPOINT:-https://192.168.123.10:6443}
|
|
linstor_drbd_enabled=${COZY_LINSTOR_DRBD_ENABLED:-true}
|
|
|
|
# Container-mode Talos shares the runner kernel and cannot load DRBD. Keep the
|
|
# normal package graph for QEMU, and let that lane replace two Packages instead:
|
|
# LINSTOR, otherwise identical with its logger sidecar disabled, and kubevirt-cdi,
|
|
# which is NOT identical -- it raises the importer memory limit from CDI's 600M
|
|
# to 4Gi and the request from 60M to 256Mi, for the reason stated above that
|
|
# override below.
|
|
#
|
|
# The consequence is worth stating where it is made: the merge-gating lane
|
|
# therefore does not exercise the shipped CDI default. Whether a tenant worker
|
|
# disk imports at 600M is answered by the QEMU lanes (nightly.yaml, e2e-tag.yaml),
|
|
# which take no override, and not here.
|
|
case "$linstor_drbd_enabled" in
|
|
true|false) ;;
|
|
*)
|
|
echo "COZY_LINSTOR_DRBD_ENABLED must be true or false, got: $linstor_drbd_enabled" >&2
|
|
exit 2
|
|
;;
|
|
esac
|
|
|
|
cat <<EOF
|
|
apiVersion: cozystack.io/v1alpha1
|
|
kind: Package
|
|
metadata:
|
|
name: cozystack.cozystack-platform
|
|
spec:
|
|
variant: isp-full
|
|
components:
|
|
platform:
|
|
values:
|
|
networking:
|
|
podCIDR: "10.244.0.0/16"
|
|
podGateway: "10.244.0.1"
|
|
serviceCIDR: "10.96.0.0/16"
|
|
joinCIDR: "100.64.0.0/16"
|
|
publishing:
|
|
host: "example.org"
|
|
apiServerEndpoint: "$api_server_endpoint"
|
|
bundles:
|
|
enabledPackages:
|
|
- cozystack.external-dns-application
|
|
EOF
|
|
|
|
if [ "$linstor_drbd_enabled" = false ]; then
|
|
cat <<'EOF'
|
|
disabledPackages:
|
|
- cozystack.linstor
|
|
- cozystack.kubevirt-cdi
|
|
---
|
|
apiVersion: cozystack.io/v1alpha1
|
|
kind: Package
|
|
metadata:
|
|
name: cozystack.linstor
|
|
spec:
|
|
variant: default
|
|
components:
|
|
linstor:
|
|
values:
|
|
drbd:
|
|
enabled: false
|
|
---
|
|
# CDI's own 600M ceiling was seen to OOM the decompress+convert of a tenant
|
|
# worker disk near 100% on this lane, after which CDI retries from scratch and
|
|
# the DataVolume cycles forever instead of failing. It is an override here and
|
|
# not a chart default because the same import completes at 600M on a QEMU-node
|
|
# cluster, so what has been shown to need the headroom is this substrate, not
|
|
# the product. Move it into packages/system/kubevirt-cdi/values.yaml the day it
|
|
# reproduces somewhere that is not a container lane.
|
|
apiVersion: cozystack.io/v1alpha1
|
|
kind: Package
|
|
metadata:
|
|
name: cozystack.kubevirt-cdi
|
|
spec:
|
|
variant: default
|
|
components:
|
|
kubevirt-cdi:
|
|
values:
|
|
importerResources:
|
|
requests:
|
|
cpu: 100m
|
|
memory: 256Mi
|
|
limits:
|
|
cpu: 750m
|
|
memory: 4Gi
|
|
EOF
|
|
fi
|