ACM-15128 networking options support for node pools HCP cluster (#4183)

* adds networking support for nodepools Signed-off-by: vsanghishetty <[email protected]> * adds networking support for nodepools Signed-off-by: vsanghishetty <[email protected]> * adds networking support for nodepools Signed-off-by: vsanghishetty <[email protected]> * adds networking support for nodepools Signed-off-by: vsanghishetty <[email protected]> * adds networking support for nodepools tests Signed-off-by: vsanghishetty <[email protected]> * adds networking support for nodepools tests and snapshot Signed-off-by: vsanghishetty <[email protected]> * addresses sonar issues Signed-off-by: vsanghishetty <[email protected]> * handlebar template kubevirt Signed-off-by: vsanghishetty <[email protected]> * controldata kubevirt Signed-off-by: vsanghishetty <[email protected]> * control data helper function kubevirt Signed-off-by: vsanghishetty <[email protected]> * tests snapshot kubevirt Signed-off-by: vsanghishetty <[email protected]> * validation kubernetes name kubevirt Signed-off-by: vsanghishetty <[email protected]> * additional networks kubevirt cluster creation tests Signed-off-by: vsanghishetty <[email protected]> * translation strings kubevirt Signed-off-by: vsanghishetty <[email protected]> * translation strings kubevirt Signed-off-by: vsanghishetty <[email protected]> * sonar issues Signed-off-by: vsanghishetty <[email protected]> * updates tests snapshot Signed-off-by: vsanghishetty <[email protected]> * updates translations Signed-off-by: vsanghishetty <[email protected]> * updates initialize control with cloneDeep Signed-off-by: vsanghishetty <[email protected]> * john's fix for scrollbar issue Signed-off-by: vsanghishetty <[email protected]> * updates translations Signed-off-by: vsanghishetty <[email protected]> * updates kubevirt cluster creation tests with networking support for nodepools Signed-off-by: vsanghishetty <[email protected]> * implements update default pod network function Signed-off-by: vsanghishetty <[email protected]> * implements additional networks for node pools Signed-off-by: vsanghishetty <[email protected]> * updates tests snapshot Signed-off-by: vsanghishetty <[email protected]> * updates tests snapshot Signed-off-by: vsanghishetty <[email protected]> * updates handlebar template Signed-off-by: vsanghishetty <[email protected]> * validation functions updates Signed-off-by: vsanghishetty <[email protected]> * validation functions updates Signed-off-by: vsanghishetty <[email protected]> * validation function updates tests Signed-off-by: vsanghishetty <[email protected]> * updates translations and format Signed-off-by: vsanghishetty <[email protected]> * updates Kubevirt cluster creation tests Signed-off-by: vsanghishetty <[email protected]> * updates translations Signed-off-by: vsanghishetty <[email protected]> * updates initialize control data Signed-off-by: vsanghishetty <[email protected]> * prettier fix Signed-off-by: vsanghishetty <[email protected]> * updates translations Signed-off-by: vsanghishetty <[email protected]> * updates translations and Kevin's suggestions Signed-off-by: vsanghishetty <[email protected]> * updates translations and tests snapshot Signed-off-by: vsanghishetty <[email protected]> * updates translations and tests snapshot Signed-off-by: vsanghishetty <[email protected]> * updates translations Signed-off-by: vsanghishetty <[email protected]> --------- Signed-off-by: vsanghishetty <[email protected]>
stolostron · Jan 22, 2025 · af442b9 · af442b9
1 parent 06d4c0d
commit af442b9
Show file tree

Hide file tree

Showing 9 changed files with 775 additions and 9 deletions.
diff --git a/frontend/public/locales/en/translation.json b/frontend/public/locales/en/translation.json
@@ -383,6 +383,7 @@
   "add": "Add",
   "Add": "Add",
   "Add a search constraint": "Add a search constraint",
+  "Add additional network": "Add additional network",
   "Add another time range": "Add another time range",
   "Add Argo Server": "Add Argo Server",
   "Add claim expression": "Add claim expression",
@@ -416,6 +417,7 @@
   "Adding hosts allows cluster creators to pull any available hosts from the infrastructure environment.": "Adding hosts allows cluster creators to pull any available hosts from the infrastructure environment.",
   "Additional actions": "Additional actions",
   "Additional information:": "Additional information:",
+  "Additional networks": "Additional networks",
   "Additional providers": "Additional providers",
   "Additional trust bundle": "Additional trust bundle",
   "Advanced configuration": "Advanced configuration",
@@ -522,6 +524,7 @@
   "Argo server": "Argo server",
   "Argo Server exposes an API and UI for workflows. You can run this in either \"hosted\" or \"local\" mode. ": "Argo Server exposes an API and UI for workflows. You can run this in either \"hosted\" or \"local\" mode. ",
   "ArgoCD": "ArgoCD",
+  "Attach default pod network": "Attach default pod network",
   "Attempts to delete all of the objects related to the deleted policy.": "Attempts to delete all of the objects related to the deleted policy.",
   "Attempts to delete objects known to be created by the policy when the policy is deleted.": "Attempts to delete objects known to be created by the policy when the policy is deleted.",
   "Attribute filters": "Attribute filters",
@@ -790,6 +793,7 @@
   "Configure external infrastructure for OpenShift Virtualization": "Configure external infrastructure for OpenShift Virtualization",
   "Configure host inventory settings": "Configure host inventory settings",
   "Configure network access for your cluster. One network is created by default.": "Configure network access for your cluster. One network is created by default.",
+  "Configure networking options for your nodepool": "Configure networking options for your nodepool",
   "confirm": "confirm",
   "Conflict": "Conflict",
   "Connect your cloud provider": "Connect your cloud provider",
@@ -1304,6 +1308,7 @@
   "Enter search text": "Enter search text",
   "Enter skip tag with \",\" or \"enter\"": "Enter skip tag with \",\" or \"enter\"",
   "Enter Storage Class": "Enter Storage Class",
+  "Enter the additional network in the format <namespace>/<name>": "Enter the additional network in the format <namespace>/<name>",
   "Enter the Amazon Web Services credentials": "Enter the Amazon Web Services credentials",
   "Enter the Ansible Automation Platform credentials": "Enter the Ansible Automation Platform credentials",
   "Enter the Ansible Tower host URL": "Enter the Ansible Tower host URL",
@@ -1879,11 +1884,13 @@
   "Name": "Name",
   "Name needs to be unique to the namespace on each of the managed clusters.": "Name needs to be unique to the namespace on each of the managed clusters.",
   "Name your search and provide a description so that you can access it in the future.": "Name your search and provide a description so that you can access it in the future.",
+  "name.invalid.dns.label": "The name is invalid. $t(import.form.invalid.dns.label)",
   "namespace": "namespace",
   "Namespace": "Namespace",
   "Namespace where the selected Argo application resources are deployed.": "Namespace where the selected Argo application resources are deployed.",
   "Namespace: {{namespace}}": "Namespace: {{namespace}}",
   "namespace.exists.error": "The namespace you selected is already used by an existing managed cluster.",
+  "namespace.invalid.dns.label": "The namespace is invalid. $t(import.form.invalid.dns.label)",
   "Namespaces": "Namespaces",
   "Namespaces match label expressions": "Namespaces match label expressions",
   "Namespaces match labels": "Namespaces match labels",
@@ -1893,6 +1900,7 @@
   "Network error": "Network error",
   "Network Optimized": "Network Optimized",
   "Networking": "Networking",
+  "Networking options": "Networking options",
   "New placement": "New placement",
   "New template": "New template",
   "New version": "New version",
@@ -3016,6 +3024,7 @@
   "tooltip.creation.app.reconcileRate": "The frequency of resource reconciliation that is used as a global repository setting. The medium default setting checks for changes to apply every three minutes and re-applies all resources every 15 minutes, even without a change. Select low to reconcile every hour. Select high to reconcile every two minutes. If you select off, the deployed resources are not automatically reconciled.",
   "tooltip.creation.app.settings.existingRule": "If available in the application namespace, you can select a predefined placement configuration",
   "tooltip.creation.app.subReconcileRate": "Turn the auto-reconciliation off for this specific application regardless of the reconcile rate setting in the repository.",
+  "tooltip.creation.nodepool.additional.network": "The name specifies the network attached to the nodes in the format <namespace>/<name> to reference the multus network attachment definition",
   "tooltip.creation.ocp.api.vip": "The Virtual IP to use for internal API communication. The DNS must be preconfigured with an A/AAAA or CNAME record so the api.<cluster name>.<Base DNS domain> path resolves correctly.",
   "tooltip.creation.ocp.aws.instance.type": "The EC2 instance type for your compute machines.",
   "tooltip.creation.ocp.aws.region": "The AWS region where the installation program creates your cluster resources. You can select zones within the region for your control plane and worker pools.",
@@ -3049,6 +3058,7 @@
   "tooltip.creation.ocp.name": "The unique name of your cluster. The value must be a string that contains lowercase alphanumeric values, such as dev. Cannot be changed after creation.",
   "tooltip.creation.ocp.node.pool.autorepair": "Enables machine auto-repair with machine health checks",
   "tooltip.creation.ocp.node.pool.core.count": "Number of cores assigned to each worker node VM",
+  "tooltip.creation.ocp.node.pool.default.pod.network": "Check this box to attach the default pod network to nodes from this pool.",
   "tooltip.creation.ocp.node.pool.memoryGB": "Memory assigned to each worker node VM",
   "tooltip.creation.ocp.node.pool.name": "The unique name of your node pool. The value must be a string that contains lowercase alphanumeric values, such as dev. Cannot be changed after creation.",
   "tooltip.creation.ocp.node.pool.replica.count": "The number of Worker Nodes in the cluster",
@@ -3202,6 +3212,7 @@
   "validation.missing.value": "{{0}} is required",
   "Value": "Value",
   "Value must be a valid IPv4 CIDR.": "Value must be a valid IPv4 CIDR.",
+  "Value must be in <namespace>/<name> format.": "Value must be in <namespace>/<name> format.",
   "Value must be integer greater than": "Value must be integer greater than {{0}}.",
   "values": "values",
   "Values": "Values",

diff --git a/frontend/src/components/TemplateEditor/TemplateEditor.js b/frontend/src/components/TemplateEditor/TemplateEditor.js
@@ -356,7 +356,7 @@ export default class TemplateEditor extends React.Component {
               </DrawerPanelContent>
             }
           >
-            <DrawerContentBody>
+            <DrawerContentBody style={{ height: '100%' }}>
               <PageSection isFilled type="wizard" style={{ height: '100%' }}>
                 {this.renderControls(isLoaded)}
               </PageSection>

diff --git a/frontend/src/components/TemplateEditor/utils/initialize-control-data.js b/frontend/src/components/TemplateEditor/utils/initialize-control-data.js
@@ -1,6 +1,7 @@
 /* Copyright Contributors to the Open Cluster Management project */
 'use strict'
 
+import { cloneDeep } from 'lodash'
 import get from 'lodash/get'
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -52,7 +53,17 @@ export const initializeControlData = (initialControlData, onControlInitialize, i
 const initialControl = (control, onControlInitialize) => {
   const { type, isInitialized } = control
   if (!isInitialized) {
+    let controlData
+    let active
+    if (control.controlData) {
+      controlData = cloneDeep(control.controlData)
+      active = cloneDeep(control.active)
+    }
     control = Object.assign({}, control)
+    if (controlData) {
+      control.controlData = controlData
+      control.active = active
+    }
 
     // initialize control's active value
     initializeControlActive(type, control)