Commit Graph
7961 Commits
Author SHA1 Message Date
Sébastien Han 26b575c2c6 Merge pull request #6642 from subhamkrai/update-snapshotterVersion
ceph: update snapshotterVersion to v3.0.0
2020-11-16 11:35:13 +01:00
subhamkrai a2d3d1d8a4 ceph: update snapshotterVersion to v3.0.0
in the integration test we still use
snapshotteVersion v2.1.0 but it's expected to
use v3.0.0.

Signed-off-by: subhamkrai <srai@redhat.com>
2020-11-16 12:10:50 +05:30
Travis Nielsen 343be4342b Merge pull request #6633 from BlaineEXE/allow-fs-preserve-pools-on-delete
ceph: allow deprecated fs  preservePoolsOnDelete
2020-11-13 12:55:50 -07:00
Blaine Gardner 19a6dc7408 ceph: allow deprecated fs preservePoolsOnDelete
Allow filesystems with preservePoolsOnDelete to be used without errors.
A deprecation warning will still appear in the operator logs, but
existing cephfilesystem resources with preservePoolsOnDelete will still
be updated, and Rook will assume the new, preferred
preserveFilesystemOnDelete is set.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
2020-11-13 10:54:43 -07:00
Sébastien Han 841efd1d94 bot: auto-merge pull request under conditions
We now allow mergify to auto-merge pull requests against the master
branch under the following conditions:

* all CI tests passed
* the PR has no label 'do-not-merge'
* the PR has the label 'ready-to-merge'
* has been approved by at least one maintainer
* has not requested changes

Signed-off-by: Sébastien Han <seb@redhat.com>
2020-11-13 10:13:44 +01:00
Satoru Takeuchi 6403fe5e89 Merge pull request #6629 from travisn/upgrade-guide-1.5
docs: Minor updates to the 1.5 Ceph upgrade guide
2020-11-13 08:11:35 +09:00
Travis Nielsen eb2e022530 ceph: create custom resources separately from crds
The CRs must be created in a separate kubectl create command
from the creation of the CRDs, otherwise the create command
will fail.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2020-11-12 15:19:01 -07:00
Travis Nielsen 762f678ec8 docs: ceph upgrade guide refinements for v1.5
Some minor updates to the Ceph upgrade guide for the v1.5
release after final testing.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2020-11-12 15:17:58 -07:00
Travis Nielsen 10b8e3dcf8 Merge pull request #6627 from BlaineEXE/upgrade-manifests
docs: update ceph upgrade to use common.yaml
2020-11-12 14:29:32 -07:00
Blaine Gardner e9cd35f2b8 docs: update ceph upgrade to use common.yaml
Use common.yaml to apply changes to resources instead of keeping an
upgrade-*-apply.yaml file. Update the upgrade docs to reflect this also.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
2020-11-12 14:20:52 -07:00
Travis Nielsen 247fc0d2dd Merge pull request #6598 from cloudical-io/discovery_pod_labels
ceph: allow custom labels to be added to the discover daemonset
2020-11-12 14:15:00 -07:00
Travis Nielsen 98d96e6696 Merge pull request #6613 from BlaineEXE/fix-nfs-upgrade
ceph: fix nfs daemons not updating
2020-11-12 13:34:23 -07:00
Blaine Gardner 10f3cfe6ed Merge pull request #6623 from BlaineEXE/upgrade-docs
docs: revise Ceph upgrade docs for v1.5 release
2020-11-12 12:20:26 -07:00
Blaine Gardner 2a37a403ce docs: revise Ceph upgrade docs for v1.5 release
Update docs and manifests as needed for v1.5 release.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
2020-11-12 12:09:59 -07:00
Blaine Gardner 5fe80660dd ceph: fix nfs daemons not updating
The NFS reconciler was not updating NFS daemons that already existed.
The controller would fail to update daemons if the number of active
daemons did not increase or decrease.

Make sure existing NFS daemons are updated to new versions with all
scale up and scale down events.

Resolves #6611

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
2020-11-12 11:16:24 -07:00
Alexander Trost fa62f4ac5d ceph: allow custom labels to be added to the discover daemonset
Signed-off-by: Alexander Trost <galexrt@googlemail.com>
2020-11-12 16:20:01 +01:00
Travis Nielsen 3e7a7626db Merge pull request #6599 from cloudical-io/issue_6593
ceph: allow pod labels to be added to CSI components
2020-11-12 07:54:14 -07:00
Sébastien Han c886ed7fcb Merge pull request #6544 from varshar16/wip-update-ceph-nfs-config-name
ceph: Add 'ganesha-' to nfs-ganesha config object name
2020-11-12 15:08:57 +01:00
Varsha Rao 8fadaeeb09 ceph: add 'ganesha-' to nfs-ganesha config object name
Since ceph octopus version, the expected nfs-ganesha config object name by
mgr/volumes/nfs[1] plugin is "conf-nfs.ganesha-<clustername>". For older
versions the name is "conf-<clustername>.<nodeid>".

