Commit Graph
13292 Commits
Author SHA1 Message Date
Blaine Gardner 02e2a3d2eb build: fix new sed line to work on mac
The POSIX spec for sed requires the flag -i to have a string specified.
`sed -i'' -e '<expression>'` is portable

The POSIX spec for sed also requires the insert "i" option to have
newlines. The following is portable:
```
sed -i'' -e '<line-num>i\
text'
```

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
2021-04-20 17:20:05 +02:00
Sébastien Han c9dfd43f35 ceph: remove rbd-mirror ceph config/key
After the peer is imported via a token, ceph internally stores the
information of the remote cluster. So the rbd-mirror daemon does not
need to have files (key and config) for the remote site.
This means lighter code for us, as well no more restarts for the
rbd-mirror daemon once a peer is added to the configuration.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-04-20 16:55:09 +02:00
Sébastien Han 1028cd41f9 Merge pull request #7623 from leseb/add-rbd-mirroring-ci
ci: add rbd-mirror integration test
2021-04-20 16:53:59 +02:00
Sébastien Han d35ddcbecc ceph: use v14 again
Since Rook 1.6 is using raw mode for simple OSD scenarios we can use v14
again without having issue with ceph-volume.

We keep the upgraade test with v14.2.12 since Rook 1.5 does not have the
raw code to deploy OSDs.

Closes: https://github.com/rook/rook/issues/7669
Signed-off-by: Sébastien Han <seb@redhat.com>
2021-04-20 16:51:46 +02:00
Travis Nielsen 56e7af3ee0 Merge pull request #7331 from thotz/healthcheckwhensslenabled
ceph: fix healthcheck in case ssl enabled for rgw
2021-04-20 08:32:17 -06:00
Sébastien Han 9a28e130b6 ci: add rbd-mirror integration test
Long due but finally there, the CI now test the block mirroring between
2 clusters.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-04-20 16:27:53 +02:00
Sébastien Han 77ddb71ed3 Merge pull request #7694 from leseb/mergify-auto-merge-1.6
bot: set the correct k8s version for mergify auto-merge on 1.6
2021-04-20 11:20:23 +02:00
Sébastien Han 05848dd34a bot: set the correct k8s version for mergify auto-merge on 1.6
In the release-1.6 branch, the k8s versions are different, we run
v1.20.2 where the master branch runs v1.21.0.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-04-20 11:07:11 +02:00
Jiffin Tony Thottan 70f94a2d3c ceph: removing serviceIP from bucketChecker struct
serviceIP is not used by the health bucket checker, hence removing it.

Signed-off-by: Jiffin Tony Thottan <thottanjiffin@gmail.com>
2021-04-20 14:24:11 +05:30
Jiffin Tony Thottan bcbe707bcb ceph: fix healthcheck incase ssl enabled for rgw
In case ssl enabled for RGW, bucket healthcheck won't work since access is denied from the server.
In that case configure S3 agent using "InsecureSkipVerify: true" option.

Fixes: 7288
Signed-off-by: Jiffin Tony Thottan <thottanjiffin@gmail.com>
2021-04-20 14:23:48 +05:30
Sébastien Han b14009c3fc Merge pull request #7356 from Rakshith-R/remove-host-net
ceph: option to enable/disable host networking in CSI pods
2021-04-20 10:39:49 +02:00
subhamkrai 9305f12ecf ci: make build not failing
currently, the build action is not failing if there
is/are any modified files after the build. this commit
will validate build with `git status` after `make build`
command will fail if any changed file found.

Signed-off-by: subhamkrai <srai@redhat.com>
2021-04-20 13:10:33 +05:30
Rakshith R f5a3f6fa71 ceph: add option to toggle host networking in csi plugin pods
As host networking is no longer necessary for CSI driver,
it will be disabled by default.
An option CSI_ENABLE_HOST_NETWORK is added to rook-ceph-operator-config
configmap and enableCSIHostNetwork in helm chart values.yaml to
enable/disable host network in CSI plugin pods.

Closes: #7203

