[internal] Bump drbd version to 9.2.12 (#213)

Signed-off-by: Pavel Karpov <[email protected]>

Author: krpsh123

.werf/consts.yaml

@@ -9,9 +9,9 @@
 
 # component versions
 {{- $versions := dict }}
-{{- $_ := set $versions "DRBD" "9.2.10" }}
-{{- $_ := set $versions "DRBD_REACTOR" "1.4.0" }}
-{{- $_ := set $versions "DRBD_UTILS" "9.28.0" }}
+{{- $_ := set $versions "DRBD" "9.2.12" }}
+{{- $_ := set $versions "DRBD_REACTOR" "1.8.0" }}
+{{- $_ := set $versions "DRBD_UTILS" "9.30.0" }}
 {{- $_ := set $versions "LINSTOR_AFFINITY_CONTROLLER" "0.3.0" }}
 {{- $_ := set $versions "LINSTOR_API_PY" "1.19.0" }}
 {{- $_ := set $versions "LINSTOR_CLIENT" "1.19.0" }}
@@ -30,7 +30,7 @@
 {{- $_ := set $versions "LINSTOR_WAIT_UNTIL" "0.2.1" }}
 {{- $_ := set $versions "SEMVER_TOOL" "3.4.0" }}
 {{- $_ := set $versions "SPAAS" "v0.1.5" }}
-{{- $_ := set $versions "THIN_SEND_RECV" "1.0.1" }}
+{{- $_ := set $versions "THIN_SEND_RECV" "1.1.3" }}
 
 {{- $_ := set $ "VERSIONS" $versions }}
 

images/drbd-reactor/werf.inc.yaml

@@ -5,15 +5,15 @@ from: {{ $.Root.BASE_ALT_P11 }}
 final: false
 
 git:
-  - url: https://github.com/LINBIT/drbd-utils
+  - url: {{ $.Root.SOURCE_REPO }}/LINBIT/drbd-utils
     add: /
     to: /drbd-utils
     tag: v{{ $.Versions.DRBD_UTILS }}
     stageDependencies:
       setup:
         - "**/*"
 
-  - url: https://github.com/LINBIT/thin-send-recv
+  - url: {{ $.Root.SOURCE_REPO }}/LINBIT/thin-send-recv
     add: /
     to: /thin-send-recv
     tag: v{{ $.Versions.THIN_SEND_RECV }}
@@ -28,9 +28,8 @@ shell:
       apt-get update \
       && apt-get -y install {{ $.Root.BUILD_PACKAGES }} flex clitest xsltproc locales libxml2 po4a bash-completion docbook-xsl udev asciidoctor libkeyutils-devel \
       && apt-get -y install ca-certificates \
-      && update-ca-trust \
-      && apt-get clean \
-      && rm -rf /var/lib/apt/lists/*
+      && update-ca-trust
+    - {{ $.Root.ALT_CLEANUP_CMD }}
   install:
     {{- $ctx := dict }}
     {{- include "utils:prepare-rpm-build" $ctx | nindent 2 }}
@@ -40,7 +39,7 @@ shell:
   setup:
     # clone drbd-utils git repo
     {{- $ctx := dict }}
-    {{- $_ := set $ctx "repo" "https://github.com/LINBIT/drbd-utils" }}
+    {{- $_ := set $ctx "repo" (printf "%s/LINBIT/drbd-utils" $.Root.SOURCE_REPO) }}
     {{- $_ := set $ctx "branch" (printf "v%s" $.Versions.DRBD_UTILS) }}
     {{- $_ := set $ctx "folder" "/drbd-utils" }}
     {{- include "utils:checkout-git" $ctx | nindent 2 }}
@@ -63,7 +62,7 @@ shell:
 
     # clone thin-send-recv git repo
     {{- $ctx := dict }}
-    {{- $_ := set $ctx "repo" "https://github.com/LINBIT/thin-send-recv" }}
+    {{- $_ := set $ctx "repo" (printf "%s/LINBIT/thin-send-recv" $.Root.SOURCE_REPO) }}
     {{- $_ := set $ctx "branch" (printf "v%s" $.Versions.THIN_SEND_RECV) }}
     {{- $_ := set $ctx "folder" "/thin-send-recv" }}
     {{- include "utils:checkout-git" $ctx | nindent 2 }}
@@ -77,11 +76,9 @@ shell:
     {{- include "utils:build-rpm-pkg" $ctx | nindent 2 }}
 
     - ls -la /
-    # drbd-9.28.0-1.x86_64.rpm
-    # drbd-utils-9.28.0-1.x86_64.rpm
-    # drbd-utils-debuginfo-9.28.0-1.x86_64.rpm
-    # thin-send-recv-1.0.1-1.x86_64.rpm
-    # thin-send-recv-debuginfo-1.0.1-1.x86_64.rpm
+    # drbd-9.30.0-1.x86_64.rpm
+    # drbd-utils-9.30.0-1.x86_64.rpm
+    # thin-send-recv-1.1.3-1.x86_64.rpm
 
 ---
 # build drbd-reactor .rpm packages
@@ -90,7 +87,7 @@ from: {{ $.Root.BASE_ALT_P11 }}
 final: false
 
 git:
-  - url: https://github.com/LINBIT/drbd-reactor
+  - url: {{ $.Root.SOURCE_REPO }}/LINBIT/drbd-reactor
     add: /
     to: /drbd-reactor
     tag: v{{ $.Versions.DRBD_REACTOR }}
@@ -107,15 +104,19 @@ shell:
       apt-get update \
       && apt-get -y install {{ $.Root.BUILD_PACKAGES }} rust-cargo bash-completion \
       && apt-get -y install ca-certificates \
-      && update-ca-trust \
-      && apt-get clean \
-      && rm -rf /var/lib/apt/lists/*
+      && update-ca-trust
+    - {{ $.Root.ALT_CLEANUP_CMD }}
+    - |
+      cargo install cargo-sbom \
+      && cargo sbom -V \
+      && mv ~/.cargo/bin/cargo-sbom /usr/local/bin/ \
+      && rm -rf ~/.cargo
   install:
     {{- $ctx := dict }}
     {{- include "utils:prepare-rpm-build" $ctx | nindent 2 }}
   setup:
     {{- $ctx := dict }}
-    {{- $_ := set $ctx "repo" "https://github.com/LINBIT/drbd-reactor" }}
+    {{- $_ := set $ctx "repo" (printf "%s/LINBIT/drbd-reactor" $.Root.SOURCE_REPO) }}
     {{- $_ := set $ctx "branch" (printf "v%s" $.Versions.DRBD_REACTOR) }}
     {{- $_ := set $ctx "folder" "/drbd-reactor" }}
     {{- include "utils:checkout-git" $ctx | nindent 2 }}
@@ -134,8 +135,7 @@ shell:
     {{- include "utils:build-rpm-pkg" $ctx | nindent 2 }}
 
     - ls -la /
-    # drbd-reactor-1.4.0-1.x86_64.rpm
-    # drbd-reactor-debuginfo-1.4.0-1.x86_64.rpm
+    # drbd-reactor-1.8.0-1.x86_64.rpm
 
 ---
 # main almost distroless image
@@ -163,19 +163,16 @@ shell:
     - export DEBIAN_FRONTEND=noninteractive
     - |
       apt-get update \
-      && apt-get -y install libkeyutils kmod sysklogd \
-      && apt-get clean
+      && apt-get -y install libkeyutils kmod sysklogd
+    - {{ $.Root.ALT_CLEANUP_CMD }}
   setup:
     - ls -la /packages
     - |
       for f in /packages/*.rpm; do
         echo "Install ${f}"
         rpm -ihv --nodeps --noscripts $f
       done
-
     - sed -i 's/usage-count yes;/usage-count no;/' /etc/drbd.d/global_common.conf
-    # cleanup
-    - rm -rf /var/lib/apt/lists/*
 
 docker:
   ENTRYPOINT: ["/usr/sbin/drbd-reactor"]

images/drbd/werf.inc.yaml

@@ -15,9 +15,8 @@ shell:
       apt-get update \
       && apt-get -y install {{ $.Root.BUILD_PACKAGES }} \
       && apt-get -y install ca-certificates \
-      && update-ca-trust \
-      && apt-get clean \
-      && rm -rf /var/lib/apt/lists/*
+      && update-ca-trust
+    - {{ $.Root.ALT_CLEANUP_CMD }}
     - git config --global user.email "[email protected]"
     - git config --global user.name "deckhouse"
   install:

images/linstor-server/werf.inc.yaml

@@ -44,9 +44,8 @@ shell:
       apt-get update \
       && apt-get -y install {{ $.Root.BUILD_PACKAGES }} java-11-openjdk-devel python3 wget unzip \
       && apt-get -y install ca-certificates \
-      && update-ca-trust \
-      && apt-get clean \
-      && rm -rf /var/lib/apt/lists/*
+      && update-ca-trust
+    - {{ $.Root.ALT_CLEANUP_CMD }}
   install:
     {{- $ctx := dict }}
     {{- include "utils:prepare-rpm-build" $ctx | nindent 2 }}
@@ -86,7 +85,6 @@ shell:
     # linstor-common-1.24.2-1.noarch.rpm
     # linstor-controller-1.24.2-1.noarch.rpm
     # linstor-satellite-1.24.2-1.noarch.rpm
-# TODO: server артефакт вроде сбилдил, теперь нужно сбилдить все остальные
 ---
 image: {{ $.ImageName }}-client-artifact
 from: {{ $.Root.BASE_ALT_P11 }}
@@ -121,9 +119,8 @@ shell:
       apt-get update \
       && apt-get -y install {{ $.Root.BUILD_PACKAGES }} python3 wget unzip python3-module-setuptools help2man bash-completion docbook-xsl xsltproc \
       && apt-get -y install ca-certificates \
-      && update-ca-trust \
-      && apt-get clean \
-      && rm -rf /var/lib/apt/lists/*
+      && update-ca-trust
+    - {{ $.Root.ALT_CLEANUP_CMD }}
   install:
     {{- $ctx := dict }}
     {{- include "utils:prepare-rpm-build" $ctx | nindent 2 }}
@@ -362,8 +359,8 @@ shell:
       #    udev-rules-sgutils: Depends: /lib/udev/rules.d
       #    zfs-utils: Depends: /lib/udev/rules.d
       #               Depends: udev
-      apt-get clean
-      rm -rf /var/lib/apt/lists/* /packages
+      rm -rf /packages
+    - {{ $.Root.ALT_CLEANUP_CMD }}
 
 docker:
   # controller: 3376/tcp 3377/tcp 3370/tcp 3371/tcp

images/spaas/werf.inc.yaml

@@ -43,9 +43,8 @@ shell:
       && apt-get -y install ca-certificates \
       && update-ca-trust \
       && update-alternatives --install /usr/bin/python python /usr/bin/python3 100 \
-      && ln -sf /proc/mounts /etc/mtab \
-      && apt-get clean \
-      && rm -rf /var/lib/apt/lists/*
+      && ln -sf /proc/mounts /etc/mtab
+    - {{ $.Root.ALT_CLEANUP_CMD }}
 
 docker:
   ENTRYPOINT: ["/{{ $.ImageName }}"]

openapi/values.yaml

@@ -15,7 +15,7 @@ properties:
     properties:
       drbdVersion:
         type: string
-        default: "9.2.10"
+        default: "9.2.12"
       dataNodesChecksum:
         type: string
         default: "default_data_nodes_checksum"
@@ -168,4 +168,4 @@ properties:
              x-examples: ["YjY0ZW5jX3N0cmluZwo="]
            ca:
              type: string
-             x-examples: ["YjY0ZW5jX3N0cmluZwo="]
+             x-examples: ["YjY0ZW5jX3N0cmluZwo="]