WIP Prototype multicluster sdk #169
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| export { detectOpenShiftVersion } from './detectOpenShiftVersion'; | ||
| export { enableGitOpsDynamicFlag } from './enableGitOpsDynamicFlag'; | ||
| export { useGitOpsMulticlusterFlag } from './useGitOpsMulticlusterFlag'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| import { useEffect } from 'react'; | ||
|
|
||
| import { SetFeatureFlag } from '@openshift-console/dynamic-plugin-sdk'; | ||
| import { useIsFleetAvailable } from '@stolostron/multicluster-sdk'; | ||
|
|
||
| import { FLAG_GITOPS_MULTICLUSTER } from '../../../const'; | ||
|
|
||
| export const useGitOpsMulticlusterFlag = (setFeatureFlag: SetFeatureFlag) => { | ||
| const isFleetAvailable = useIsFleetAvailable(); | ||
|
|
||
| useEffect(() => { | ||
| if (isFleetAvailable) { | ||
| setFeatureFlag(FLAG_GITOPS_MULTICLUSTER, isFleetAvailable); | ||
|
Author
There was a problem hiding this comment. Since your console-extensions.json file is JSON and not TypeScript, you can call our hook to check if multicluster SDK is available. If it was in TypeScript, you could use the This will be modified when there is a new minimum version of ACM required for new features in the SDK. Checking via |
||
| } | ||
| }, [isFleetAvailable, setFeatureFlag]); | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| import * as React from 'react'; | ||
| import { useTranslation } from 'react-i18next'; | ||
| import { Link } from 'react-router-dom-v5-compat'; | ||
| import DevPreviewBadge from 'src/components/import/badges/DevPreviewBadge'; | ||
|
|
||
| import { useMulticlusterK8sWatchResource } from '@gitops/hooks/useMuticlusterK8sWatchResource'; | ||
| import { | ||
| Action, | ||
| K8sResourceCommon, | ||
|
|
@@ -11,14 +13,18 @@ import { | |
| ListPageHeader, | ||
| ResourceLink, | ||
| RowFilter, | ||
| useListPageFilter, | ||
| } from '@openshift-console/dynamic-plugin-sdk'; | ||
| import { ErrorState } from '@patternfly/react-component-groups'; | ||
| import { EmptyState, EmptyStateBody, Flex, FlexItem, Spinner } from '@patternfly/react-core'; | ||
| import { DataViewTh, DataViewTr } from '@patternfly/react-data-view/dist/esm/DataViewTable'; | ||
| import { CubesIcon } from '@patternfly/react-icons'; | ||
| import { Tbody, Td, ThProps, Tr } from '@patternfly/react-table'; | ||
| import { | ||
| FleetResourceLink, | ||
| useHubClusterName, | ||
| useIsFleetAvailable, | ||
| } from '@stolostron/multicluster-sdk'; | ||
|
|
||
| import { useApplicationActionsProvider } from '../..//hooks/useApplicationActionsProvider'; | ||
| import RevisionFragment from '../..//Revision/Revision'; | ||
|
|
@@ -83,7 +89,8 @@ const ApplicationList: React.FC<ApplicationProps> = ({ | |
| if (listAllNamespaces) { | ||
| namespace = null; | ||
| } | ||
|
|
||
| const [applications, loaded, loadError] = useMulticlusterK8sWatchResource<K8sResourceCommon[]>({ | ||
| isList: true, | ||
| groupVersionKind: { | ||
| group: 'argoproj.io', | ||
|
|
@@ -305,6 +312,8 @@ const ApplicationActionsCell: React.FC<{ app: ApplicationKind }> = ({ app }) => | |
| }; | ||
|
|
||
| const useApplicationRowsDV = (applicationsList, namespace): DataViewTr[] => { | ||
| const isFleetAvailable = useIsFleetAvailable(); | ||
| const [hubClusterName] = useHubClusterName(); | ||
| const rows: DataViewTr[] = []; | ||
| applicationsList.forEach((app, index) => { | ||
| let sources: ApplicationSource[]; | ||
|
|
@@ -324,21 +333,47 @@ const useApplicationRowsDV = (applicationsList, namespace): DataViewTr[] => { | |
| { | ||
| cell: ( | ||
| <div> | ||
| {app.cluster !== hubClusterName ? ( | ||
| <Link | ||
| to={`/k8s/cluster/${app.cluster}/ns/${app.metadata.namespace}/argoproj.io~v1alpha1~Application/${app.metadata.name}`} | ||
| > | ||
| {app.metadata.name} | ||
| </Link> | ||
| ) : ( | ||
| <ResourceLink | ||
| groupVersionKind={modelToGroupVersionKind(ApplicationModel)} | ||
| name={app.metadata.name} | ||
| namespace={app.metadata.namespace} | ||
| // cluster={app.cluster} | ||
| inline={true} | ||
| > | ||
| <span className="pf-u-pl-sm"> | ||
| {isApplicationRefreshing(app) && <Spinner size="sm" />} | ||
| </span> | ||
| </ResourceLink> | ||
| )} | ||
|
Comment on lines
+336
to
+354
Author
There was a problem hiding this comment. Normally I would recommend just converting to a That extension allows plugins to declare that they have a route for displaying a given resource kind. |
||
| </div> | ||
| ), | ||
| id: app.metadata?.name, | ||
| dataLabel: 'Name', | ||
| }, | ||
| ...(isFleetAvailable | ||
| ? [ | ||
| { | ||
| cell: ( | ||
| <FleetResourceLink | ||
| groupVersionKind={{ | ||
| kind: 'ManagedCluster', | ||
| group: 'cluster.open-cluster-management.io', | ||
| version: 'v1', | ||
| }} | ||
| name={app.cluster} | ||
| /> | ||
| ), | ||
| dataLabel: 'Cluster', | ||
| }, | ||
| ] | ||
| : []), | ||
| ...(!namespace | ||
| ? [ | ||
| { | ||
|
|
@@ -371,15 +406,23 @@ const useApplicationRowsDV = (applicationsList, namespace): DataViewTr[] => { | |
| id: app?.status?.sync?.revision, | ||
| cell: ( | ||
| <> | ||
| {/* Extra guard code added here - ACM search will not have all of this information */} | ||
| {sources && !!sources.length && sources[0].targetRevision | ||
| ? sources[0].targetRevision | ||
| : 'HEAD'} | ||
| | ||
| {sources && | ||
| !!sources.length && | ||
| !(app.status?.sourceType == 'Helm' && sources[0].chart) && | ||
| revisions && | ||
| !!revisions.length && ( | ||
| <RevisionFragment | ||
| revision={revisions[0] || ''} | ||
| repoURL={sources[0].repoURL} | ||
| helm={app.status?.sourceType == 'Helm' && sources[0].chart ? true : false} | ||
| revisionExtra={revisions.length > 1 && ' and ' + (revisions.length - 1) + ' more'} | ||
| /> | ||
| )} | ||
| </> | ||
| ), | ||
| }, | ||
|
|
@@ -406,7 +449,8 @@ const useColumnsDV = ( | |
| namespace: string, | ||
| getSortParams: (columnIndex: number) => ThProps['sort'], | ||
| ): DataViewTh[] => { | ||
| const isFleetAvailable = useIsFleetAvailable(); | ||
| const i: number = (namespace ? 0 : 1) + (isFleetAvailable ? 1 : 0); | ||
| const { t } = useTranslation('plugin__gitops-plugin'); | ||
| const columns: DataViewTh[] = [ | ||
| { | ||
|
|
@@ -417,14 +461,26 @@ const useColumnsDV = ( | |
| sort: getSortParams(0), | ||
| }, | ||
| }, | ||
| ...(isFleetAvailable | ||
| ? [ | ||
| { | ||
| cell: t('Cluster'), | ||
| props: { | ||
| 'aria-label': 'cluster', | ||
| className: 'pf-m-width-15', | ||
| sort: getSortParams(1), | ||
| }, | ||
| }, | ||
| ] | ||
| : []), | ||
| ...(!namespace | ||
| ? [ | ||
| { | ||
| cell: t('Namespace'), | ||
| props: { | ||
| 'aria-label': 'namespace', | ||
| className: 'pf-m-width-15', | ||
| sort: getSortParams(isFleetAvailable ? 2 : 1), | ||
| }, | ||
| }, | ||
| ] | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because multicluster support is not native to OCP, you need to have your own route defined for multicluster resources.