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

filter deployments created by event sources #4770

Merged
merged 1 commit into from Mar 27, 2020
Merged

filter deployments created by event sources #4770

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
72 changes: 72 additions & 0 deletions ...tend/packages/dev-console/src/components/topology/__tests__/topology-knative-test-data.ts
View file
Open in desktop
Expand Up @@ -97,6 +97,78 @@ export const sampleKnativeDeployments: FirehoseResult<DeploymentKind[]> = {
],
};

export const sampleEventSourceDeployments: FirehoseResult<DeploymentKind[]> = {
loaded: true,
loadError: '',
data: [
{
apiVersion: 'apps/v1',
kind: 'Deployment',
metadata: {
annotations: {
'deployment.kubernetes.io/revision': '1',
},
selfLink:
'/apis/apps/v1/namespaces/testproject1/deployments/apiserversource-testevents-88eb61d1-b52e-4836-829c-6821e346ecf6',
resourceVersion: '726179',
name: 'apiserversource-testevents-88eb61d1-b52e-4836-829c-6821e346ecf6',
uid: 'bccad3e4-8ce0-11e9-bb7b-0ebb55b110b8',
creationTimestamp: '2019-04-22T11:35:43Z',
generation: 2,
namespace: 'testproject1',
labels: {
'eventing.knative.dev/source': 'apiserver-source-controller',
'eventing.knative.dev/sourceName': 'testevents',
},
ownerReferences: [
{
apiVersion: `${EventSourceApiServerModel.apiGroup}/${EventSourceApiServerModel.apiVersion}`,
kind: EventSourceApiServerModel.kind,
name: 'testevents',
uid: '1317f615-9636-11e9-b134-06a61d886b689',
controller: true,
blockOwnerDeletion: true,
},
],
},
spec: {
replicas: 0,
selector: {
matchLabels: {
'eventing.knative.dev/source': 'apiserver-source-controller',
'eventing.knative.dev/sourceName': 'testevents',
},
},
template: {
metadata: {
creationTimestamp: null,
labels: {
'eventing.knative.dev/source': 'apiserver-source-controller',
'eventing.knative.dev/sourceName': 'testevents',
},
annotations: {
'sidecar.istio.io/inject': 'false',
},
},
spec: {
containers: [],
},
},
strategy: {
type: 'RollingUpdate',
rollingUpdate: {
maxUnavailable: '25%',
maxSurge: '25%',
},
},
revisionHistoryLimit: 10,
progressDeadlineSeconds: 600,
},
status: {},
},
],
};

export const sampleKnativeReplicaSets: FirehoseResult = {
loaded: true,
loadError: '',
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/dev-console/src/components/topology/topology-utils.ts
View file
Open in desktop
Expand Up @@ -652,7 +652,7 @@ export const transformTopologyData = (
const knRevResources: K8sResourceKind[] = _.get(resources, ['revisions', 'data'], []);
knRevResources.length && getKnativeTopologyData(knRevResources, NodeType.Revision);
const deploymentResources: DeploymentKind[] = _.get(resources, ['deployments', 'data'], []);
resources.deployments.data = filterNonKnativeDeployments(deploymentResources);
resources.deployments.data = filterNonKnativeDeployments(deploymentResources, knEventSources);
// END: kn call to form topology data

const transformResourceData = createInstanceForResource(resources, utils, installedOperators);
Expand Down
22 changes: 21 additions & 1 deletion frontend/packages/knative-plugin/src/utils/__tests__/knative-topology-utils.spec.ts
View file
Open in desktop
@@ -1,6 +1,12 @@
import * as _ from 'lodash';
import * as k8s from '@console/internal/module/k8s';
import { MockKnativeResources } from '@console/dev-console/src/components/topology/__tests__/topology-knative-test-data';
import {
MockKnativeResources,
sampleEventSourceDeployments,
sampleKnativeDeployments,
sampleEventSourceApiServer,
} from '@console/dev-console/src/components/topology/__tests__/topology-knative-test-data';
import { sampleDeployments } from '@console/dev-console/src/components/topology/__tests__/topology-test-data';
import {
getKnativeServiceData,
getKnativeTopologyNodeItems,
Expand All @@ -11,6 +17,7 @@ import {
getParentResource,
filterRevisionsByActiveApplication,
createKnativeEventSourceSink,
filterNonKnativeDeployments,
} from '../knative-topology-utils';
import { mockServiceData, mockRevisions } from '../__mocks__/traffic-splitting-utils-mock';

Expand Down Expand Up @@ -117,6 +124,19 @@ describe('knative topology utils', () => {
const mockService = { metadata: { name: 'ser', namepspace: '' }, status: {}, spec: {} };
expect(filterRevisionsBaseOnTrafficStatus(mockService, mockRevisions)).toBeUndefined();
});

it('should filter out deployments created for knative resources and event sources', () => {
const MockResources: k8s.DeploymentKind[] = [
sampleEventSourceDeployments.data[0],
sampleKnativeDeployments.data[0],
sampleDeployments.data[0],
];
const filteredResources: k8s.DeploymentKind[] = filterNonKnativeDeployments(MockResources, [
sampleEventSourceApiServer.data[0],
]);
expect(filteredResources).toHaveLength(1);
expect(filteredResources[0].metadata.name).toEqual('analytics-deployment');
});
});

describe('Knative Topology Utils', () => {
Expand Down
20 changes: 8 additions & 12 deletions frontend/packages/knative-plugin/src/utils/knative-topology-utils.ts
View file
Open in desktop
Expand Up @@ -419,21 +419,17 @@ export const tranformKnNodeData = (
/**
* Filter out deployments not created via revisions/eventsources
*/
export const filterNonKnativeDeployments = (resources: DeploymentKind[]): DeploymentKind[] => {
export const filterNonKnativeDeployments = (
resources: DeploymentKind[],
eventSources?: K8sResourceKind[],
): DeploymentKind[] => {
const KNATIVE_CONFIGURATION = 'serving.knative.dev/configuration';
const KNATIVE_EVENTS_CRONJOB = 'sources.eventing.knative.dev/cronJobSource';
const KNATIVE_EVENTS_CONTAINER = 'sources.eventing.knative.dev/containerSource';
const KNATIVE_EVENTS_APISERVER = 'sources.knative.dev/apiServerSource';
const KNATIVE_EVENTS_CAMEL = 'sources.eventing.knative.dev/camelSource';
const KNATIVE_EVENTS_KAFKA = 'sources.eventing.knative.dev/kafkaSource';
const isEventSourceKind = (uid: string): boolean =>
uid && !!eventSources?.find((eventSource) => eventSource.metadata?.uid === uid);
return _.filter(resources, (d) => {
return (
!_.get(d, ['metadata', 'labels', KNATIVE_CONFIGURATION]) &&
!_.get(d, ['metadata', 'labels', KNATIVE_EVENTS_CRONJOB]) &&
!_.get(d, ['metadata', 'labels', KNATIVE_EVENTS_CONTAINER]) &&
!_.get(d, ['metadata', 'labels', KNATIVE_EVENTS_APISERVER]) &&
!_.get(d, ['metadata', 'labels', KNATIVE_EVENTS_CAMEL]) &&
!_.get(d, ['metadata', 'labels', KNATIVE_EVENTS_KAFKA])
!_.get(d, ['metadata', 'labels', KNATIVE_CONFIGURATION], false) &&
!isEventSourceKind(d.metadata?.ownerReferences?.[0].uid)
);
});
};
Expand Down