From db04b127b0ce0715f0996826dfa7e2d71e99f434 Mon Sep 17 00:00:00 2001 From: travisn Date: Mon, 24 Apr 2023 15:54:53 -0600 Subject: [PATCH] core: remove obsolete journal size config value The journal size was only applicable to the filestore OSD format which has not been supported by rook since v1.2. Remove the remaining obsolete setting from the examples and code. Signed-off-by: travisn --- deploy/charts/rook-ceph-cluster/values.yaml | 1 - deploy/examples/cluster.yaml | 19 +++++++++---------- pkg/apis/ceph.rook.io/v1/spec_test.go | 2 -- .../ceph/cluster/osd/config/config.go | 1 - tests/framework/installer/ceph_manifests.go | 1 - 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/deploy/charts/rook-ceph-cluster/values.yaml b/deploy/charts/rook-ceph-cluster/values.yaml index 97f206f7c..63b8d83cc 100644 --- a/deploy/charts/rook-ceph-cluster/values.yaml +++ b/deploy/charts/rook-ceph-cluster/values.yaml @@ -349,7 +349,6 @@ cephClusterSpec: # crushRoot: "custom-root" # specify a non-default root label for the CRUSH map # metadataDevice: "md0" # specify a non-rotational storage so ceph-volume will use it as block db device of bluestore. # databaseSizeMB: "1024" # uncomment if the disks are smaller than 100 GB - # journalSizeMB: "1024" # uncomment if the disks are 20 GB or smaller # osdsPerDevice: "1" # this value can be overridden at the node or device level # encryptedDevice: "true" # the default value for this option is "false" # # Individual nodes and their config can be specified as well, but 'useAllNodes' above must be set to false. Then, only the named diff --git a/deploy/examples/cluster.yaml b/deploy/examples/cluster.yaml index 6fb7701dd..ce2ca6c53 100644 --- a/deploy/examples/cluster.yaml +++ b/deploy/examples/cluster.yaml @@ -97,15 +97,15 @@ spec: # enable the Multus network provider #provider: multus #selectors: - # The selector keys are required to be `public` and `cluster`. - # Based on the configuration, the operator will do the following: - # 1. if only the `public` selector key is specified both public_network and cluster_network Ceph settings will listen on that interface - # 2. if both `public` and `cluster` selector keys are specified the first one will point to 'public_network' flag and the second one to 'cluster_network' - # - # In order to work, each selector value must match a NetworkAttachmentDefinition object in Multus - # - #public: public-conf --> NetworkAttachmentDefinition object name in Multus - #cluster: cluster-conf --> NetworkAttachmentDefinition object name in Multus + # The selector keys are required to be `public` and `cluster`. + # Based on the configuration, the operator will do the following: + # 1. if only the `public` selector key is specified both public_network and cluster_network Ceph settings will listen on that interface + # 2. if both `public` and `cluster` selector keys are specified the first one will point to 'public_network' flag and the second one to 'cluster_network' + # + # In order to work, each selector value must match a NetworkAttachmentDefinition object in Multus + # + # public: public-conf --> NetworkAttachmentDefinition object name in Multus + # cluster: cluster-conf --> NetworkAttachmentDefinition object name in Multus # Provide internet protocol version. IPv6, IPv4 or empty string are valid options. Empty string would mean IPv4 #ipFamily: "IPv6" # Ceph daemons to listen on both IPv4 and Ipv6 networks @@ -240,7 +240,6 @@ spec: # crushRoot: "custom-root" # specify a non-default root label for the CRUSH map # metadataDevice: "md0" # specify a non-rotational storage so ceph-volume will use it as block db device of bluestore. # databaseSizeMB: "1024" # uncomment if the disks are smaller than 100 GB - # journalSizeMB: "1024" # uncomment if the disks are 20 GB or smaller # osdsPerDevice: "1" # this value can be overridden at the node or device level # encryptedDevice: "true" # the default value for this option is "false" # Individual nodes and their config can be specified as well, but 'useAllNodes' above must be set to false. Then, only the named diff --git a/pkg/apis/ceph.rook.io/v1/spec_test.go b/pkg/apis/ceph.rook.io/v1/spec_test.go index 0c37fd789..3bbbe6142 100644 --- a/pkg/apis/ceph.rook.io/v1/spec_test.go +++ b/pkg/apis/ceph.rook.io/v1/spec_test.go @@ -40,7 +40,6 @@ storage: location: "region=us-west,datacenter=delmar" config: metadataDevice: "nvme01" - journalSizeMB: "1024" databaseSizeMB: "1024" nodes: - name: "node2" @@ -77,7 +76,6 @@ storage: }, Config: map[string]string{ "metadataDevice": "nvme01", - "journalSizeMB": "1024", "databaseSizeMB": "1024", }, Nodes: []Node{ diff --git a/pkg/operator/ceph/cluster/osd/config/config.go b/pkg/operator/ceph/cluster/osd/config/config.go index bae425afb..8b2f0bc1d 100644 --- a/pkg/operator/ceph/cluster/osd/config/config.go +++ b/pkg/operator/ceph/cluster/osd/config/config.go @@ -24,7 +24,6 @@ import ( const ( WalSizeMBKey = "walSizeMB" DatabaseSizeMBKey = "databaseSizeMB" - JournalSizeMBKey = "journalSizeMB" OSDsPerDeviceKey = "osdsPerDevice" EncryptedDeviceKey = "encryptedDevice" MetadataDeviceKey = "metadataDevice" diff --git a/tests/framework/installer/ceph_manifests.go b/tests/framework/installer/ceph_manifests.go index 9fcf77903..7fe9f5171 100644 --- a/tests/framework/installer/ceph_manifests.go +++ b/tests/framework/installer/ceph_manifests.go @@ -228,7 +228,6 @@ spec: deviceFilter: ` + getDeviceFilter() + ` config: databaseSizeMB: "1024" - journalSizeMB: "1024" ` } return clusterSpec + `