Merge pull request #1262 from SanjalKatiyar/rook_external_script

Fetch external RHCS script from Rook CSV

packages/ocs/constants/common.ts

@@ -1,6 +1,5 @@
 export const PVC_PROVISIONER_ANNOTATION =
   'volume.beta.kubernetes.io/storage-provisioner';
-export const OCS_OPERATOR = 'ocs-operator';
 export const COMPRESSION_ON = 'aggressive';
 
 export enum POOL_STATE {

packages/ocs/dashboards/object-service/capacity-breakdown/capacity-breakdown-card.tsx

@@ -2,6 +2,7 @@ import * as React from 'react';
 import { useODFNamespaceSelector } from '@odf/core/redux';
 import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import { secretResource } from '@odf/core/resources';
+import { OCS_OPERATOR } from '@odf/shared/constants';
 import { BreakdownCardBody } from '@odf/shared/dashboards/breakdown-card/breakdown-body';
 import { LabelPadding } from '@odf/shared/dashboards/breakdown-card/breakdown-chart';
 import { getGroupedSelectOptions } from '@odf/shared/dashboards/breakdown-card/breakdown-dropdown';
@@ -28,11 +29,7 @@ import {
 import * as _ from 'lodash-es';
 import { useParams } from 'react-router-dom-v5-compat';
 import { Card, CardBody, CardHeader, CardTitle } from '@patternfly/react-core';
-import {
-  OCS_OPERATOR,
-  ServiceType,
-  CapacityBreakdown,
-} from '../../../constants';
+import { ServiceType, CapacityBreakdown } from '../../../constants';
 import { breakdownQueryMapMCG } from '../../../queries';
 import { ODFSystemParams } from '../../../types';
 import { decodeRGWPrefix, getStackChartStats } from '../../../utils';

packages/ocs/dashboards/object-service/data-consumption-card/data-consumption-card.tsx

@@ -3,14 +3,14 @@ import { useSafeK8sWatchResource } from '@odf/core/hooks';
 import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import { K8sResourceObj } from '@odf/core/types';
 import {
-  OCS_OPERATOR,
   Breakdown,
   DataConsumption,
   Metrics,
   ServiceType,
 } from '@odf/ocs/constants';
 import { DATA_CONSUMPTION_QUERIES } from '@odf/ocs/queries';
 import { getRangeVectorStats } from '@odf/shared/charts';
+import { OCS_OPERATOR } from '@odf/shared/constants';
 import { FieldLevelHelp } from '@odf/shared/generic/FieldLevelHelp';
 import {
   useCustomPrometheusPoll,

packages/ocs/dashboards/object-service/details-card/details-card.tsx

@@ -1,9 +1,8 @@
 import * as React from 'react';
-import { OCS_OPERATOR } from '@odf/core/constants';
 import { ODF_MODEL_FLAG } from '@odf/core/features';
 import { useODFNamespaceSelector } from '@odf/core/redux';
 import { useODFSystemFlagsSelector } from '@odf/core/redux';
-import { ODF_OPERATOR } from '@odf/shared/constants';
+import { ODF_OPERATOR, OCS_OPERATOR } from '@odf/shared/constants';
 import {
   useCustomPrometheusPoll,
   usePrometheusBasePath,

packages/ocs/dashboards/persistent-external/details-card.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { CEPH_BRAND_NAME, OCS_OPERATOR } from '@odf/core/constants';
+import { CEPH_BRAND_NAME } from '@odf/core/constants';
 import { ODF_MODEL_FLAG } from '@odf/core/features';
 import { useODFNamespaceSelector } from '@odf/core/redux';
 import { getStorageClusterInNs } from '@odf/core/utils';
-import { ODF_OPERATOR } from '@odf/shared/constants';
+import { ODF_OPERATOR, OCS_OPERATOR } from '@odf/shared/constants';
 import { useFetchCsv } from '@odf/shared/hooks/use-fetch-csv';
 import { SecretModel } from '@odf/shared/models';
 import { getName } from '@odf/shared/selectors';

packages/ocs/dashboards/persistent-internal/activity-card/activity-card.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import { getStorageClusterInNs } from '@odf/core/utils';
+import { OCS_OPERATOR } from '@odf/shared/constants';
 import {
   useCustomPrometheusPoll,
   usePrometheusBasePath,
@@ -30,7 +31,7 @@ import { EventKind } from '@openshift-console/dynamic-plugin-sdk/lib/api/interna
 import * as _ from 'lodash-es';
 import { useParams } from 'react-router-dom-v5-compat';
 import { Card, CardHeader, CardTitle, CardBody } from '@patternfly/react-core';
-import { OCS_OPERATOR, PVC_PROVISIONER_ANNOTATION } from '../../../constants';
+import { PVC_PROVISIONER_ANNOTATION } from '../../../constants';
 import { StorageClusterModel } from '../../../models';
 import {
   DATA_RESILIENCY_QUERY,

packages/odf/components/create-storage-system/external-ceph-storage/system-connection-details.tsx

@@ -16,6 +16,7 @@ import {
   StorageClassComponentProps as ExternalComponentProps,
   StorageClassWizardStepExtensionProps as ExternalStorage,
 } from '@odf/odf-plugin-sdk/extensions';
+import { ROOK_CEPH_OPERATOR, OCS_OPERATOR } from '@odf/shared/constants';
 import { useK8sGet } from '@odf/shared/hooks/k8s-get-hook';
 import { useFetchCsv } from '@odf/shared/hooks/use-fetch-csv';
 import {
@@ -41,8 +42,6 @@ import {
 } from '@patternfly/react-core';
 import './system-connection-details.scss';
 
-const OCS_OPERATOR = 'ocs-operator';
-
 const SCRIPT_NAME = 'ceph-external-cluster-details-exporter.py';
 
 export const getValidationKeys = (
@@ -65,18 +64,27 @@ export const ConnectionDetails: React.FC<ExternalComponentProps<RHCSState>> = ({
 
   const [pods, podsLoaded, podsLoadError] =
     useK8sGet<ListKind<PodKind>>(PodModel);
-  const [csv, csvLoaded, csvLoadError] = useFetchCsv({
+
+  // From 4.16 onwards Rook will have separate CSV & Subscription.
+  const [rookCSV, rookCSVLoaded, rookCSVError] = useFetchCsv({
+    specName: ROOK_CEPH_OPERATOR,
+    namespace: odfNamespace,
+    startPollingInstantly: isNsSafe,
+  });
+
+  const [ocsCSV, ocsCSVLoaded, ocsCSVError] = useFetchCsv({
     specName: OCS_OPERATOR,
     namespace: odfNamespace,
     startPollingInstantly: isNsSafe,
   });
 
   const { fileName, fileData, errorMessage, isLoading } = formState;
 
-  const annotations = getAnnotations(csv);
+  const rookAnnotations = getAnnotations(rookCSV, {});
+  const ocsAnnotations = getAnnotations(ocsCSV, {});
 
   const downloadFile = createDownloadFile(
-    annotations?.['external.features.ocs.openshift.io/export-script']
+    rookAnnotations?.['externalClusterScript']
   );
 
   const handleDataChange: FileUploadProps['onDataChange'] = (
@@ -85,7 +93,7 @@ export const ConnectionDetails: React.FC<ExternalComponentProps<RHCSState>> = ({
   ) => {
     if (isValidJSON(fData)) {
       const { plainKeys, secretKeys } = getValidationKeys(
-        annotations?.['external.features.ocs.openshift.io/validation']
+        ocsAnnotations?.['external.features.ocs.openshift.io/validation']
       );
       const ipAddress: string = pods.items?.[0]?.status?.podIP;
       const ipFamily: IP_FAMILY = ipAddress
@@ -103,7 +111,7 @@ export const ConnectionDetails: React.FC<ExternalComponentProps<RHCSState>> = ({
   };
 
   const handleFileChange: FileUploadProps['onFileInputChange'] = (
-    event,
+    _event,
     file: File
   ) => {
     const fName = file.name;
@@ -112,8 +120,8 @@ export const ConnectionDetails: React.FC<ExternalComponentProps<RHCSState>> = ({
 
   return (
     <ErrorHandler
-      error={podsLoadError || csvLoadError}
-      loaded={podsLoaded && csvLoaded}
+      error={podsLoadError || rookCSVError || ocsCSVError}
+      loaded={podsLoaded && rookCSVLoaded && ocsCSVLoaded}
     >
       <Form>
         <FormGroup
@@ -130,7 +138,7 @@ export const ConnectionDetails: React.FC<ExternalComponentProps<RHCSState>> = ({
                     the RHCS cluster, then upload the results (JSON) in the
                     External storage system metadata field.
                   </Trans>{' '}
-                  {downloadFile && (
+                  {!!downloadFile && (
                     <a
                       id="downloadAnchorElem"
                       href={downloadFile}

packages/odf/components/utils/common.ts

@@ -285,10 +285,12 @@ export const checkError = (
   return '';
 };
 
-export const createDownloadFile = (data: string = ''): string =>
-  `data:application/octet-stream;charset=utf-8,${encodeURIComponent(
-    Base64.decode(data)
-  )}`;
+export const createDownloadFile = (data: string): string =>
+  !!data
+    ? `data:application/octet-stream;charset=utf-8,${encodeURIComponent(
+        Base64.decode(data)
+      )}`
+    : '';
 
 export const isValidJSON = (fData: string): boolean => {
   try {

packages/odf/constants/common.ts

@@ -13,7 +13,6 @@ export const LABEL_OPERATOR = 'In';
 export const OCS_SUPPORT_ANNOTATION = 'features.ocs.openshift.io/enabled';
 export const OCS_DISABLED_ANNOTATION = 'features.ocs.openshift.io/disabled';
 export const ODF_VENDOR_ANNOTATION = 'vendors.odf.openshift.io/kind';
-export const OCS_OPERATOR = 'ocs-operator';
 export const OCS_DEVICE_SET_FLEXIBLE_REPLICA = 1;
 export const OCS_DEVICE_SET_MINIMUM_REPLICAS = 3;
 export const MINIMUM_NODES = 3;

packages/shared/src/constants/common.ts

@@ -2,6 +2,8 @@ export const DASH = '-';
 export const AVAILABLE = 'Available';
 export const CEPH_STORAGE_NAMESPACE = 'openshift-storage';
 export const ODF_OPERATOR = 'odf-operator';
+export const OCS_OPERATOR = 'ocs-operator';
+export const ROOK_CEPH_OPERATOR = 'rook-ceph-operator';
 export const ONE_SECOND = 1000;
 export const ONE_MINUTE = 60 * ONE_SECOND;
 export const ONE_HOUR = 60 * ONE_MINUTE;