diff --git a/.github/workflows/trivy_check.yaml b/.github/workflows/trivy_check.yaml index 18f89f79..b06b8963 100644 --- a/.github/workflows/trivy_check.yaml +++ b/.github/workflows/trivy_check.yaml @@ -45,7 +45,7 @@ jobs: - name: Prepare sub repo run: | - version="drbd-9.2.10" + version="drbd-9.2.11" git clone --depth 1 --branch $version https://github.com/LINBIT/drbd/ ./drbd version="v9.28.0" diff --git a/images/drbd/werf.inc.yaml b/images/drbd/werf.inc.yaml index f65487e2..066793c4 100644 --- a/images/drbd/werf.inc.yaml +++ b/images/drbd/werf.inc.yaml @@ -1,6 +1,6 @@ {{- $_ := set . "BASE_SCRATCH" "registry.deckhouse.io/base_images/scratch@sha256:b054705fcc9f2205777d80a558d920c0b4209efdc3163c22b5bfcb5dda1db5fc" }} {{- $_ := set . "BASE_ALPINE_DEV" "registry.deckhouse.io/base_images/dev-alpine:3.16.3@sha256:c706fa83cc129079e430480369a3f062b8178cac9ec89266ebab753a574aca8e" }} -{{- $version := "9.2.10" }} +{{- $version := "9.2.11" }} --- image: {{ $.ImageName }}-artifact diff --git a/images/spaas/Dockerfile b/images/spaas/Dockerfile index 30585ea0..c34e8745 100644 --- a/images/spaas/Dockerfile +++ b/images/spaas/Dockerfile @@ -5,7 +5,7 @@ FROM $BASE_GOLANG_BULLSEYE as builder ARG SPAAS_GITREPO=https://github.com/LINBIT/saas ARG SPAAS_COMMIT_REF=7bef2e7976a455550bce2533487c635f20390ccf ARG DRBD_GITREPO=https://github.com/LINBIT/drbd -ARG DRBD_VERSION=9.2.10 +ARG DRBD_VERSION=9.2.11 # Copy patches COPY ./patches /patches @@ -17,7 +17,7 @@ RUN git clone ${SPAAS_GITREPO} /usr/local/go/spaas \ && go build -o /spaas RUN apt-get update \ - && apt-get install -y make git \ + && apt-get install -y make git jq \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -37,6 +37,7 @@ RUN apt-get update \ coccinelle \ libpython3-dev \ vim \ + jq \ && update-alternatives --install /usr/bin/python python /usr/bin/python3 100 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ diff --git a/openapi/values.yaml b/openapi/values.yaml index 0ef9c3a0..803b82f1 100644 --- a/openapi/values.yaml +++ b/openapi/values.yaml @@ -15,7 +15,7 @@ properties: properties: drbdVersion: type: string - default: "9.2.10" + default: "9.2.11" dataNodesChecksum: type: string default: "default_data_nodes_checksum"