From 4473aaa7712a8e7cc572ccd621f420ff44aec264 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 7 Nov 2023 08:03:28 +0100 Subject: [PATCH 1/2] doc: update release notes for grpc metrics updating the PendingReleaseNotes.md to mark the grpc flag's removal. Signed-off-by: Madhu Rajanna --- PendingReleaseNotes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md index 05f489089c5..8a11ae3c880 100644 --- a/PendingReleaseNotes.md +++ b/PendingReleaseNotes.md @@ -2,4 +2,6 @@ ## Breaking Changes +- Removed the deprecated grpc metrics flag's in [PR](https://github.com/ceph/ceph-csi/pull/4225) + ## Features From a4e0c696a9f201ca7ed1459752d2d9c550d3df09 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 7 Nov 2023 10:44:35 +0100 Subject: [PATCH 2/2] build: disable ganesha package in Dockerfile disable ganesha as dnf update is failing on Reef ceph version. Signed-off-by: Madhu Rajanna --- scripts/Dockerfile.devel | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/Dockerfile.devel b/scripts/Dockerfile.devel index 99ad3114ca3..7e67ef57d8f 100644 --- a/scripts/Dockerfile.devel +++ b/scripts/Dockerfile.devel @@ -17,10 +17,11 @@ RUN source /build.env \ && mkdir -p /usr/local/go \ && curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-${GOARCH}.tar.gz | tar xzf - -C ${GOROOT} --strip-components=1 -# TODO: remove the following cmd, when issue -# https://github.com/ceph/ceph-container/issues/2034 is fixed. +# TODO: remove the following cmd, when issues +# https://github.com/ceph/ceph-container/issues/2034 +# https://github.com/ceph/ceph-container/issues/2141 are fixed. RUN dnf config-manager --disable \ - tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi || true + tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi,ganesha || true RUN dnf -y install \ git \