Bug 1892653: update kafkaSource v1beta1 spec to remove resources

frontend/packages/knative-plugin/src/components/add/EventSource.tsx

@@ -68,24 +68,6 @@ export const EventSource: React.FC<Props> = ({
       key: sinkKey,
       uri: '',
     },
-    limits: {
-      cpu: {
-        request: '',
-        requestUnit: 'm',
-        defaultRequestUnit: 'm',
-        limit: '',
-        limitUnit: 'm',
-        defaultLimitUnit: 'm',
-      },
-      memory: {
-        request: '',
-        requestUnit: 'Mi',
-        defaultRequestUnit: 'Mi',
-        limit: '',
-        limitUnit: 'Mi',
-        defaultLimitUnit: 'Mi',
-      },
-    },
     type: '',
     data: {},
     yamlData: '',

frontend/packages/knative-plugin/src/components/add/event-sources/EventSourceSection.tsx

@@ -15,7 +15,6 @@ import KafkaSourceSection from './KafkaSourceSection';
 import YAMLEditorSection from './YAMLEditorSection';
 import { EventSources } from '../import-types';
 import SinkSection from './SinkSection';
-import AdvancedSection from '../AdvancedSection';
 import { isKnownEventSource } from '../../../utils/create-eventsources-utils';
 
 interface EventSourceSectionProps {
@@ -67,7 +66,6 @@ const EventSourceSection: React.FC<EventSourceSectionProps> = ({ namespace }) =>
           />
         </>
       )}
-      {values.type === EventSources.KafkaSource && <AdvancedSection />}
     </>
   );
 };

frontend/packages/knative-plugin/src/components/add/event-sources/KafkaSourceSection.tsx

@@ -4,7 +4,6 @@ import FormSection from '@console/dev-console/src/components/import/section/Form
 import { InputField, SelectInputField, SelectInputOption } from '@console/shared';
 import { TextInputTypes } from '@patternfly/react-core';
 import KafkaSourceNetSection from './KafkaSourceNetSection';
-import ServiceAccountDropdown from '../../dropdowns/ServiceAccountDropdown';
 import { K8sResourceKind } from '@console/internal/module/k8s';
 import { useK8sWatchResources } from '@console/internal/components/utils/k8s-watch-hook';
 import { getBootstrapServers } from '../../../utils/create-eventsources-utils';
@@ -103,7 +102,6 @@ const KafkaSourceSection: React.FC<KafkaSourceSectionProps> = ({ title }) => {
         required
       />
       <KafkaSourceNetSection />
-      <ServiceAccountDropdown name="data.kafkasource.serviceAccountName" />
     </FormSection>
   );
 };

frontend/packages/knative-plugin/src/components/add/event-sources/__tests__/KafkaSourceSection.spec.tsx

@@ -4,7 +4,6 @@ import FormSection from '@console/dev-console/src/components/import/section/Form
 import { useK8sWatchResources } from '@console/internal/components/utils/k8s-watch-hook';
 import KafkaSourceSection from '../KafkaSourceSection';
 import KafkaSourceNetSection from '../KafkaSourceNetSection';
-import ServiceAccountDropdown from '../../../dropdowns/ServiceAccountDropdown';
 
 type KafkaSourceSectionProps = React.ComponentProps<typeof KafkaSourceSection>;
 
@@ -42,7 +41,7 @@ describe('KafkaSourceSection', () => {
     expect(topicsField.props().required).toBeTruthy();
   });
 
