Removed parameter templates filtering using kubernetesVersion (#402)

Author: riyaz-ghati

apps/cluster-orch/src/components/atom/ClusterTemplatesDropdown/ClusterTemplatesDropdown.tsx

@@ -14,39 +14,24 @@ export interface ClusterTemplatesDropdownProps {
   onSelectionChange?: (value: string) => void;
   clusterTemplateName?: string;
   isDisabled?: boolean;
-  kubernetesVersion?: string;
 }
 const ClusterTemplatesDropdown = ({
   onSelectionChange,
   clusterTemplateName,
   isDisabled,
-  kubernetesVersion,
 }: ClusterTemplatesDropdownProps) => {
   const projectName = SharedStorage.project?.name ?? "";
-  const templatesParam: cm.GetV2ProjectsByProjectNameTemplatesApiArg = {
-    projectName,
-  };
-  if (kubernetesVersion) {
-    // Apply the filter to the query
-    templatesParam.filter = `kubernetesVersion=${kubernetesVersion}`;
-  }
 
   const {
     data: clusterTemplates,
     isSuccess: isTemplateSuccess,
     isLoading: isTemplateLoading,
     isError: isTemplateError,
     error,
-    refetch,
-  } = cm.useGetV2ProjectsByProjectNameTemplatesQuery(templatesParam);
+  } = cm.useGetV2ProjectsByProjectNameTemplatesQuery({ projectName });
 
   const [templateNames, setTemplateNames] = useState<string[]>();
 
-  // Add useEffect to trigger refetch when kubernetesVersion changes
-  useEffect(() => {
-    refetch();
-  }, [kubernetesVersion, refetch]);
-
   useEffect(() => {
     if (!clusterTemplates) return;
     const filteredList: string[] = [];

apps/infra/src/components/organism/ConfigureAllHosts/ConfigureAllHosts.tsx

@@ -57,7 +57,6 @@ const ConfigureAllHosts = () => {
   const {
     commonHostData,
     createCluster,
-    kubernetesVersion,
     formStatus: { showAdvancedOptions },
   } = useAppSelector(selectHostProvisionState);
 
@@ -118,7 +117,6 @@ const ConfigureAllHosts = () => {
           <Flex cols={[4]} gap="2">
             {ClusterTemplatesDropdownRemote && (
               <ClusterTemplatesDropdownRemote
-                kubernetesVersion={kubernetesVersion}
                 clusterTemplateName={commonHostData.clusterTemplateName}
                 onSelectionChange={(value: string) => {
                   dispatch(setCommonClusterTemplateName(value));

apps/infra/src/store/provisionHost.ts

@@ -50,7 +50,6 @@ export interface HostProvisionState {
   autoProvision: boolean;
   createCluster: boolean;
   hasHostDefinitionError: boolean;
-  kubernetesVersion: string;
 }
 
 export const initialState: HostProvisionState = {
@@ -70,7 +69,6 @@ export const initialState: HostProvisionState = {
   autoProvision: true,
   createCluster: true,
   hasHostDefinitionError: false,
-  kubernetesVersion: "",
 };
 
 export type SiteReadWithPath = infra.SiteResourceRead & {
@@ -256,14 +254,6 @@ export const provisionHost = createSlice({
       const changed = state.commonHostData?.os?.name !== action.payload.name;
       state.commonHostData.os = action.payload;
 
-      const metadata = action.payload.metadata?.trim() || "{}";
-      state.kubernetesVersion =
-        (
-          JSON.parse(metadata) as {
-            "kubernetes-version"?: string;
-          }
-        )["kubernetes-version"] ?? "";
-
       if (changed) {
         delete state.commonHostData["clusterTemplateName"];
         delete state.commonHostData["clusterTemplateVersion"];

library/utils/mocks/cluster-orch/mocks.ts

@@ -15,16 +15,8 @@ const projectName = SharedStorage.project?.name;
 
 const cts = new ClusterTemplatesStore();
 export const clusterTemplateHandlers = [
-  http.get(`/v2/projects/${projectName}/templates`, ({ request }) => {
-    const filter = new URL(request.url).searchParams.get("filter");
-    let templates = cts.list();
-
-    if (filter) {
-      const kubeVersion = filter.split("=").pop();
-      templates = templates.filter((template) => {
-        return template.kubernetesVersion === kubeVersion;
-      });
-    }
+  http.get(`/v2/projects/${projectName}/templates`, () => {
+    const templates = cts.list();
 
     return HttpResponse.json(
       {

library/utils/mocks/infra/store/osresources.ts

@@ -15,7 +15,6 @@ export const createOsResource = (
   profileName: string,
   securityFeature: infra.InstanceResourceRead["securityFeature"],
   osType: infra.OperatingSystemResourceRead["osType"],
-  metadata: string,
 ): infra.OperatingSystemResourceRead => {
   return {
     resourceId: id,
@@ -30,7 +29,6 @@ export const createOsResource = (
       '{"Repo":[{"Name":"libpcre2-32-0","Version":"10.42-3","Architecture":"x86_64","Distribution":"tmv3","URL":"https://www.pcre.org/","License":"BSD","Modified":"No"},{"Name":"libpcre2-16-0","Version":"10.42-3","Architecture":"x86_64","Distribution":"tmv3","URL":"https://www.pcre.org/","License":"BSD","Modified":"No"}]}',
     existingCves:
       '[{"cve_id":"CVE-2016-5180","priority":"critical","affected_packages":["fluent-bit-3.1.9-11.emt3.x86_64"]},{"cve_id":"CVE-2021-3672","priority":"medium","affected_packages":["fluent-bit-3.1.9-11.emt3.x86_64"]},{"cve_id":"CVE-2020-8277","priority":"high","affected_packages":["fluent-bit-3.1.9-11.emt3.x86_64"]},{"cve_id":"CVE-2022-4904","priority":"high","affected_packages":["fluent-bit-3.1.9-11.emt3.x86_64"]}]',
-    metadata,
   };
 };
 
@@ -42,7 +40,6 @@ export const osTb = createOsResource(
   "TbOS",
   "SECURITY_FEATURE_SECURE_BOOT_AND_FULL_DISK_ENCRYPTION",
   "OS_TYPE_IMMUTABLE",
-  '{"kubernetes-version":"v1.28.0"}',
 );
 
 export const osTbUpdate = createOsResource(
@@ -53,7 +50,6 @@ export const osTbUpdate = createOsResource(
   "TbOS",
   "SECURITY_FEATURE_SECURE_BOOT_AND_FULL_DISK_ENCRYPTION",
   "OS_TYPE_IMMUTABLE",
-  '{"kubernetes-version":"v1.28.0"}',
 );
 
 export const osUbuntu = createOsResource(
@@ -64,7 +60,6 @@ export const osUbuntu = createOsResource(
   "Ubuntu-x86_profile",
   "SECURITY_FEATURE_SECURE_BOOT_AND_FULL_DISK_ENCRYPTION",
   "OS_TYPE_IMMUTABLE",
-  '{"kubernetes-version":"v1.30.0"}',
 );
 
 export const osRedHat = createOsResource(
@@ -75,7 +70,6 @@ export const osRedHat = createOsResource(
   "Redhat-x86_profile",
   "SECURITY_FEATURE_NONE",
   "OS_TYPE_IMMUTABLE",
-  '{"kubernetes-version":"v1.32.0"}',
 );
 
 export class OsResourceStore extends BaseStore<