mirror of
https://github.com/cozystack/cozystack.git
synced 2026-11-08 21:14:56 +09:00
Aleksei Sviridkin
6ac13402a0
Rebuilds the cozystack piraeus-server image off linstor-server v1.33.3 (latest 1.33 patch) and the linstor-csi image off v1.11.2, both multi-arch, and pins the new digests in values.yaml. Picks up the published security fixes plus the upstream 1.33.3 DRBD fixes (clone status check, shrink trigger). linstor-csi v1.11.2 go.mod requires Go >= 1.26, which the csi builder image (golang:1.26) already satisfies. All five piraeus-server patches re-apply cleanly against v1.33.3 in the Dockerfile glob order, and both linstor-csi patches re-apply against v1.11.2. Verified on a dev cluster: a rolling restart of all satellites/controller/csi to 1.33.3 / v1.11.2 kept every node Online with zero faulty resources; a replicated PVC provisioned, mkfs'd, and reached UpToDate across 3 nodes with no DRBD "device held open" abort (the secondary-after-mkfs patch handled the path). The csi v1.11.2 "no RWX without DRBD layer" change is a no-op for cozystack, which always uses the DRBD layer. Adaptations: - Makefile: LINSTOR_VERSION 1.33.2 -> 1.33.3, LINSTOR_CSI_VERSION v1.10.6 -> v1.11.2; add test target - images/linstor-csi/Dockerfile: ARG VERSION v1.10.6 -> v1.11.2 - values.yaml: pin both rebuilt multi-arch image digests - tests/linstor_test.yaml: new helm-unittest image pins Assisted-By: Claude <noreply@anthropic.com> Signed-off-by: Aleksei Sviridkin <f@lex.la>
41 lines
1.4 KiB
Makefile
41 lines
1.4 KiB
Makefile
export NAME=linstor
|
|
export NAMESPACE=cozy-$(NAME)
|
|
|
|
include ../../../hack/common-envs.mk
|
|
include ../../../hack/package.mk
|
|
|
|
LINSTOR_VERSION ?= 1.33.3
|
|
LINSTOR_CSI_VERSION ?= v1.11.2
|
|
|
|
test:
|
|
helm unittest .
|
|
|
|
image: image-piraeus-server image-linstor-csi
|
|
|
|
image-piraeus-server:
|
|
docker buildx build images/piraeus-server \
|
|
--build-arg LINSTOR_VERSION=$(LINSTOR_VERSION) \
|
|
--build-arg K8S_AWAIT_ELECTION_VERSION=v0.4.2 \
|
|
$(call image-tags,piraeus-server,$(LINSTOR_VERSION)) \
|
|
$(call cache-args,piraeus-server) \
|
|
--metadata-file images/piraeus-server.json \
|
|
$(BUILDX_ARGS)
|
|
REPOSITORY="$(REGISTRY)/piraeus-server" \
|
|
yq -i '.piraeusServer.image.repository = strenv(REPOSITORY)' values.yaml
|
|
TAG="$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/piraeus-server.json -o json -r)" \
|
|
yq -i '.piraeusServer.image.tag = strenv(TAG)' values.yaml
|
|
rm -f images/piraeus-server.json
|
|
|
|
image-linstor-csi:
|
|
docker buildx build images/linstor-csi \
|
|
--build-arg VERSION=$(LINSTOR_CSI_VERSION) \
|
|
$(call image-tags,linstor-csi,$(LINSTOR_CSI_VERSION)) \
|
|
$(call cache-args,linstor-csi) \
|
|
--metadata-file images/linstor-csi.json \
|
|
$(BUILDX_ARGS)
|
|
REPOSITORY="$(REGISTRY)/linstor-csi" \
|
|
yq -i '.linstorCSI.image.repository = strenv(REPOSITORY)' values.yaml
|
|
TAG="$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/linstor-csi.json -o json -r)" \
|
|
yq -i '.linstorCSI.image.tag = strenv(TAG)' values.yaml
|
|
rm -f images/linstor-csi.json
|