Commit Graph
7961 Commits
Author SHA1 Message Date
rohan47 f5bbc8c5c5 ceph: fix networkAttachmentConfig to be compatible with whereabouts cni
In the whereabouts config, the network range is determined by range
option unlike other cni plugins that use Subnet option.

Signed-off-by: rohan47 <rohgupta@redhat.com>
2020-08-05 21:17:13 +05:30
Sébastien Han 43b07ef9fb Merge pull request #5980 from leseb/fix-5976
ceph: fix unit test mock
2020-08-05 17:20:55 +02:00
Sébastien Han a039c94086 Merge pull request #5979 from anmolsachan/rgw_integration
ceph: added rgw poolPrefix on ceph external script output
2020-08-05 16:24:20 +02:00
Sébastien Han 7d7523a8a2 ceph: fix unit test mock
Mock the user creation otherwise the health check fails and panics.

Closes: https://github.com/rook/rook/issues/5976
Signed-off-by: Sébastien Han <seb@redhat.com>
2020-08-05 16:09:24 +02:00
Anmol Sachan 9dfd684ab5 ceph: added rgw poolPrefix on ceph external script output
RGW poolPrefix is required for the UI and alerting, to provide right information about the respective pool in external mode.

Signed-off-by: Anmol Sachan <anmol13694@gmail.com>
2020-08-05 19:35:33 +05:30
Sébastien Han dfc701805a Merge pull request #5873 from leseb/encryption-raw-mode
ceph: add encryption support for osd pvc
2020-08-05 13:34:59 +02:00
Takashi IIGUNI 18a28f7dee ceph: use fixed mon directory in ci
It's not necessary to use random string for mon directory.
In addition, current implementation leaves garbage under /var/lib/rook.

Signed-off-by: Takashi IIGUNI <iiguni.tks@gmail.com>
2020-08-05 09:04:34 +00:00
Sébastien Han 6c8f4e1ffc Merge pull request #5972 from tenzen-y/ci-fix-wrong-document-of-functions
ci: fix function comments
2020-08-05 10:19:03 +02:00
Sébastien Han 3c73e5f5d7 Merge pull request #5886 from alimaredia/wip-object-store-multisite-doc-fixes
ceph: minor fixes for multisite docs
2020-08-05 10:16:11 +02:00
tenzen-y 29087f8e41 ci: fix function comments
This commit will fix outdated function comments.

Signed-off-by: tenzen-y <toyonomajyutushi@yahoo.co.jp>
2020-08-05 08:08:53 +00:00
Sébastien Han 89b3225441 ceph: add encryption support for osd pvc
We can now encrypted OSD device that were provisioned via a storage
class using the PV interface.
The encryption works at the storageClassDeviceSets level, which means we
can have encrypted and non-encrypted sets.
Using the new key `encrypted` we can turn it on.

Signed-off-by: Sébastien Han <seb@redhat.com>
2020-08-05 10:06:11 +02:00
Sébastien Han af1e8c320a ceph: do not log an error if no clusters
If the list of cluster is empty there is no need to report an error in
the logs.

Signed-off-by: Sébastien Han <seb@redhat.com>
2020-08-05 10:05:51 +02:00
Sébastien Han ec8e749ef5 Merge pull request #5581 from cybozu-go/ceph-support-crypt-type-device-in-osd-on-pvc
ceph: support crypt type device in OSD on PVC
2020-08-05 09:42:30 +02:00
Travis Nielsen af22cec9f0 Merge pull request #5929 from travisn/upgrade-1.4-docs
ceph: Upgrade guide from v1.3 to v1.4
2020-08-04 23:50:29 -06:00
Travis Nielsen 5197864a01 Merge pull request #5969 from guni1192/ci-fix-os-version
ci: fix os version
2020-08-04 23:46:11 -06:00
Takashi IIGUNI 4553407f10 ci: fix os version
The OS version for CI environment is ubuntu 18.04 now.

