Commit Graph
9639 Commits
Author SHA1 Message Date
Travis Nielsen 9dea152bf7 Merge pull request #11893 from rook/mergify/bp/release-1.11/pr-11880
manifest: add missing quote (backport #11880)
2023-03-13 10:05:46 -06:00
Vincent Kling 28ba8ef839 manifest: add missing quote
Signed-off-by: Vincent Kling <v.kling@vinniict.nl>
(cherry picked from commit bd857cc5c5)
2023-03-13 15:20:17 +00:00
Travis Nielsen eb5b312f8e Merge pull request #11879 from rook/mergify/bp/release-1.11/pr-11859
csi: Update port to 3300 if msgr2 is required (backport #11859)
2023-03-10 15:35:48 -07:00
travisn 12d79edd1d csi: update port to 3300 if msgr2 is required
When msgr2 is required, ensure the mon endpoints passed to
the csi configmap are on port 3300. The mons will be
listening on both 6789 and 3300. Existing volumes can
continue using port 6789 while new volumes will use
port 3300.

Signed-off-by: travisn <tnielsen@redhat.com>
(cherry picked from commit 0484a3973f)
2023-03-10 21:51:55 +00:00
Travis Nielsen dadde56367 Merge pull request #11877 from rook/mergify/bp/release-1.11/pr-11864
core: add fsid to the additionalPrinterColumns on cephcluster custom resource (backport #11864)
2023-03-10 10:48:40 -07:00
Travis Nielsen 792d09b1fc Merge pull request #11868 from rook/mergify/bp/release-1.11/pr-11866
core: add missing labels in exporter deployment (backport #11866)
2023-03-10 10:43:33 -07:00
Travis Nielsen 5bcb73209d Merge pull request #11876 from rook/mergify/bp/release-1.11/pr-11872
ci: increase wait time for external cluster to be ready (backport #11872)
2023-03-10 10:42:02 -07:00
Travis Nielsen 20728c839b Merge pull request #11857 from rook/mergify/bp/release-1.11/pr-11814
docs: Clarify device class use on all pools (backport #11814)
2023-03-10 10:40:24 -07:00
xiaobaowen aa029cdbf4 core: add fsid to the additionalPrinterColumns on cephcluster custom resource
Signed-off-by: xiaobaowen <xiaobaowen@deeproute.ai>
(cherry picked from commit df95c1add0)
2023-03-10 14:55:07 +00:00
Rakshith R e6e48c6728 ci: increase wait time for external cluster to be ready
Signed-off-by: Rakshith R <rar@redhat.com>
(cherry picked from commit cc72697f2a)
2023-03-10 14:42:49 +00:00
avanthakkar f8b4a4e568 core: add missing labels in exporter deployment
Adding missing `ceph_daemon_id` & `rook_cluster` labels to the exporter deployment.
Signed-off-by: avanthakkar <avanjohn@gmail.com>
(cherry picked from commit e235e01fa1)
2023-03-09 17:26:43 +00:00
travisn 817e63823f docs: clarify device class use on all pools
If the device class property is specified on any pool,
it must be specified on all pools so the pg autoscaler
will remain healthy.

Signed-off-by: travisn <tnielsen@redhat.com>
(cherry picked from commit 38981f2649)
2023-03-08 19:20:28 +00:00
Travis Nielsen 233888e2f1 Merge pull request #11856 from rook/mergify/bp/release-1.11/pr-11749
Implement OSD encryption key rotation  (backport #11749)
2023-03-08 11:42:00 -07:00
Rakshith R f7c8cf3c93 ci: add test for key rotation
This commit adds test for key rotation.

Signed-off-by: Rakshith R <rar@redhat.com>
(cherry picked from commit b9fc9a643e)
2023-03-08 16:37:34 +00:00
Rakshith R 2e6ae0a958 docs: add documentation for encryption key rotation
Signed-off-by: Rakshith R <rar@redhat.com>
(cherry picked from commit 340dbe05b4)
2023-03-08 16:37:34 +00:00
Rakshith R 30692ca9c8 osd: add capability to reconcile key rotation cron jobs
This commits adds code to reconcile key rotation cron jobs.

Signed-off-by: Rakshith R <rar@redhat.com>
(cherry picked from commit f39a32fcdb)
2023-03-08 16:37:33 +00:00
Rakshith R 65007124ab osd: add util function to create key rotation cron job
This commit adds util function to create key rotation cron job
such as getKeyRotationContainer, getKeyRotationCronPodTemplateSpec
and makeKeyRotationCronJob.

Signed-off-by: Rakshith R <rar@redhat.com>
(cherry picked from commit ef38aea2a4)
2023-03-08 16:37:33 +00:00
Rakshith R 542906be28 osd: add rotate-key functionality to rook's key-management cmd
This commit adds functionality to be able to rotate
key encryption key of encrypted PVC backed OSDs.
Necessary changes such as adding update functionality
to kms and rbac changes are made as well.

Signed-off-by: Rakshith R <rar@redhat.com>
(cherry picked from commit 71e011f731)
2023-03-08 16:37:32 +00:00
Rakshith R 801c81555b osd: add support for updating secret for default KMS
This commit adds support for updating secret for default KMS.
This is required for encryption key rotation.

Signed-off-by: Rakshith R <rar@redhat.com>
(cherry picked from commit b41fdfbb62)
2023-03-08 16:37:32 +00:00
Rakshith R 2381bff45a osd: add util functions to support encryption key rotation
This commit adds util functions to support encryption key rotation
such as RemoveEncryptionKeySlot, AddEncryptionKey and
ensureEncryptionKey.

Signed-off-by: Rakshith R <rar@redhat.com>
(cherry picked from commit 973723cbdd)
2023-03-08 16:37:32 +00:00
Rakshith R 198de5a76d core: add KeyRotationSpec to cephcluster CR
This commit adds KeyRotationSpec to cephcluster CR
to support encryption key rotation feature.
If enabled Rook will create a cronjob for each
encrypted PVC based OSD with given schedule set
to rotate their respective key encryption key.

Signed-off-by: Rakshith R <rar@redhat.com>
(cherry picked from commit 46dd2eb5ff)
2023-03-08 16:37:31 +00:00
Travis Nielsen b2704316bd Merge pull request #11850 from travisn/release-1.11.1
build: Update release version to v1.11.1
v1.11.1
2023-03-07 15:44:36 -07:00
travisn 35b31f92aa build: update release version to v1.11.1
For the patch release the examples and docs are updated
to v1.11.1

Signed-off-by: travisn <tnielsen@redhat.com>
2023-03-07 15:07:28 -07:00
Travis Nielsen f6b3d53f5a Merge pull request #11849 from rook/mergify/bp/release-1.11/pr-11848
core: Add env var to exporter for ceph config (backport #11848)
2023-03-07 15:02:56 -07:00
Travis Nielsen 0640427e14 Merge pull request #11843 from rook/mergify/bp/release-1.11/pr-11842
monitoring: Remove alerts that don't apply to rook (backport #11842)
2023-03-07 14:37:18 -07:00
Travis Nielsen b264d9d34a Merge pull request #11847 from rook/mergify/bp/release-1.11/pr-11829
mgr: revert readiness probe and go back to the original sidecar HA implementation (backport #11829)
2023-03-07 14:36:27 -07:00
avanthakkar 6accfb6380 core: add env var to exporter for ceph config
The exporter requires the mon config and keyring.
Use the CEPH_ARGS env var to specify the config
instead of expecting a ceph.conf to be generated
by another component on the host path.

Co-Authored-By: Travis Nielsen <tnielsen@redhat.com>
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit b6013d9b11)
2023-03-07 21:22:17 +00:00
Redouane Kachach eaf09ad77a Revert "mgr: use k8s readiness probe to implement mgr HA"
This reverts commit dc76f81fea.

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 0ae7867dd1)
2023-03-07 18:28:25 +00:00
Redouane Kachach 9a3e5c4e94 Revert "mgr: remove mgr sidecar"
This reverts commit ff75ec96b7.

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 456a0c328c)
2023-03-07 18:28:25 +00:00
Redouane Kachach 4d56aca868 Revert "mgr: addressing review comments"
This reverts commit 9f37439a07.

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit adc79d4ee4)
2023-03-07 18:28:24 +00:00
Redouane Kachach 580a9ec5c3 Revert "ci: fix MultiClusterDeploySuite CI"
This reverts commit b464428978.

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 0c652d28e2)
2023-03-07 18:28:24 +00:00
Redouane Kachach f6fa004343 Revert "mgr: wait for the mgr pod to be running"
This reverts commit 4d1017f805.

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit c31832095d)
2023-03-07 18:28:24 +00:00
travisn f3de021b55 monitoring: remove alerts that don't apply to rook
When the alerts were updated from the ceph repo, the cephadm
alerts were removed, now we also remove two other alerts that
don't apply to rook clusters. The pool growth warning alert
and prometheus job missing alerts need to be removed
as also seen in https://github.com/rook/rook/pull/10109.

Signed-off-by: travisn <tnielsen@redhat.com>
(cherry picked from commit fd25eeecf1)
2023-03-06 23:34:31 +00:00
mergify[bot] 5864bf4e90 Merge pull request #11841 from rook/mergify/bp/release-1.11/pr-11822
Multi-cluster-mirroring CI test fix (backport #11822)
2023-03-06 21:39:37 +00:00
Travis Nielsen 3ddc7da267 Merge pull request #11830 from rook/mergify/bp/release-1.11/pr-11804
manifest: fix whitespace issues (backport #11804)
2023-03-06 14:27:24 -07:00
gauravsitlani 36ca16fce3 ci: fix fs multicluster mirroring
Signed-off-by: gauravsitlani <gauravsitlani@riseup.net>
(cherry picked from commit 88df0d8794)
2023-03-06 21:01:56 +00:00
Travis Nielsen b4d5ffbe3a Merge pull request #11838 from rook/mergify/bp/release-1.11/pr-11825
Fix documentation indentation (backport #11825)
2023-03-06 11:03:03 -07:00
AJ Schmidt 6c4507d7e4 docs: fix documentation indentation
It seems that this `deviceFilter` list item is indented too far.

This PR deindents it one level.

Signed-off-by: AJ Schmidt <ajs4392@gmail.com>
(cherry picked from commit da0ed4d21f)
2023-03-06 15:03:49 +00:00
gauravsitlani 5bea2695c8 manifest: fix whitespace issues
Signed-off-by: gauravsitlani <gauravsitlani@riseup.net>
(cherry picked from commit 75ec7bffc0)
2023-03-03 17:45:13 +00:00
Travis Nielsen d70d8ad608 Merge pull request #11813 from rook/mergify/bp/release-1.11/pr-11584
external: add realm support for external cluster (backport #11584)
2023-03-02 11:59:15 -07:00
Travis Nielsen 3250629791 Merge pull request #11816 from rook/mergify/bp/release-1.11/pr-11665
object: make OBC genUserID unique across clusters (backport #11665)
2023-03-02 11:57:52 -07:00
Travis Nielsen 4def787153 Merge pull request #11807 from rook/mergify/bp/release-1.11/pr-11797
ceph: add osd container ports only if mcs is enabled (backport #11797)
2023-03-02 11:56:37 -07:00
mergify[bot] c883571e83 Merge pull request #11824 from rook/mergify/bp/release-1.11/pr-11818
ci: Fix the multus integration test (backport #11818)
2023-03-02 16:28:40 +00:00
subhamkrai a0b696918d ci: fix multus ci
Signed-off-by: subhamkrai <srai@redhat.com>
(cherry picked from commit d983f3620e)
2023-03-02 15:52:49 +00:00
mergify[bot] d8111c9e28 Merge pull request #11812 from rook/mergify/bp/release-1.11/pr-11221
file: check if fs exists before checking dependencies (backport #11221)
2023-03-01 22:42:19 +00:00
Blaine Gardner 0ced2b6f84 object: make OBC genUserID unique across clusters
Rook's implementation of OBC's GenerateUserID could generate colliding
user IDs for multisite clusters where each site is configured with the
same namespace/name of CephObjectStore. Add the Ceph cluster FSID to the
generated name to ensure the names won't conflict for multiple sites.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
(cherry picked from commit 2733375ca4)
2023-03-01 22:29:44 +00:00
parth-gr 1344036419 external: add realm support for external cluster
if a cluster won't use the deafult realm and try to
execute the python script it will fail to vaildate rgw
as the rgw-admin-user would be created on default realm
So creating user in specific realm if the realm name is passed

Signed-off-by: parth-gr <paarora@redhat.com>
(cherry picked from commit 96ea7817f8)
2023-03-01 19:43:40 +00:00
zhucan 6f36d10a12 file: check if fs exists before checking dependencies
Signed-off-by: zhucan <zhucan.k8s@gmail.com>
(cherry picked from commit 46c2bef9bc)
2023-03-01 19:18:26 +00:00
mergify[bot] e34b77fa86 Merge pull request #11810 from rook/mergify/bp/release-1.11/pr-11808
docs: change old version hint in docs (backport #11808)
2023-03-01 17:43:44 +00:00
Alexander Trost ed2c6e3255 docs: change old version hint in docs
Resolves https://github.com/rook/rook.github.io/issues/144

Signed-off-by: Alexander Trost <galexrt@googlemail.com>
(cherry picked from commit a5131d7309)
2023-03-01 17:06:08 +00:00