[1] https://github.com/ceph/ceph/blob/master/src/pybind/mgr/volumes/fs/nfs.py#L648-L655

Signed-off-by: Varsha Rao <varao@redhat.com>
2020-11-12 18:09:46 +05:30
Alexander Trost 34930020ab ceph: allow pod labels to be added to CSI components
This adds the functionality to add custom pod labels to the CSI
components through the operator configuration way of env vars or config
map.

Resolves #6593

Signed-off-by: Alexander Trost <galexrt@googlemail.com>
2020-11-12 13:06:24 +01:00
Sébastien Han 0c72601d31 Merge pull request #6595 from ml8mr/fix_crd_url
docs: link to master branch for ceph-csi-snapshot
2020-11-12 09:32:05 +01:00
Blaine Gardner 90ec68d9ff Merge pull request #6524 from LalitMaganti/master
ceph: associate newly created pools to existing filesystem
2020-11-11 16:15:13 -07:00
Blaine Gardner dd560f2305 Merge pull request #6610 from BlaineEXE/fix-rgw-deploy-version
ceph: fill in rgw deployment version
2020-11-11 16:12:51 -07:00
Travis Nielsen 91bd0ee3e9 Merge pull request #6556 from travisn/helm3-crd
ceph: Update helm version to 3.4
2020-11-11 16:01:23 -07:00
Lalit Maganti 1d1a9f111a ceph: associate newly created pools to existing filesystem
When new pools are added to an already existing filesystem, we would
create them but not actually associate them to the filesystem. Ensure
that we do this.

Also, while we're here, we refactor the CreateFilesystem test: before,
we were not properly testing creating the filesystem from scratch
because we would return valid JSON for *every* ceph command. Change this
by making the first run return an error so that we get some better
coverage.

After this, we also add a check for the correctness of adding new pools
to the CreateFilesystem unittest.

Fixes #5876

Signed-off-by: Lalit Maganti <lalitm@google.com>
2020-11-11 22:16:37 +00:00
Blaine Gardner 98d5c73d5e ceph: fill in rgw deployment version
The RGW deployment's ceph-version label should now display the same
version as the image it is using.

It previously displayed an empty version: 0.0.0-0.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
2020-11-11 15:13:31 -07:00
Pete Birley 152a05c85e ceph: update to helm 3 for the rook chart
This updates the chart to make use of helm3 which has been released
for some time, and also permits CRDs to be installed pror to other objects
allowing the chart to be deployed at the same time as CRs for rook objects.

Co-authored-by: Pete Birley <pete@port.direct>
Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2020-11-11 14:41:24 -07:00
Travis Nielsen bf1d3888f4 ceph: factor out CRDs from the common.yaml and helm chart
The CRDs need to be installed and updated separately from the
rest of the manifests. Helm charts also do not have a way to update
CRDs, therefore, any updates to the CRD schema must be done separately
from the helm chart. Now the CRDs are created in a new crd.yaml that must
be created along with common.yaml and before creating the operator.

The helm chart still contains the CRDs for initial creation, though
the helm chart will never update or remove them.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2020-11-11 12:16:20 -07:00
Travis Nielsen 61539b6699 Merge pull request #6559 from BlaineEXE/upgrade-test-1.5
ceph: upgrade test Rook only from v1.4 to master
2020-11-11 10:13:39 -07:00
Travis Nielsen 6142efe14b Merge pull request #6579 from subhamkrai/nfs-log
ceph: change nfs-ganesha log level
2020-11-11 10:09:52 -07:00
subhamkrai 7d1b5f7416 ceph: change nfs-ganesha log level
this commit allows changing the default
log level from nfs.yaml file by adding
new command.