Signed-off-by: Takashi IIGUNI <iiguni.tks@gmail.com>
2020-08-05 05:28:23 +00:00
Ali Maredia ba169fa167 ceph: fixes for multisite docs
Reformatting and fixes in ceph-object-multisite.md.
Also a minor fix in object-store crd docs.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2020-08-04 23:50:18 -04:00
Travis Nielsen 06c21954e1 ceph: labels are immutable for match selectors
The labels cannot be updated on a deployment match selector.
In v1.4 a new label was added for ceph_daemon_type that is intended
to be on the pod labels, but cannot be applied to the match selectors.
Therefore, we suppress any new labels that are added to the daemons.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2020-08-04 16:47:00 -06:00
Travis Nielsen 772b7990db ceph: updated clusterroles applied in upgrade test
In the upgrade integration test we need to mirror what we expect
users to do during the upgrade by applying the new clusterroles.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2020-08-04 16:04:07 -06:00
Travis Nielsen 2365885653 ceph: remove unnecessary aggregate clusterroles
The aggregate clusterrole were designed for the scenario where
the rules are not completely owned by one component. Since Rook
owns all of the RBAC for its components, the aggregate rules can
be removed and simplify certain issues around upgrades.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2020-08-04 15:47:18 -06:00
Travis Nielsen 14495d1e5a ceph: upgrade documentation for v1.4
The upgrade guide is now updated for upgrades from v1.3 to v1.4.
The v1.2 upgrade yamls are removed and the docs are cleaned up from
1.3 upgrade steps that are no longer necessary.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2020-08-04 15:47:18 -06:00
Travis Nielsen 586bafa236 Merge pull request #5963 from Madhu-1/fix-csidriver
ceph: create csidriver if kube version is >1.14
2020-08-04 10:35:35 -06:00
Madhu Rajanna 943f402216 ceph: create csidriver if kube version is >1.14
create csidriver object  if the kubernetes version
is greater than 1.14 modified the check to allow
Csidriver object creation if kubernetes major version
is greater than 1.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-08-04 20:46:28 +05:30
Jared Watts 4f9dcfd1f3 Merge pull request #5830 from prksu/design-nfs-provisioner
doc: design nfs provisioner controlled by operator
2020-08-04 16:57:21 +02:00
Travis Nielsen 0ff7c6e0ba Merge pull request #5961 from Madhu-1/fix-ext-doc
ceph: add expand secret to storageclass examples
2020-08-04 07:28:23 -06:00
Ahmad Nurus S f3352d44de docs: design nfs provisioner controlled by operator
Signed-off-by: Ahmad Nurus S <prksu.sh@gmail.com>
2020-08-04 17:54:21 +07:00
Madhu Rajanna 3ebeb5a7ca ceph: add expand secret to examples in md file
add CSI expand secret details in example storageclass
templates.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-08-04 11:13:11 +05:30
Travis Nielsen 34f7b2e4b7 Merge pull request #5950 from Madhu-1/cleanup
ceph: cleanup csi package
2020-08-03 16:16:44 -06:00
Satoru Takeuchi 88f4b9c148 ceph: support crypt type device in OSD on PVC
Ceph supported encrypted OSD in the following two ways.

- Encrypt OSD by Ceph itself
- Encrypt OSD by user

However, Rook supports only the first way. Let's support this way too.

With supporting this way, Rook can use variety of encryption methods.
For example, TPM can be used to manage encrypt key. In fact, I use TPM
as follows.

https://github.com/cybozu-go/sabakan/blob/57ff3ab560acb99d23aa8901c1018bf865f9ff4d/docs/disk_encryption.md#disk-encryption

Signed-off-by: UMEZAWA Takeshi <takeshi-umezawa@cybozu.co.jp>
Signed-off-by: morimoto-cybozu <kenji_morimoto@cybozu.co.jp>
Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
2020-08-03 21:17:06 +00:00
Madhu Rajanna dfce2b67d5 ceph: compare with major and minor kubernetes version
instead of skipping the checks based on the kubernetes
major version we need to check both major and minor
version of it.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-08-03 22:56:25 +05:30
Madhu Rajanna 4595f42bf5 ceph: remove unused file from csi
removed unused file from the csi folder

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-08-03 22:06:26 +05:30
Madhu Rajanna 29312743e1 ceph: remove unused variable
remove unused variable in spec.go

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-08-03 22:06:26 +05:30
Madhu Rajanna bf77614b66 ceph: log kubernetes version in spec
logging kubernetes version helps for
debugging the issue related to version miss
match.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-08-03 22:06:22 +05:30
Travis Nielsen f894ab48be Merge pull request #5946 from alexcpn/patch-1
Documentation improvement for Ceph External Cluster
2020-08-03 10:25:32 -06:00
Travis Nielsen 22da5e2994 Merge pull request #4676 from thotz/dashboard
ceph: enable/disable dashboard for rgw
2020-08-03 09:51:29 -06:00
Sébastien Han 00bcaa8328 Merge pull request #5949 from leseb/do-not-validate-pool-if-no-ep
ceph: do not validate rgw pool if no endpoint
2020-08-03 17:09:40 +02:00
Alex PunnenandSébastien Han de6a8c0782 ceph: docs
Added a StorageClass example for better document usability to test CephExternal cluster