-  it('should render consumergroup, netsection and service dropdown', () => {
+  it('should render consumergroup, netsection', () => {
     (useK8sWatchResources as jest.Mock).mockReturnValue({
       kafkas: { data: [], loaded: true },
       kafkatopics: { data: [], loaded: true },
@@ -51,8 +50,6 @@ describe('KafkaSourceSection', () => {
     const consumerGroupField = wrapper.find('[data-test-id="kafkasource-consumergroup-field"]');
     expect(consumerGroupField).toHaveLength(1);
     expect(consumerGroupField.props().required).toBeTruthy();
-
     expect(wrapper.find(KafkaSourceNetSection)).toHaveLength(1);
-    expect(wrapper.find(ServiceAccountDropdown)).toHaveLength(1);
   });
 });

frontend/packages/knative-plugin/src/components/add/import-types.ts

@@ -1,4 +1,3 @@
-import { LimitsData } from '@console/dev-console/src/components/import/import-types';
 import {
   EventSourceApiServerModel,
   EventSourceContainerModel,
@@ -54,7 +53,6 @@ export interface EventSourceFormData {
   type: string;
   sinkType: string;
   sink: SinkResourceData;
-  limits: LimitsData;
   data?: EventSourceData;
   yamlData?: string;
 }

frontend/packages/knative-plugin/src/models.ts

@@ -170,7 +170,7 @@ export const EventSourceCamelModel: K8sKind = {
 
 export const EventSourceKafkaModel: K8sKind = {
   apiGroup: KNATIVE_EVENT_SOURCE_APIGROUP,
-  apiVersion: 'v1alpha1',
+  apiVersion: 'v1beta1',
   kind: 'KafkaSource',
   label: 'KafkaSource',
   labelPlural: 'KafkaSources',

frontend/packages/knative-plugin/src/utils/__tests__/create-eventsources-utils.spec.ts

@@ -67,21 +67,6 @@ describe('Create knative Utils', () => {
     );
   });
 
-  it('expect response to be of kind kafkaSource with resource limits', () => {
-    const defaultEventingData = getDefaultEventingData(EventSources.KafkaSource);
-    const mockData = _.cloneDeep(defaultEventingData);
-    mockData.type = 'KafkaSource';
-    mockData.limits.cpu.limit = '200';
-    mockData.limits.cpu.request = '100';
-    const knEventingResource: k8sModels.K8sResourceKind = getEventSourceResource(mockData);
-    expect(knEventingResource.kind).toBe(EventSourceKafkaModel.kind);
-    expect(knEventingResource.apiVersion).toBe(
-      `${EventSourceKafkaModel.apiGroup}/${EventSourceKafkaModel.apiVersion}`,
-    );
-    expect(knEventingResource.spec?.resources?.limits?.cpu).toBe('200m');
-    expect(knEventingResource.spec?.resources?.requests?.cpu).toBe('100m');
-  });
-
   it('should return bootstrapServers', () => {
     expect(getBootstrapServers(Kafkas)).toEqual([
       'my-cluster-kafka-bootstrap.div.svc:9092',

frontend/packages/knative-plugin/src/utils/__tests__/knative-serving-data.ts

@@ -348,24 +348,6 @@ export const getDefaultEventingData = (typeEventSource: string): EventSourceForm
       kind: ServiceModel.kind,
       key: `${ServiceModel.kind}-event-display`,
     },
-    limits: {
-      cpu: {
-        request: '',
-        requestUnit: 'm',
-        defaultRequestUnit: 'm',
-        limit: '',
-        limitUnit: 'm',
-        defaultLimitUnit: 'm',
-      },
-      memory: {
-        request: '',
-        requestUnit: 'Mi',
-        defaultRequestUnit: 'Mi',
-        limit: '',
-        limitUnit: 'Mi',
-        defaultLimitUnit: 'Mi',
-      },
-    },
     type: typeEventSource,
     data: {
       [typeEventSource.toLowerCase()]: eventSourceData[typeEventSource.toLowerCase()],

frontend/packages/knative-plugin/src/utils/create-eventsources-utils.ts

@@ -91,35 +91,14 @@ export const getEventSourcesDepResource = (formData: EventSourceFormData): K8sRe
 };
 
 export const getKafkaSourceResource = (formData: EventSourceFormData): K8sResourceKind => {
-  const {
-    limits: { cpu, memory },
-  } = formData;
   const baseResource = getEventSourcesDepResource(formData);
   const { net } = baseResource.spec;
   baseResource.spec.net = {
     ...net,
     ...(!net.sasl?.enable && { sasl: { user: {}, password: {} } }),
     ...(!net.tls?.enable && { tls: { caCert: {}, cert: {}, key: {} } }),
   };
-  const kafkaSource = {
-    spec: {
-      resources: {
-        ...((cpu.limit || memory.limit) && {
-          limits: {
-            ...(cpu.limit && { cpu: `${cpu.limit}${cpu.limitUnit}` }),
-            ...(memory.limit && { memory: `${memory.limit}${memory.limitUnit}` }),
-          },
-        }),
-        ...((cpu.request || memory.request) && {
-          requests: {
-            ...(cpu.request && { cpu: `${cpu.request}${cpu.requestUnit}` }),
-            ...(memory.request && { memory: `${memory.request}${memory.requestUnit}` }),
-          },
-        }),
-      },
-    },
-  };
-  return _.merge({}, baseResource, kafkaSource);
+  return baseResource;
 };
 
 export const loadYamlData = (formData: EventSourceFormData) => {
@@ -196,21 +175,6 @@ export const getEventSourceData = (source: string) => {
           key: { secretKeyRef: { name: '', key: '' } },
         },
       },
-      serviceAccountName: '',
-    },
-    containersource: {
-      template: {
-        spec: {
-          containers: [
-            {
-              image: '',
-              name: '',
-              args: [''],
-              env: [],
-            },
-          ],
-        },
-      },
     },
   };
   return eventSourceData[source];