Signed-off-by: subhamkrai <srai@redhat.com>
2020-11-11 20:34:07 +05:30
Travis Nielsen 6c19f1f63d Merge pull request #6490 from xiaods/issue-6460-fix
fix: issue#6460 remove helm2 section, upgrade helm3
2020-11-11 07:57:48 -07:00
Travis Nielsen 55770d4fc8 Merge pull request #6594 from cybozu-go/doc-ceph-clarify-when-operator-stop-orchestration
docs: clarify the meaning of cleanup policy of ceph cluster crd
2020-11-11 07:52:46 -07:00
Satoru Takeuchi 21cef906f7 docs: clarify the meaning of cleanup policy of ceph cluster crd
The description of cleanupPolicy is a bit ambiguous. First, we should clarify
that both skipping orchestration and data cleanup will happen iff
"yes-really-destroy-data" is set to `confirmation`. Second, We should also
describe wiping devices will happen even if user don't specify `sanitizeDisks`
explicitly.

Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
2020-11-11 05:15:41 +00:00
Blaine Gardner 2f034824cb ceph: upgrade test Rook only from v1.4 to master
Since Rook no longer supports legacy filestore devices, there is
no need to keep testing upgrades from v1.2 all the way to master.
We can now just test v1.4 to master.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
2020-11-10 15:44:05 -07:00
Blaine Gardner 6a1f49fa10 Merge pull request #6589 from travisn/disable-discovery
ceph: Disable the discovery daemon by default
2020-11-10 15:14:54 -07:00
Mike Latimer afd6c421bb docs: link to master branch for ceph-csi-snapshot
Due to upstream code motion, the current link to the upstream
ceph-csi-snapshot documentation no longer points to the correct
location of their CRDs. Fix this by just using the master branch.

Signed-off-by: Mike Latimer <mlatimer@suse.com>
2020-11-10 15:10:54 -07:00
Travis Nielsen b9f692a56e ceph: disable the discovery daemon by default
The discovery daemon is not needed in most scenarios, therefore we disable it
by default. More and more clusters are moving to the cluster-on-pvc scenario
which certainly does not need the local discovery. Even where clusters are not
running on PVCs, the discovery is not needed since the device discovery is again
performed in the osd prepare job.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2020-11-10 13:16:52 -07:00
Sébastien Han 969225c0c2 Merge pull request #6483 from cybozu-go/ceph-make-the-placement-of-admission-controller-configurable
ceph: make the placement of admission controller configurable
2020-11-09 14:32:02 +01:00
Satoru Takeuchi c7990777d2 ceph: make the placement of admission controller configurable
If users want to restrict the nodes where Ceph daemons should exist,
it's better to make the placement of admission controller configurable
as other daemons.

Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
2020-11-09 11:54:52 +00:00
Sébastien Han b72382f51e Merge pull request #6576 from terorie/patch-1
docs: better Ceph toolbox kubectl commands
2020-11-09 10:20:27 +01:00
Richard Patel 865c3b263e docs: better Ceph toolbox kubectl commands
Signed-off-by: Richard Patel <me@terorie.dev>
2020-11-08 03:38:48 +01:00
Travis Nielsen 6f13dd6559 Merge pull request #6574 from travisn/build-fixes-from-1.5
Integration test fixes for release branch to preserve in master
2020-11-06 12:58:30 -07:00
Satoru Takeuchi aa85577ff3 Merge pull request #6567 from gseidel/precise-three-nodes
docs: precise three nodes
2020-11-07 04:32:43 +09:00
Travis Nielsen f1287bdb19 ceph: skip csi tests on k8s 1.13
The csi tests require 1.14 or newer to run

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2020-11-06 11:16:32 -07:00
Travis Nielsen c029b1513d ceph: remove nullable attribute from pre-1.16 schema
The nullable attribute was causing the integration tests to fail
on 1.13 and earlier where it is not supported in the schema.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
(cherry picked from commit cc8f406ce9)
2020-11-06 10:47:26 -07:00
Travis Nielsen 556de488c0 nfs: skip running tests on older than k8s 1.14
NFS tests are not supported on older than K8s 1.14.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
(cherry picked from commit 4adc54e6f1)
2020-11-06 10:47:26 -07:00
Travis Nielsen cf9fdb683f Merge pull request #6564 from invidian/codespell-pipeline
ci: .github/workflows: add codespell pipeline
2020-11-06 09:25:21 -07:00
Gerhard Seidel 042e10bcf6 docs: precise three nodes
When following the quick start, it may not work, because the user don't know that he need three nodes. And three nodes may also not be correct, because the control plane is also a node. So we should precise what the user need to run his cluster correctly.

Closes: https://github.com/rook/rook/issues/6540
Signed-off-by: Gerhard Seidel <gseidel.message@googlemail.com>
2020-11-06 16:22:59 +01:00
Sébastien Han e3d032dbc1 Merge pull request #6489 from travisn/stretch-mons
ceph: Stretch cluster configuration
2020-11-06 15:16:39 +01:00