ceph: update to v20.2.1

Remove the  patch that added the systemd unit file for ceph-exporter,
since it has been merged into upstream ceph in this release.
cybozu/ceph@32cbe079c

Signed-off-by: Kyori Sakao <sakaok@cybozu.co.jp>

Author: molpako

ceph/Dockerfile

@@ -2,7 +2,7 @@ FROM ghcr.io/cybozu/ubuntu:22.04 AS build-ceph
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ENV DEBIAN_FRONTEND=noninteractive
-ENV CEPH_TAG=v19.2.1
+ENV CEPH_TAG=v20.2.1
 ENV WORKSPACE=/workspace
 
 RUN apt-get update && \
@@ -25,10 +25,6 @@ WORKDIR ${WORKSPACE}/ceph
 RUN ./install-deps.sh && \
     apt install --no-install-recommends -y python3-routes
 
-# Addition of debian pkg in ceph exporter was omitted in squid.
-# https://github.com/ceph/ceph/pull/56541
-RUN patch -p1 < ${WORKSPACE}/exporter.patch
-
 # This patch customizes the ceph rbd export-diff command. 
 RUN patch -p1 < ${WORKSPACE}/export-diff.patch
 

ceph/exporter.patch

@@ -19,7 +19,7 @@ spec:
       serviceAccountName: rook-ceph-default
       containers:
         - name: rook-ceph-tools
-          image: quay.io/ceph/ceph:v19.2.1
+          image: quay.io/ceph/ceph:v20.2.1
           command:
             - /bin/bash
             - -c

ceph/manifests/toolbox.yaml

@@ -161,7 +161,7 @@ spec:
             secretKeyRef:
               key: ceph-username
               name: rook-ceph-mon
-        image: quay.io/ceph/ceph:v19.2.1
+        image: quay.io/ceph/ceph:v20.2.1
         imagePullPolicy: IfNotPresent
         name: toolbox
         securityContext:

config/manager/manager.yaml

@@ -14,7 +14,7 @@ cephClusterSpec:
     count: 1
     allowMultiplePerNode: false
   cephVersion:
-    image: quay.io/ceph/ceph:v19.2.1
+    image: quay.io/ceph/ceph:v20.2.1
     allowUnsupported: false
   skipUpgradeChecks: false
   continueUpgradeAfterChecksEvenIfNotHealthy: false