Commit Graph
32 Commits
Author SHA1 Message Date
GanghyeonSeo 8801b25b2c external: unify variable quoting style in importClusterID
Standardized the quoting for variables inside the importClusterID function of import-external-cluster.sh to improve consistency

Signed-off-by: GanghyeonSeo <sgh000109@gmail.com>
2025-11-13 15:15:10 +09:00
GanghyeonSeo f9acdab146 external: fix quote parsing and message in import-external-cluster.sh
Fixed a syntax error caused by incorrect quotation parsing in the importClusterID function of import-external-cluster.sh, and updated the output message shown while waiting for the SubVolumeGroup CR to be created.

Signed-off-by: GanghyeonSeo <sgh000109@gmail.com>
2025-11-12 03:00:22 +09:00
Ruben Tsirunyan 4ab4cdc0de external: fixing a typo in import-external-cluster script
The value of userKey in CSI RBD provisioner secret was set to $CSI_RBD_PROVISIONER_SECRET_NAME because of a typo.
Fixed it by setting it to $CSI_RBD_PROVISIONER_SECRET.

Signed-off-by: Ruben Tsirunyan <rubentsirunyan@gmail.com>
2025-09-11 15:17:31 +04:00
Ruben Tsirunyan 2169a3e784 external: fixing secret values in import-external-cluster script
The import-external-cluster.sh script uses $CSI_CEPHFS_NODE_SECRET as the value of userKey when patching the secrets of RBD node, RBD provisioner, CephFS node and CephFS provisioner.
Updated the patch data to use $CSI_RBD_NODE_SECRET, $CSI_RBD_PROVISIONER_SECRET, $CSI_CEPHFS_NODE_SECRET, $CSI_CEPHFS_PROVISIONER_SECRET respectively.

Signed-off-by: Ruben Tsirunyan <rubentsirunyan@gmail.com>
2025-09-08 13:09:42 +04:00
Travis Nielsen 9f67ee1e20 Merge pull request #16289 from Madhu-1/fix-rbd-user
external: user userID and userKey for rbd
2025-08-12 11:25:15 -06:00
Madhu Rajanna db44ef3645 external: user userID and userKey for rbd
csi never used adminID and adminKey for the
rbd secrets, This currently looks to be a
bug where we are creating the secret with userID
and userKey but updating it with adminID and
adminKey, This commits update the script to
use userID and userKey for RBD secrets.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2025-08-12 09:55:35 +02:00
Madhu Rajanna cb89f351ed csi: update cephfs user and key in secret
cephCSI already deprecated the adminID and
adminKey keys in the secrets and to be backward
compatible it still supports the adminID and
adminKey but it logs the warning, updating the
secrets created by Rook to use userID and userKey
instead of adminID and adminKey.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2025-08-12 09:53:55 +02:00
parth-gr c592d36fc7 external: automate external users cephx key rotation
Ceph has a new ceph auth rotate command currently
present in ceph:main

Add a new flag `--cephx-key-rotate`  to rotate the
cephx keys genrated by external python script,
If we enable it, it will create a new user with suffix `.{x}`

Signed-off-by: parth-gr <partharora1010@gmail.com>
2025-07-24 14:41:51 +05:30
parth-gr 61de34a11d external: fix rados namespace sc name
Currently, the sc name is hardcoded,
in future if we support multiple rados
namespace per tenant we need a variable name
updating sc names to contain rados-namespace name
ocs pr: https://github.com/red-hat-storage/ocs-operator/pull/2955

Signed-off-by: parth-gr <partharora1010@gmail.com>
2025-01-08 19:46:56 +05:30
parth-gr cb30f66862 external: fix the output of user config
currently the output in the cm was not human readable
and can not easily used to create a config.ini file

Also for now removed the support of printing arg in upstream

Signed-off-by: parth-gr <partharora1010@gmail.com>
2024-07-22 22:23:57 +05:30
parth-gr 26cecb568a external: add final args used to the upgrade configmap
Recently we have introuced external-cluster-user-command cm
Which help user to look at the previous command run,
So with this PR we will add another data field arg
on this confimap which will have the final processed flags
that are being used
So user can use them directly either in config.ini or cmd line args

Signed-off-by: parth-gr <partharora1010@gmail.com>
2024-07-03 21:50:29 +05:30
parth-gr 951c683786 external: create a configmap for the command line args
user can look back to there configurations by
looking at the configmap created with command
line arguments
This will be useful for them during upgrades when they
need to re run the python script with the same flags

Signed-off-by: parth-gr <partharora1010@gmail.com>
2024-06-25 16:50:48 +05:30
smoshiur1237 dab17f72a1 external: restructure external cluster examples manifests
This PR will add separate directory to handle the external manifest. Here external manifests will have same namespace (rook-ceph) for external cluster.

Signed-off-by: smoshiur1237 <moshiur.rahman@est.tech>
2024-04-26 14:54:59 +03:00
parth-gr 58f96b6aee external: remove replicated 3 pool for the rbd sc
csi pr get merged ceph/ceph-csi#4459
so, This reverts commit 812a9c02b0.
The csi PR removes the dependency of the pool parameter from the
rbd storage class if the topology pools are passed,
so removing them in the examples and making it optional

Signed-off-by: parth-gr <partharora1010@gmail.com>
2024-03-27 21:48:48 +05:30
parth-gr 812a9c02b0 external: add replicated 3 pool for the rbd sc
till the csi pr get fix
https://github.com/ceph/ceph-csi/pull/4459
we can still make
use of topology by adding the replicated 3 pool
once the pr gets merged will revert this commit

