Skip to content

Commit

Permalink
Revert "ACM-15128 networking options support for node pools HCP clust…
Browse files Browse the repository at this point in the history
…er (#4183)"

This reverts commit af442b9.
  • Loading branch information
vishsanghishetty authored Jan 22, 2025
1 parent af442b9 commit 79435ae
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 775 deletions.
11 changes: 0 additions & 11 deletions frontend/public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,6 @@
"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",
Expand Down Expand Up @@ -417,7 +416,6 @@
"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",
Expand Down Expand Up @@ -524,7 +522,6 @@
"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",
Expand Down Expand Up @@ -793,7 +790,6 @@
"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",
Expand Down Expand Up @@ -1308,7 +1304,6 @@
"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",
Expand Down Expand Up @@ -1884,13 +1879,11 @@
"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",
Expand All @@ -1900,7 +1893,6 @@
"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",
Expand Down Expand Up @@ -3024,7 +3016,6 @@
"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.",
Expand Down Expand Up @@ -3058,7 +3049,6 @@
"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",
Expand Down Expand Up @@ -3212,7 +3202,6 @@
"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",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/TemplateEditor/TemplateEditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ export default class TemplateEditor extends React.Component {
</DrawerPanelContent>
}
>
<DrawerContentBody style={{ height: '100%' }}>
<DrawerContentBody>
<PageSection isFilled type="wizard" style={{ height: '100%' }}>
{this.renderControls(isLoaded)}
</PageSection>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright Contributors to the Open Cluster Management project */
'use strict'

import { cloneDeep } from 'lodash'
import get from 'lodash/get'

///////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -53,17 +52,7 @@ 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)
Expand Down
Loading

0 comments on commit 79435ae

Please sign in to comment.