Merge pull request #974 from openshift-cherrypick-robot/cherry-pick-9…

…73-to-release-4.12 [release-4.12] Bug 2143964: Could not load template while creating VM from catalog
kubevirt-ui · Nov 20, 2022 · 1d359a2 · 1d359a2
2 parents f5ce596 + f338e63
commit 1d359a2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/src/utils/resources/template/hooks/useProcessedTemplate.ts b/src/utils/resources/template/hooks/useProcessedTemplate.ts
@@ -25,7 +25,7 @@ export const useProcessedTemplate = (
     if (template) {
       k8sCreate<V1Template>({
         model: ProcessedTemplatesModel,
-        data: template,
+        data: { ...template, metadata: { ...template?.metadata, namespace } },
         ns: namespace,
         queryParams: {
           dryRun: 'All',

diff --git a/src/utils/resources/template/hooks/useVMTemplateGeneratedParams.ts b/src/utils/resources/template/hooks/useVMTemplateGeneratedParams.ts
@@ -26,7 +26,11 @@ export default (template: V1Template): [template: V1Template, error: Error] => {
 
     k8sCreate<V1Template>({
       model: ProcessedTemplatesModel,
-      data: { ...template, parameters: parametersToGenerate },
+      data: {
+        ...template,
+        parameters: parametersToGenerate,
+        metadata: { ...template?.metadata, namespace },
+      },
       ns: namespace,
       queryParams: {
         dryRun: 'All',

diff --git a/src/views/catalog/customize/utils.ts b/src/views/catalog/customize/utils.ts
@@ -118,7 +118,7 @@ export const processTemplate = async ({
 
   return await k8sCreate<V1Template>({
     model: ProcessedTemplatesModel,
-    data: templateToProcess,
+    data: { ...templateToProcess, metadata: { ...template?.metadata, namespace } },
     queryParams: {
       dryRun: 'All',
     },

diff --git a/src/views/catalog/templatescatalog/components/TemplatesCatalogDrawer/utils.ts b/src/views/catalog/templatescatalog/components/TemplatesCatalogDrawer/utils.ts
@@ -10,7 +10,7 @@ export const getVMName = async (template: V1Template, namespace: string): Promis
 
   return await k8sCreate<V1Template>({
     model: ProcessedTemplatesModel,
-    data: templateToProcess,
+    data: { ...templateToProcess, metadata: { ...template?.metadata, namespace } },
     ns: namespace,
     queryParams: {
       dryRun: 'All',

diff --git a/src/views/catalog/utils/quick-create-vm.ts b/src/views/catalog/utils/quick-create-vm.ts
@@ -30,7 +30,7 @@ export const quickCreateVM: QuickCreateVMType = async ({
 }) => {
   const processedTemplate = await k8sCreate<V1Template>({
     model: ProcessedTemplatesModel,
-    data: template,
+    data: { ...template, metadata: { ...template?.metadata, namespace } },
     ns: namespace,
     queryParams: {
       dryRun: 'All',