Solves: None
Co-authored-by: Sébastien Han <seb@redhat.com>
Signed-off-by: Alex Punnen <alexcpn@gmail.com>
2020-08-03 20:03:32 +05:30
Sébastien Han aed084e44c Merge pull request #5931 from aruniiird/mds_pools_optional_in_external_script
ceph: Allowing ceph filesystem argument to be optional
2020-08-03 16:09:32 +02:00
Sébastien Han 9ebc006391 ceph: do not validate rgw pool if no endpoint
If no endpoint is specified, we don't need to validate the rgw pools.

Signed-off-by: Sébastien Han <seb@redhat.com>
2020-08-03 15:43:56 +02:00
Madhu Rajanna bb5bc927e0 ceph: correct the kubernetes version comparision
fixed the kubernetes version comparsion to
deploy provisioner as the statefulset.

if the kubernetes Major version is less than
1 or major  is 1 and minor is less than 14
deploy provisioner as statefulset

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-08-03 19:08:47 +05:30
Madhu Rajanna 1a5e9cb5dd ceph: rename resizer image variable
renamed resizer image variable as per
other variable names.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-08-03 19:07:45 +05:30
Madhu Rajanna 58b4c2d74d ceph: re-arrange import order in spec.go
re-arrange import order as per standard
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-08-03 19:04:46 +05:30
Jiffin Tony Thottan ec5f13318c ceph: enable/disable dashboard for rgw
Provide permission for dashboard to collect the object store metrics.

Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
2020-08-03 10:26:54 +05:30
Jiffin Tony Thottan 73b8a598d2 ceph: add support to create system user for createuser api
Currently this is no way to create user with system permission in objectstore.
Add support for the same

Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
2020-08-03 10:24:42 +05:30
Jiffin Tony Thottan ab607075da ceph: handles an user creation error if the store is missing
Currently if object store is missing user creation fails without throwing
any error. Here the access and secret key values will be checked post the
creation command

Signed-off-by: Jiffin Tony Thottan <thottanjiffin@gmail.com>
2020-08-03 10:24:34 +05:30
Blaine Gardner cb6881e401 Merge pull request #5909 from SUSE/ceph-add-daemon-type-label
ceph: add ceph_daemon_type label to Ceph daemon pods
2020-07-31 09:40:48 -06:00
Travis Nielsen 5c4bf31e99 Merge pull request #5935 from thotz/deleteOBCResourceLogError
ceph: use deleteOBCResourceLogError instead of deleteOBCResource
2020-07-31 07:25:30 -06:00
Jiffin Tony Thottan 091679cbeb ceph: use deleteOBCResourceLogError instead of deleteOBCResource
Signed-off-by: Jiffin Tony Thottan <thottanjiffin@gmail.com>
2020-07-31 15:41:35 +05:30
Jiffin Tony Thottan 59f1e8364e ceph: fix up deleteOBCResourceLogError
Signed-off-by: Jiffin Tony Thottan <thottanjiffin@gmail.com>
2020-07-31 15:41:31 +05:30
Arun Kumar Mohan cba605a930 ceph: provide storageclass-es if there are valid parameters
'ceph-rgw' storageclass will be provided only if 'rgw_endpoint' exists
'cephfs' storageclass will be provided only if ceph-fs and/or data-pool
parameters are valid.

Signed-off-by: Arun Kumar Mohan <amohan@redhat.com>
2020-07-31 11:13:36 +05:30