Signed-off-by: Rakshith R <rar@redhat.com>
2021-04-20 12:57:09 +05:30
Sébastien Han 48978f9919 Merge pull request #7692 from leseb/reset-rnote
docs: reset the pending release notes
2021-04-20 09:20:38 +02:00
Sébastien Han 4c21e5b7c4 docs: reset the pending release notes
Since the v1.6 release is completed, reset the pending release notes
for v1.7.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-04-20 09:15:35 +02:00
Sébastien Han 96945a539e Merge pull request #7681 from leseb/fix-mds-flag-on-upgrade
ceph: always apply config flags for mds and rgw
2021-04-20 08:31:12 +02:00
Travis Nielsen ec9f1b57b4 Merge pull request #7683 from leseb/fix-crd-unknow-field
ceph: preserve volume claim template metadata in schema
2021-04-19 12:13:59 -06:00
Travis Nielsen 12c9fb1a80 Merge pull request #7595 from leseb/always-run-actios
ci: always run all the actions
2021-04-19 11:40:54 -06:00
Sébastien Han 21d6001ed2 ceph: preserve volume claim template metadata in schema
The schema generation was not generating the metadata properties
under the VolumeClaimTemplate type, resulting in the properties being
ignored by the api server. The preserve unknown fields tag was
not working recursively on the volumeClaimTemplates since the subtypes
were defined. Now we post-process the schema so we can preserve
the unknown fields for the volume claim templates metadata.

We now use 'yq' to hot-fix the CRDs, the only 'downside' is that 'yq'
will not preserve the existing formatting, this is a known problem:

https://github.com/mikefarah/yq/issues/465

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-04-19 19:03:13 +02:00
Sébastien Han 341aefc95d ceph: revert "ceph: preserve volume claim template metadata in schema"
This reverts commit a9fb9d20bb. During the
CSV generation we strip the description lines from the CRD spec, however
the 'sed' command relies on the 'descrition' section to operate. Next
commit will fix this.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-04-19 19:01:13 +02:00
Sébastien Han ca1cf6672e ceph: always apply config flags for mds and rgw
We now always set the config flags on reconcile. Previously we were
looking for non-existing rgw or mds which means that on upgrade we would
never set those flags. However, we want to set those flags on "old"
cluster that got upgraded.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-04-19 17:39:43 +02:00
Sébastien Han 6a33395c4a ci: separate PR and release/master branch push into different files
We now have a single file with all the integration test that will run
when code is pushed to a release branch or merged in master.

Also, we have separate files with integration tests that run on pull
requests against master or a release branch.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-04-19 12:43:31 +02:00
Sébastien Han 5a7f405010 ci: remove the build action
This action is not needed anymore since other actions build already.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-04-19 12:41:47 +02:00
Sébastien Han aecec6f870 ci: only run cassandra job on cassandra code
Only run the cassandra integration if the PR involves cassandra, has the
"cassandra" label on it.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-04-19 12:41:47 +02:00
Sébastien Han 8c95ac2880 bot: auto-label cassandra pull requests
Just like ceph if a PR title starts with "cassandra" let's add the
"cassandra" label to it.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-04-19 12:41:47 +02:00
Sébastien Han f4cfc7a03d Merge pull request #7678 from alrs/ceph-osd-imports
ceph: fix multiple imports
2021-04-19 10:25:58 +02:00
Lars Lehtonen bb323de403 ceph: fix multiple imports
This mops up the last of the multiple-imports within ceph-related
packages, in pkg/daemon/ceph/agent/flexvolume/manager/ceph and
pkg/daemon/ceph/osd.

Signed-off-by: Lars Lehtonen <lars.lehtonen@gmail.com>
2021-04-19 00:06:10 -07:00
Blaine Gardner d3b094710a Merge pull request #7663 from BlaineEXE/radosgw-admin-omap-message-info-to-debug
ceph: change radosgw-admin workaround log to debug
2021-04-16 14:19:11 -06:00
Travis Nielsen 157d342330 Merge pull request #7662 from travisn/pool-size-min
ceph: Allow pool replica min size 0 for EC pools
2021-04-16 13:40:34 -06:00
Travis Nielsen 9da066eb3f ceph: allow pool replica min size 0 for EC pools
In v1.6 EC pools are being disallowed by the schema since the minimum
is set to 1 on the replicated.size. We expect the replicated.size to be
0 if an EC pool is being created.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2021-04-16 12:53:07 -06:00
Blaine Gardner 8aef8b756d ceph: change radosgw-admin workaround log to debug
Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
2021-04-16 12:51:54 -06:00
Blaine Gardner 382775a61c Merge pull request #7664 from BlaineEXE/fix-unit-tests
test: do not allow go.test parallel dependencies
2021-04-16 12:51:05 -06:00
Blaine Gardner a818a01a13 test: do not allow go.test parallel dependencies
Dependencies for `make go.test` have to run in order, so call them
explicitly from the target rather than allowing them to be done in
parallel if `make -j` flag is used.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
2021-04-16 12:24:39 -06:00
Travis Nielsen 432e42e04a Merge pull request #7650 from BlaineEXE/go-mod-vendor-on-each-build
build: run 'go mod vendor' on each build
2021-04-15 16:32:19 -06:00
Blaine Gardner 37b31a7c5e build: run 'go mod vendor' on each build
CI fails on builds warning with the warning below

    [2021-04-15T14:15:28.461Z] go: inconsistent vendoring in /home/rook/go/src/github.com/rook/rook:
    [2021-04-15T14:15:28.461Z] 	github.com/jstemmer/go-junit-report@v0.9.1: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt

Fix this by running `go mod vendor` before each build.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
2021-04-15 16:11:59 -06:00
Travis Nielsen 711e16ff9f Merge pull request #7403 from bipuladh/add-sidecar
ceph: Add support for volume replication controller sidecar in Rook
2021-04-15 10:52:37 -06:00
bipuladh 7d5cc8d06b ceph: adds a container to support volume replication controller
this commit adds a new container inside of rbd-provisioner.

Signed-off-by: bipuladh <badhikar@redhat.com>
2021-04-15 21:39:26 +05:30
Travis Nielsen 78bfcacacd Merge pull request #7637 from Madhu-1/ceph-csi-release-3.3
ceph: update csi image to v3.3.0
2021-04-15 09:42:42 -06:00
Sébastien Han 9df2af573c Merge pull request #7630 from BlaineEXE/do-not-reconcile-on-keyring-secret-changes
ceph: redact secret info from reconcile diffs
2021-04-15 16:46:42 +02:00
Blaine Gardner 9d657f464c ceph: redact secret info from reconcile diffs
To avoid logging sensitive information, do not output diffs from secrets
when reconciling resources.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
2021-04-15 08:14:34 -06:00
Madhu Rajanna fd28e48664 ceph: update csi image to v3.3.0
as we are having v3.3.0 cephcsi latest release
updating the cephcsi image to the same.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2021-04-15 19:36:31 +05:30
Travis Nielsen 4c02a344af Merge pull request #7552 from subhamkrai/dashboard
ceph: update ceph dashboard credential command
2021-04-15 07:49:02 -06:00
Sébastien Han 9416e52250 Merge pull request #7619 from leseb/add-vol-rep-crds
ceph: add volume replication crds
2021-04-15 15:15:02 +02:00
subhamkrai bc48dad19a ceph: update rgw ceph dashboard command
in the latest ceph releases, there are few
changes in accessing the rgw ceph dashboard
command. This commit updates the commands.

old commands
```
$ ceph dashboard set-rgw-api-access-key <access_key>
$ ceph dashboard set-rgw-api-secret-key <secret_key>
```
new commands
```
$ ceph dashboard set-rgw-api-access-key -i <file-containing-access-key>
$ ceph dashboard set-rgw-api-secret-key -i <file-containing-secret-key>
```

Signed-off-by: subhamkrai <srai@redhat.com>
2021-04-15 17:32:46 +05:30
subhamkrai 4eb08bb508 ceph: remove unnecessary use of formating
remove unnecessary use of formating.

Signed-off-by: subhamkrai <srai@redhat.com>
2021-04-15 17:32:46 +05:30
subhamkrai 30cc7c7eb6 ceph: update ceph dashboard credential command
in the latest ceph releases, there are
few changes in ceph commands to access
ceph dashboard. This commit update
ceph dashboard credentials command.

Older command
```
ceph dashboard set-login-credentials <username> <password>
```
New command
```
ceph dashboard ac-user-create <username> -i <file-containing-password> administrator
```

Signed-off-by: subhamkrai <srai@redhat.com>
2021-04-15 17:32:37 +05:30
Sébastien Han 83a44ae4df ceph: add volume replication crds
With the help of https://github.com/rook/rook/pull/7403/, rook will soon
integrate the volume replication controller as a side-car. Thus Rook
needs to inject the new CRDs.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-04-15 13:18:13 +02:00
Sébastien Han b6eea0cb33 Merge pull request #7622 from leseb/rgw-single-deployment
ceph: use replicaset instead of deployments for rgw instances
2021-04-15 09:43:55 +02:00
Sébastien Han 274447c539 ceph: add anti-affinity rules to rgw pods
Ensure in the default examples that gateways will run on different
nodes.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-04-15 08:53:00 +02:00
Travis Nielsen 76902a9775 Merge pull request #7601 from yanniszark/feature-fix-cassandra-integration-tests
cassandra: Fix flaky Cassandra integration tests
2021-04-14 22:23:23 -06:00