Signed-off-by: parth-gr <partharora1010@gmail.com>
2024-03-11 12:47:41 +05:30
parth-gr 04b71cf63e external: add toplogyconstraintpool support for rbd storageclass
with topologyconstrain pool we can enable any
replica pool usage and also can store data at any
topology

Signed-off-by: parth-gr <partharora1010@gmail.com>
2024-03-11 12:47:41 +05:30
Tim Olow 7dcffae3f7 external: update import-external-cluster.sh
Removed = that was preventing the import-external-cluster.sh script from
importing external ceph cluster into k8s.

Fixes https://github.com/rook/rook/issues/13679

Signed-off-by: Tim Olow <tim@eth0.com>
2024-02-16 15:50:51 +00:00
Raghavendra Talur cb702d3d52 external: allow specifying the kubernetes context
If the import script is run on a system that has many kubernetes configs
in the kubeconfig file, it is useful to be able to specify the context
to use.

Signed-off-by: Raghavendra Talur <raghavendra.talur@gmail.com>
2024-02-06 12:52:02 -05:00
Madhu Rajanna c35a8532aa csi: option to customize csi driver name prefix
For now we are using the operator namespace name
as the prefix for the csi driver, This PR provides
an option for the users if someone wants to have
their own prefix for the csi driver, if someone tries
to change the prefix for existing csi driver rook
operator will fail to reconcile the csi driver.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2024-01-29 10:54:25 +01:00
parth-gr df7c401d35 external: add support for rados namespace for external cluster
change the json output of storageclass to also inclusde rados namespace,
and also added the changes in the csi secret

Signed-off-by: parth-gr <paarora@redhat.com>
2023-11-28 11:52:30 +05:30
Alexander Trost fcf52207f8 build: use /usr/bin/env to look up script interpreters
Signed-off-by: Alexander Trost <galexrt@googlemail.com>
2023-11-21 14:38:22 +01:00
parth-gr f9f880e528 external: create ceph cluster namespace
We need to create the namespace with the import script,
As per the documentation

The import script creates the secrets and
cm which is later used by the operator for cluster creation.

Signed-off-by: parth-gr <paarora@redhat.com>
2023-07-19 00:37:42 +05:30
mysiki b5d0d80444 external: fix import-external-cluster.sh and documentation
fix import-external-cluster.sh in order to work with set -e bash directive, see issue https://github.com/rook/rook/issues/12412
fix documentation mispell in namespace word

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

Signed-off-by: mysiki <hoaxboy@wanadoo.fr>
2023-07-05 13:01:44 +02:00
parth-gr 483c432b26 external: make import script idempotent
import script may be need a re-run if other
resources need to be configured
for ex: if rbd is configured and later on point
someone want to also configure rgw, it will have
a choice

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

Signed-off-by: parth-gr <paarora@redhat.com>
2023-06-28 19:09:42 +05:30
parth-gr e734911532 external: do not enforce rbd, cephfs and rgw flags for the external cluster
there might be a user who only wants to use rbd, so don't enforce them
to to create all the pools and pass the flags

Closes: https://github.com/rook/rook/issues/11846
Signed-off-by: parth-gr <paarora@redhat.com>
2023-04-05 17:21:04 +05:30
Matt 8bdabf85a8 external: pool and metadata ec pools were reversed in scripts
Pool and Metadata Pool Appear to be reversed.

dataPool needs to contain the EC Data pool
pool needs to contain the Metadata Pool
Closes: https://github.com/rook/rook/issues/11918

Signed-off-by: Matt P <dragon@fbdragon.co.uk>
2023-03-16 22:33:23 +00:00
Anthony D'Atri 10b398cc02 docs: add additional RBD image features to docs and YAML files
Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
2022-10-27 10:57:50 -06:00
parth-gr c1a16d300e external: fix cluster id naming in import-external-cluster script
Cluster_ID variable that we export from python script was different
from what we going to use in import script so changed it

Signed-off-by: parth-gr <paarora@redhat.com>
2022-08-05 17:30:39 +05:30
Ali, Akil 25265bc9c2 external: fix secrets naming
The secrets are being created with "rook-" prefix, but used without it.
Signed-off-by: Ali, Akil <ali-akil@gmx.de>
2022-07-14 16:55:45 +02:00
parth-gr c9a864ccdb external: add support for subvolumegroup and rados namespace
Using subvolume group and rados namespace for external deployment
was complicated and not documented,
Automating the process for the users, so they just need to pass
the respective names by cli flag for creation

Closes: rook#10427

Signed-off-by: parth-gr <paarora@redhat.com>
2022-06-28 21:57:54 +05:30
parth-gr b7c165b411 csi: make storage class updated with csi-users in external cluster
For using restricted auth users we need to update the
restricted users in the Storage class, so updating
it in the json output for external cluster

Signed-off-by: parth-gr <paarora@redhat.com>
2022-06-08 14:49:46 +05:30
Sébastien Han c890710b63 core: change directory layout
As per discussion, proposing a new layout for the charts/yaml/olm files.

./deploy
├── charts
│   ├── rook-ceph
│   │   └── templates
│   └── rook-ceph-cluster
│       └── templates
├── examples
│   ├── csi
│   │   ├── cephfs
│   │   └── rbd
│   ├── flex
│   ├── monitoring
│   ├── pre-k8s-1.16
└── olm
    └── assemble

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-11-30 09:12:53 +01:00