Commit Graph
8196 Commits
Author SHA1 Message Date
Madhu Rajanna 08dadaa486 helm: add annotations and labels for VSC
add support to specify annotations and
labels for the volumesnapshotclass.

closes: #9655

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2022-01-27 13:26:10 +05:30
Sébastien Han 287d9a3fbe Merge pull request #9647 from rzarzynski/wip-extra-env-vars-2
osd: allow for injecting extra env. variables via ConfigMap
2022-01-26 17:27:19 +01:00
Radoslaw Zarzynski 17ca41f557 osd: allow for injecting extra env. variables via ConfigMap
This patch brings a mechanism to define arbitrary environment
variables in OSD containers (both prepare and main ones).
It bases on idea proposed by Sebastien Han to use an optional
`ConfigMap` instance named `aook-ceph-daemon-env-override`
as the source of these settings.

The need for the patch comes from the fact that, although
crimson finally exposes the same CLI interface as the classical
OSD, the broadly used development builds have ASan built in.
As ASan, by default, complains if it isn't the very first loaded
DSO, we need a way to set the `ASAN_OPTIONS` environment variable
to `verify_asan_link_order=0` to mitigate the early aborts.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2022-01-26 15:17:27 +00:00
Sébastien Han d6c8512c7e Merge pull request #9654 from leseb/nits
core: fix some nits
2022-01-26 16:06:51 +01:00
Sébastien Han 58c175de47 core: add a break line before printing the ceph config
It's easier to read the config if there is a new line before instead
having a truncated version like:

```
2022-01-26 06:39:41.421373 D | cephclient: config file @ /etc/ceph/ceph.conf: [global]
fsid                = 0650a1d5-d688-4575-97fc-7b3052a8a3dd
mon initial members = a
mon host            = [v2:10.104.192.209:3300,v1:10.104.192.209:6789]

[client.admin]
keyring = /var/lib/rook/rook-ceph/client.admin.keyring
```

Now we have:

```
2022-01-26 06:39:41.421373 D | cephclient: config file @ /etc/ceph/ceph.conf:
[global]
fsid                = 0650a1d5-d688-4575-97fc-7b3052a8a3dd
mon initial members = a
mon host            = [v2:10.104.192.209:3300,v1:10.104.192.209:6789]

[client.admin]
keyring = /var/lib/rook/rook-ceph/client.admin.keyring
```

Signed-off-by: Sébastien Han <seb@redhat.com>
2022-01-26 15:19:16 +01:00
Sébastien Han e31e4b49b0 core: print the stdout on errors
If we fail fetching the ceph version let's also print the stdout since
ceph tends to put the error here too.

Signed-off-by: Sébastien Han <seb@redhat.com>
2022-01-26 15:16:22 +01:00
Travis Nielsen 4ef7981b88 Merge pull request #9649 from travisn/check-application-pool
pool: Check for application already being set
2022-01-25 15:39:07 -07:00
Travis Nielsen e0cfb4fce6 pool: check for application already being set
If the pool application is already set, skip setting it again
to avoid a warning message being logged that it is already
set.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2022-01-25 15:05:18 -07:00
Travis Nielsen 8fd1f1afe0 Merge pull request #9642 from travisn/helm-lint
helm: Update CI to the latest helm and fix the linter
2022-01-24 16:46:59 -07:00
Travis Nielsen 50afb9f026 helm: update to the latest helm version v3.8
The CI was building with helm 3.6.2, now updating to
the latest v3.8.0

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2022-01-24 14:12:22 -07:00
Travis Nielsen b1a0918d0e helm: fix linter issue with end tag
Recent versions of helm are failing the linter on the end tag
if the tag is "{{- end -}}". Instead, the correct end tag
is "{{- end }}".

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2022-01-24 14:11:28 -07:00
Blaine Gardner 18c1397bcc Merge pull request #9565 from thotz/rgw-tls-cert-fix-bucket-notifications
rgw: inject tls certs for bucket notification and topic operations
2022-01-24 11:56:09 -07:00
Jiffin Tony Thottan a97747cece rgw: inject tls certs for bucket notification and topic operations
The certs for accessing TLS enabled RGW is saved as secrets and inject
them if controllers for notification and topics if request is sent to
TLS enabled RGW endpoint.

Signed-off-by: Jiffin Tony Thottan <thottanjiffin@gmail.com>
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
2022-01-24 22:39:57 +05:30
Sébastien Han 16f84677ce Merge pull request #9640 from Juneezee/refactor/t.TempDir
test: use `T.TempDir` to create temporary test directory
2022-01-24 17:59:58 +01:00
Eng Zer Jun ed63571530 test: use T.TempDir to create temporary test directory
The directory created by `T.TempDir()` and is automatically removed when
the test and all its subtests complete.

