Commit Graph
9610 Commits
Author SHA1 Message Date
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
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
sp98 5cb72de8d0 osd: add container ports only if mcs is enabled
Add container ports for OSD container only when multi cluster service is
enabled in the cluster spec.

Signed-off-by: sp98 <sapillai@redhat.com>
(cherry picked from commit 12bbc9b1a8)
2023-03-01 16:30:18 +00:00
Travis Nielsen 5a1136c4cb Merge pull request #11794 from rook/mergify/bp/release-1.11/pr-11760
core: on crash pod ensure rook version label is not set (backport #11760)
2023-02-28 11:59:23 -07:00
Ben Gao 0cccf48a1f core: on crash pod ensure rook version label is not set
ceph crash pod gets rook version label added unintentionally, which is only for deployment label.
changes include:
1, make a copy of the labels for pod spec from deployment labels just before adding rook version label.
2, add unit test to make sure it works as designed.
This fix along with pr 11674 is to stop ceph daemons pod restarting unnecessarily after upgrading rook operator.

Signed-off-by: Ben Gao <bengao168@msn.com>
(cherry picked from commit ed6ed25257)
2023-02-28 18:25:38 +00:00
Travis Nielsen 4f465e7786 Merge pull request #11781 from travisn/release-1.11.0
build: Set the release version to v1.11.0
v1.11.0
2023-02-27 17:49:14 -07:00
travisn dc4995f090 build: set the release version to v1.11.0
For the new minor rook release we set the examples and documentation
to v1.11.0

Signed-off-by: travisn <tnielsen@redhat.com>
2023-02-27 16:37:21 -07:00
Travis Nielsen 19dd7a29ba Merge pull request #11779 from rook/mergify/bp/release-1.11/pr-11778
ci: Enable snyk flag not to build vcs (backport #11778)
2023-02-27 16:18:56 -07:00
travisn 0f51a42711 ci: enable snyk flag not to build vcs
The snyk check is failing because the -buildvcs flag
is defaulting to true. Let's disable this flag to
get the check passing.

Signed-off-by: travisn <tnielsen@redhat.com>
(cherry picked from commit 9197966ed4)
2023-02-27 23:16:43 +00:00
Travis Nielsen 46f1cf3325 Merge pull request #11776 from rook/mergify/bp/release-1.11/pr-11772
doc: use kubectl replace instead of apply for crd updates (backport #11772)
2023-02-27 15:28:21 -07:00
Blaine Gardner b0b02e8ba0 docs: use kubectl replace instead of apply for crd updates
'kubectl apply --server-side' still doesn't always update CRDs
correctly if a CRD is too big to have its last applied annotation. Use
'kubectl replace' instead.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
(cherry picked from commit 38f896ea30)
2023-02-27 22:04:18 +00:00
Travis Nielsen ef647485b4 Merge pull request #11774 from rook/mergify/bp/release-1.11/pr-11567
osd: handle device name change and device removel correctly (backport #11567)
2023-02-27 12:33:59 -07:00
Satoru Takeuchi 0e4103a51c osd: handle device name change and device removel correctly
If a kernel device name change happens and a block device file
in the OSD directory becomes dangling link, this OSD fails
to start continuously. This problem can be resolved by confirming
the validity of the device file and recreating it if necessary.

The original problem happened in host-based clusters. A similar
problem exists in PVC-based clusters. In this case, if a PV,
corresponds to an existing OSD, and points to a missing block
device file, the OSD pod fails to consume this PV. Although this
behavior is undesirable, I don't think this problem should be
handled in Rook. If doing so, we must re-create the existing PV.
Rook shouldn't do such work.

Closes: https://github.com/rook/rook/issues/10860

Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
(cherry picked from commit 3a44a394b5)
2023-02-27 18:55:21 +00:00
Travis Nielsen dd227e6cf5 Merge pull request #11771 from rook/mergify/bp/release-1.11/pr-11578
Support multi cluster service (backport #11578)
2023-02-27 11:38:52 -07:00
sp98 c69c5a16fd core: export mon and OSD services
Signed-off-by: sp98 <sapillai@redhat.com>
(cherry picked from commit 7292ac5927)
2023-02-27 10:23:43 -07:00
Travis Nielsen 946fbcf66e osd: create a service for each osd
The osd needs to bind to an ip that will allow both internal
and external access for rbd mirroring scenarios.
THe operator will create a service for each osd and
instruction the osd to bind to the pod ip while
publishing the clusterIP of the service as the
public IP.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
(cherry picked from commit 14e7225e0a18aff85ede1d476fcaddbbfbcbb732)
(cherry picked from commit d655c86b2f)
2023-02-27 16:50:55 +00:00
sp98 069f9b6732 core: multiClusterService API spec changes
Add API changes for export services to peer cluster

Signed-off-by: sp98 <sapillai@redhat.com>
(cherry picked from commit dd941de241)
2023-02-27 16:50:55 +00:00
Travis Nielsen 2ff87e20c1 Merge pull request #11758 from rook/mergify/bp/release-1.11/pr-11740
build: use Kube v1.26.1 API and in CI (backport #11740)
2023-02-27 08:05:00 -07:00
Travis Nielsen 18f87166d2 Merge pull request #11753 from rook/mergify/bp/release-1.11/pr-11745
test: Increase timeout waiting for ceph commands (backport #11745)
2023-02-24 15:13:46 -07:00
parth-gr 4c92a2e93a build: update k8s version to 1.26.1
Update the Kubernetes API version used to 1.26.1, and start testing
against Kubernetes version 1.26.1 in CI.

Co-authored-by: parth-gr <paarora@redhat.com>
Co-authored-by: Blaine Gardner <blaine.gardner@redhat.com>

Signed-off-by: parth-gr <paarora@redhat.com>
Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
(cherry picked from commit 69ae9569cd)
2023-02-24 22:13:45 +00:00
Blaine Gardner 85aa2f420b Merge pull request #11752 from rook/mergify/bp/release-1.11/pr-11747
build: allow building on Mac with Apple silicon (backport #11747)
2023-02-23 10:04:53 -07:00
Travis Nielsen 383ab899fe test: wait for rgw to stabilize before checking vault token
The rgw may take a few seconds to stabilize before
the token can be checked in the rgw pod. Wait a few
seconds for test stability

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
(cherry picked from commit bdbf5bc929)
2023-02-23 16:51:02 +00:00
Travis Nielsen e75d845014 test: print return value for intermittent failure
The canary tests sometimes have an intermittent failure
when processing the return value of a grep for the osds
to be running. Print some debug info to help track it
down.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
(cherry picked from commit 4c5163f843)
2023-02-23 16:51:01 +00:00
Travis Nielsen 3c85347ea5 test: increase timeout waiting for ceph commands
The test scripts were only waiting for a timeout of three
seconds for ceph commands, which was causing intermittent
failures in the CI. Now the timeout is increased to
ten seconds.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
(cherry picked from commit ff01722b0f)
2023-02-23 16:51:01 +00:00
Blaine Gardner ba32c5c301 build: allow building on Mac with Apple silicon
There are a couple minor changes needed to allow building Rook on Apple
silicon.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
(cherry picked from commit 442e6480bd)
2023-02-23 15:50:28 +00:00
Travis Nielsen fa4d97ea68 Merge pull request #11739 from rook/mergify/bp/release-1.11/pr-11738
csi: update cephcsi to v3.8.0 (backport #11738)
2023-02-22 09:38:13 -07:00
Madhu Rajanna 3d65f951d8 csi: update cephcsi to v3.8.0
updating the cephcsi image to v3.8.0
release and also removing support for
3.6.0 as its deprecated and not supported
any more.

More details at
https://github.com/ceph/ceph-csi/releases/tag/v3.8.0
and https://github.com/ceph/ceph-csi/tree/release-v3.8
\#ceph-csi-container-images-and-release-compatibility

fixes #11688

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
(cherry picked from commit b01180580c)
2023-02-22 15:30:15 +00:00
Travis Nielsen abc45c43a4 Merge pull request #11733 from rook/mergify/bp/release-1.11/pr-11716
object: update os user caps (backport #11716)
2023-02-22 07:15:41 -07:00
Travis Nielsen 149774b32d Merge pull request #11737 from rook/mergify/bp/release-1.11/pr-11661
mgr: remove legacy mgr HA logic and watch-active sidecar (backport #11661)
2023-02-22 07:14:44 -07:00
Redouane Kachach baa8a8988b mgr: addressing review comments
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 9f37439a07)
2023-02-22 05:20:01 +00:00
Redouane Kachach 0207134140 mgr: remove mgr sidecar
With the new mgr HA implementation (based on readiness probe) we
don't need the mgr sidecar (live-watch) anymore. This commit is
intended to remove all the related code.

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit ff75ec96b7)
2023-02-22 05:20:00 +00:00