Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mgr/rook: Remove support for Rook older than v0.9 #27556

Merged
merged 1 commit into from Apr 16, 2019
Merged

mgr/rook: Remove support for Rook older than v0.9 #27556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/pybind/mgr/rook/module.py
View file
Open in desktop
Expand Up @@ -137,21 +137,21 @@ def wrapper(*args, **kwargs):
class RookEnv(object):
def __init__(self):
# POD_NAMESPACE already exist for Rook 0.9
pod_namespace = os.environ.get('POD_NAMESPACE', 'rook-ceph')
self.cluster_ns = os.environ.get('ROOK_CLUSTER_NS', pod_namespace)
self.namespace = os.environ.get('POD_NAMESPACE', 'rook-ceph')

# ROOK_CLUSTER_NAME was a previously used env var name.
rook_cluster_name = os.environ.get('ROOK_CLUSTER_NAME', pod_namespace)
# ROOK_CEPH_CLUSTER_CRD_NAME is new is Rook 1.0
self.cluster_name = os.environ.get('ROOK_CEPH_CLUSTER_CRD_NAME', rook_cluster_name)
self.cluster_name = os.environ.get('ROOK_CEPH_CLUSTER_CRD_NAME', self.namespace)

self.operator_ns = os.environ.get('ROOK_OPERATOR_NAMESPACE', "rook-ceph-system")
self.operator_namespace = os.environ.get('ROOK_OPERATOR_NAMESPACE', "rook-ceph-system")
self.crd_version = os.environ.get('ROOK_CEPH_CLUSTER_CRD_VERSION', 'v1')
self.api_name = "ceph.rook.io/" + self.crd_version

def api_version_match(self):
return self.crd_version == 'v1'

def has_namespace(self):
return 'POD_NAMESPACE' in os.environ


class RookOrchestrator(MgrModule, orchestrator.Orchestrator):
MODULE_OPTIONS = [
Expand Down Expand Up @@ -218,7 +218,7 @@ def can_run():
def available(self):
if not kubernetes_imported:
return False, "`kubernetes` python module not found"
elif not self._rook_env.cluster_ns:
elif not self._rook_env.has_namespace():
return False, "ceph-mgr not running in Rook cluster"

try:
Expand Down Expand Up @@ -445,7 +445,7 @@ def execute():
def is_complete():
# Find OSD pods on this host
pod_osd_ids = set()
pods = self._k8s.list_namespaced_pod(self._rook_env.cluster_ns,
pods = self._k8s.list_namespaced_pod(self._rook_env.namespace,
label_selector="rook_cluster={},app=rook-ceph-osd".format(self._rook_env.cluster_name),
field_selector="spec.nodeName={0}".format(
drive_group.hosts(all_hosts)[0]
Expand Down
12 changes: 6 additions & 6 deletions src/pybind/mgr/rook/rook_cluster.py
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@ def __init__(self, k8s, rook_env):

def rook_url(self, path):
prefix = "/apis/ceph.rook.io/%s/namespaces/%s/" % (
self.rook_env.crd_version, self.rook_env.cluster_ns)
self.rook_env.crd_version, self.rook_env.namespace)
return urljoin(prefix, path)

def rook_api_call(self, verb, path, **kwargs):
Expand Down Expand Up @@ -87,7 +87,7 @@ def get_discovered_devices(self, nodenames=None):

try:
result = self.k8s.list_namespaced_config_map(
self.rook_env.operator_ns,
self.rook_env.operator_namespace,
label_selector=label_selector)
except ApiException as e:
log.exception("Failed to fetch device metadata: {0}".format(e))
Expand Down Expand Up @@ -165,7 +165,7 @@ def describe_pods(self, service_type, service_id, nodename):
field_filter = "spec.nodeName={0}".format(nodename)

pods = self.k8s.list_namespaced_pod(
self.rook_env.cluster_ns,
self.rook_env.namespace,
label_selector=label_filter,
field_selector=field_filter)

Expand Down Expand Up @@ -208,7 +208,7 @@ def add_filesystem(self, spec):
"kind": "CephFilesystem",
"metadata": {
"name": spec.name,
"namespace": self.rook_env.cluster_ns
"namespace": self.rook_env.namespace
},
"spec": {
"onlyManageDaemons": True,
Expand All @@ -233,7 +233,7 @@ def add_nfsgw(self, spec):
"kind": "CephNFS",
"metadata": {
"name": spec.name,
"namespace": self.rook_env.cluster_ns
"namespace": self.rook_env.namespace
},
"spec": {
"rados": {
Expand All @@ -257,7 +257,7 @@ def add_objectstore(self, spec):
"kind": "CephObjectStore",
"metadata": {
"name": spec.name,
"namespace": self.rook_env.cluster_ns
"namespace": self.rook_env.namespace
},
"spec": {
"metaDataPool": {
Expand Down