Reference: https://pkg.go.dev/testing#T.TempDir
Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
2022-01-24 23:52:54 +08:00
Sébastien Han 7169490c12 Merge pull request #9638 from leseb/fix-encryption-imb-daily-test
ci: fix daily encryption ibm kms test
2022-01-24 10:06:08 +01:00
Sébastien Han d99290ee81 ci: fix daily encryption ibm kms test
The secret is called secrets.IBM_INSTANCE_ID instead of
secrets.IBM_KP_INSTANCE_ID. Now the daily test should pass.

Signed-off-by: Sébastien Han <seb@redhat.com>
2022-01-24 09:25:57 +01:00
Travis Nielsen 48cbfb2932 Merge pull request #9627 from Madhu-1/csi-3.5.1
csi: update cephcsi to 3.5.1 release
2022-01-21 11:29:27 -07:00
Madhu Rajanna 39825f2302 csi: update cephcsi to 3.5.1 release
This PR updates the cephcsi version from
3.5.0 to 3.5.1 which includes minor fixes

fixes: #9619

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2022-01-21 23:26:07 +05:30
Travis Nielsen 4ad99d6533 Merge pull request #9603 from cybozu-go/fix-issue-9494
rgw: handle the non-existence of the bucket correctly when removing bucket
2022-01-21 09:55:44 -07:00
Travis Nielsen e5d35a32df Merge pull request #9615 from rook/ibm-kms-followup
osd: rename a few configuration flags
2022-01-21 07:26:38 -07:00
Travis Nielsen 6ff9e5330d Merge pull request #9626 from yati1998/cleanup
csi: updates the default csi-addons image
2022-01-21 07:17:04 -07:00
Travis Nielsen c2ee2591fa Merge pull request #9484 from leseb/subvolgr-csi-glue
csi: change rook-ceph-csi-config to expose clusterID for subvolume
2022-01-21 07:12:58 -07:00
yati1998 07c5fc7e46 csi: updates the default csi-addons image
This commit updates the csi-addons image version
from v0.1.0 to v0.2.1.
Also, this updates the staging path from
{{ .KubeletDirPath }}/plugins/kubernetes.io/csi/pv/ to
{{ .KubeletDirPath }}/plugins/kubernetes.io/csi/.

This changes is done as the reclaimspace on block mode
was not working.
For more details:
 https://github.com/csi-addons/kubernetes-csi-addons/pull/97

Signed-off-by: yati1998 <ypadia@redhat.com>
2022-01-21 17:09:59 +05:30
Yuma Ogami c4ee218da1 rgw: handle the non-existence of the bucket correctly when removing bucket
ceph might return NoSuchKey than NoSuchBucket when the target bucket does not exist.
then we can use GetBucketInfo() to judge the existence of the bucket.

see: https://github.com/ceph/ceph/pull/44413

Closes: https://github.com/rook/rook/issues/9494
Signed-off-by: Yuma Ogami <yuma-ogami@cybozu.co.jp>
2022-01-21 09:29:17 +00:00
Sébastien Han 802a86ccd5 ci: fix encryption test condition
For the "if" to work we need to bring the env in the step with the "env"
keyword. Otherwise, the env is never imported and the condition is
always false.

Signed-off-by: Sébastien Han <seb@redhat.com>
2022-01-21 10:23:21 +01:00
Sébastien Han 739abf6662 csi: change rook-ceph-csi-config to expose clusterID for subvolume
The rook-ceph-csi-config config map now includes CephFS subvolumegroups
when a subvolumegroup CR is created. It is useful for ceph-csi to
understand which subvolumegroup to use for a given cluster.

Signed-off-by: Sébastien Han <seb@redhat.com>
2022-01-21 10:12:56 +01:00
Travis Nielsen 08c3099b8c Merge pull request #9074 from travisn/helm-settings-configmap
helm: Apply operator settings in configmap instead of deployment
2022-01-20 15:37:55 -07:00
Travis Nielsen 741f211a13 helm: apply operator settings in configmap instead of deployment
Some operator settings can be applied dynamically in a configmap
instead of requiring the operator to restart. While these settings
may be infrequently updated, applying these settings in the configmap
can avoid an unnecessary operator restart. This will also make the
operator deployment more consistent with the non-helm install.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2022-01-20 14:41:28 -07:00
Sébastien Han 640d30339d subvolumegroup: fix code deletion
We want to log properly when ENOTEMPTY is caught during deletion, so
fixing the condition.

Signed-off-by: Sébastien Han <seb@redhat.com>
2022-01-20 18:16:41 +01:00
Sébastien Han 92ada52610 nfs: use hashing function from existing k8sutil package
We have a function to hash a string so let's use it.

Signed-off-by: Sébastien Han <seb@redhat.com>
2022-01-20 18:16:41 +01:00
Travis Nielsen 048190d010 Merge pull request #9613 from leseb/fix-9602
core: reconcile operator configuration with env var
2022-01-20 09:53:11 -07:00
Blaine Gardner 54a7e1e477 Merge pull request #9444 from cloudandheat/feature/swift-and-keystone
rgw: Design document for the Keystone and Swift integration
2022-01-20 09:20:58 -07:00
Sébastien Han 1208bc1410 core: reconcile operator configuration with env var
Previously, we were ignoring configuration changes coming from the
operator's pod env variables. We were assuming most users were using the
operator configmap "rook-ceph-operator-config" but most Helm users
don't. Now we will reconcile if a cephcluster is found during a CREATE
event (can be an operator restart or a cephcluster creation) AND no
"rook-ceph-operator-config" is found which means the operator's pod env
var are used.
Also, unit tests have been added (long due) for the predicate!

