Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ const ConnectedTopologyOperatorBackedPanel: React.FC<PropsFromState &
PropsFromDispatch &
TopologyOperatorBackedPanelProps> = ({ item, onClickTab, selectedDetailsTab }) => {
const { t } = useTranslation();
const { name, resource } = item;
const { name, resource, data } = item;
const { namespace } = resource.metadata;
const csvName = resource.metadata.selfLink.split('/').pop();
const { csvName } = data;
const reference = referenceFor(resource);
const actionExtensions = useExtensions<ClusterServiceVersionAction>(
isClusterServiceVersionAction,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export type OperatorGroupData = {
csvName: string;
operatorKind: string;
builderImage: string;
apiVersion: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const getServiceBindingEdges = (
export const getOperatorGroupResource = (
resource: K8sResourceKind,
resources?: TopologyDataResources,
): K8sResourceKind => {
): { operatorGroupItem: K8sResourceKind; csvName: string } => {
const installedOperators = resources?.clusterServiceVersions?.data as ClusterServiceVersionKind[];
const operatorBackedServiceKindMap = getOperatorBackedServiceKindMap(installedOperators);
// added this as needs to hide operator backed if belong to source
Expand All @@ -102,21 +102,22 @@ export const getOperatorGroupResource = (
const operator: K8sResourceKind =
(installedOperators.find((op) => op.metadata.uid === ownerUid) as K8sResourceKind) ||
operatorBackedServiceKind;

const csvName = operator.metadata.name;
const operatorName =
ownerReference?.name ?? appGroup
? `${appGroup}:${operator.metadata.name}`
: operator.metadata.name;

const groupUid = ownerReference?.uid ?? `${operatorName}:${operator.metadata.uid}`;
return _.merge({}, operator, {
const operatorGroupItem = _.merge({}, operator, {
apiVersion: ownerReference?.apiVersion ?? '',
kind: ownerReference?.kind ?? 'Operator',
metadata: {
name: ownerReference?.name ?? operator.metadata.name,
uid: groupUid,
},
});
return { operatorGroupItem, csvName };
}
return null;
};
Expand All @@ -126,11 +127,11 @@ export const getOperatorGroupResources = (resources: TopologyDataResources) => {
WORKLOAD_TYPES.forEach((key) => {
if (resources[key]?.data && resources[key].data.length) {
resources[key].data.forEach((resource) => {
const group = getOperatorGroupResource(resource, resources);
if (!group) {
const groupResource = getOperatorGroupResource(resource, resources);
if (!groupResource?.operatorGroupItem) {
return;
}
obsGroups.push(group);
obsGroups.push(groupResource.operatorGroupItem);
});
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export const operatorsDataModelReconciler = (
const operatorNodes = operatorGroupNodes[key];

const baseNode = operatorNodes[0] as OdcNodeModel;
const operatorGroupItem = getOperatorGroupResource(baseNode.resource, resources);
const { operatorGroupItem, csvName } = getOperatorGroupResource(baseNode.resource, resources);
if (operatorGroupItem) {
const data = {
id: operatorGroupItem.metadata.uid,
Expand All @@ -109,6 +109,7 @@ export const operatorsDataModelReconciler = (
resource: operatorGroupItem,
groupResources: operatorNodes,
data: {
csvName,
operatorKind: operatorGroupItem.kind,
builderImage:
getImageForCSVIcon(operatorGroupItem?.spec?.icon?.[0]) || getDefaultOperatorIcon(),
Expand Down