Closes: #9602, #9487, #9579
Signed-off-by: Sébastien Han <seb@redhat.com>
2022-01-20 16:13:11 +01:00
Sébastien Han 7cc6e23a0b osd: rename a few configuration flags
For better consistency with IBM_KP_SERVICE_API_KEY and use
"ibmkeyprotect" as a provider name for more clarity.

Signed-off-by: Sébastien Han <seb@redhat.com>
2022-01-20 16:01:26 +01:00
Blaine Gardner d0d83edc5f Merge pull request #9502 from cybozu-go/core-support-priority-class-for-crashcollector
core: support priority class for crashcollector
2022-01-19 10:38:29 -07:00
Travis Nielsen ece65ff144 Merge pull request #9586 from Madhu-1/helm-csi-vrc
csi: add support to create volumesnapshotclass
2022-01-19 09:59:57 -07:00
Madhu Rajanna 85dc212704 csi: add support to create volumesnapshotclass
add support for helm charts to create default
volumesnapshotclass for cephfs and rbd

fixes: #9566

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2022-01-19 21:51:28 +05:30
Travis Nielsen 49c7ff0612 Merge pull request #9547 from subhamkrai/annotation-on-resources
mon: add annotation to mon secret and cm
2022-01-19 07:51:05 -07:00
Sébastien Han fc1bbd7195 Merge pull request #9605 from yati1998/port
csi: restrict csiaddons to use only 1 port
2022-01-19 15:43:34 +01:00
Satoru Takeuchi 5465481e0b core: support priority class for crashcollector
Support priorityClass to crashcollectors as mons, mgrs, and osds.

https://rook.io/docs/rook/v1.8/ceph-cluster-crd.html#priority-class-names-configuration-settings

The main use case is applying the high priority to crashcollectors to preempt normal pods
under heavy load. Without this feature, we might lose crash information.

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

Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
2022-01-19 13:54:03 +00:00
yati1998 c559bbdf6b csi: restrict csiaddons to use only 1 port
This commit restrict csiaddons to open only 1 port
as per the requirement which is required for security.

Fixes: #9604

Signed-off-by: yati1998 <ypadia@redhat.com>
2022-01-19 12:07:46 +05:30
subhamkrai 02d43e82e0 mon: add annotation to mon secret and cm
add annotations to secrets and configmaps to use
different tools to sync secrets and configmap.
Currently, these annotation is applied only on
the `rook-ceph-mon-endpoints` configmap and
the secrets `rook-ceph-mon` and `rook-ceph-admin-keyring`.

Closes: https://github.com/rook/rook/issues/8999
Signed-off-by: subhamkrai <srai@redhat.com>
2022-01-19 10:15:17 +05:30
Sébastien Han c6ca35eea1 Merge pull request #9534 from yati1998/csi-addon
csi: implement csi-addons sidecar
2022-01-18 17:55:07 +01:00
Sébastien Han 46ef24b5c9 Merge pull request #9571 from parth-gr/external-cluster-osd-blocklist
csi: Add osd blocklist capabilities to the external cephcluster
2022-01-18 17:42:14 +01:00
yati1998 2b92dc812c csi: implement csi-addons sidecar
This commit implements the csi-addons sidecar.

Signed-off-by: yati1998 <ypadia@redhat.com>
2022-01-18 21:52:01 +05:30
Travis Nielsen bf5e329d8e Merge pull request #9596 from thotz/update-keda-latest-keda-vers
docs: update scaledobject.yaml for applicable with keda v2.5
2022-01-18 08:02:40 -07:00
Sébastien Han 7bfa320528 Merge pull request #9594 from leseb/fix-locale
build: set LC_ALL on the make target
2022-01-18 15:15:17 +01:00
Jiffin Tony Thottan e90c36f255 docs: update scaledobject.yaml for applicable with keda v2.5
Even though mention about keda 2.x version, the scaledObject.yaml or
rgw-keda.yaml referring to older keda CRs

Signed-off-by: Jiffin Tony Thottan <thottanjiffin@gmail.com>
2022-01-18 18:57:28 +05:30
parth-gr 7e851f15c6 csi: add osd blocklist capabilities to the external cephcluster
The CSI users created by the external script(both for rbd and cephfs)
need the blocklist capability so the CSI pods can execute the
`osd blocklist` commands for metro DR
update the mon caps of csi users with `profile simple-rados-client-with-blocklist`
so they have privileges to run osd blocklist cmds

Closes: https://issues.redhat.com/browse/RHSTOR-2451

Signed-off-by: parth-gr <paarora@redhat.com>
2022-01-18 18:01:01 +05:30