Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion locales/en/plugin__networking-console-plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
"At creation time the namespace must be configured with <2>{{label}}</2> label. Go to <5>Namespaces</5> to create a new namespace.": "At creation time the namespace must be configured with <2>{{label}}</2> label. Go to <5>Namespaces</5> to create a new namespace.",
"At least one port is required": "At least one port is required",
"Backend health": "Backend health",
"Bridge mapping": "Bridge mapping",
"Bridge name": "Bridge name",
"Browse...": "Browse...",
"CA certificate": "CA certificate",
Expand Down Expand Up @@ -321,6 +320,7 @@
"Percent": "Percent",
"Persistent": "Persistent",
"Phase": "Phase",
"Physical network name": "Physical network name",
"Physical network name. A bridge mapping must be configured on cluster nodes to map between physical network names and Open vSwitch bridges.": "Physical network name. A bridge mapping must be configured on cluster nodes to map between physical network names and Open vSwitch bridges.",
"Please <2>try again</2>.": "Please <2>try again</2>.",
"Pod crash loop back-off": "Pod crash loop back-off",
Expand Down
2 changes: 1 addition & 1 deletion locales/es/plugin__networking-console-plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
"At creation time the namespace must be configured with <2>{{label}}</2> label. Go to <5>Namespaces</5> to create a new namespace.": "En el momento de la creación, el espacio de nombre debe configurarse con la etiqueta <2>{{label}}</2>. Vaya a<5> Espacios de nombre</5> para crear un nuevo espacio de nombre.",
"At least one port is required": "Se requiere al menos un puerto",
"Backend health": "Estado del backend",
"Bridge mapping": "Mapeo de puentes",
"Bridge name": "Nombre del puente",
"Browse...": "Navegar...",
"CA certificate": "Certificado de CA",
Expand Down Expand Up @@ -324,6 +323,7 @@
"Percent": "Por ciento",
"Persistent": "Persistente",
"Phase": "Fase",
"Physical network name": "Nombre de la red física",
"Physical network name. A bridge mapping must be configured on cluster nodes to map between physical network names and Open vSwitch bridges.": "Nombre de la red física. Se debe configurar una asignación de puentes en los nodos del clúster para asignar entre los nombres de redes físicas y los puentes Open vSwitch.",
"Please <2>try again</2>.": "<2>Inténtelo de nuevo</2>.",
"Pod crash loop back-off": "Retroceso del bucle de caída del pod",
Expand Down
2 changes: 1 addition & 1 deletion locales/fr/plugin__networking-console-plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
"At creation time the namespace must be configured with <2>{{label}}</2> label. Go to <5>Namespaces</5> to create a new namespace.": "Lors de sa création, l'espace de noms doit être configuré avec<2>{{label}}</2> étiquette. Aller à<5> Espaces de noms</5> pour créer un nouvel espace de noms.",
"At least one port is required": "Au moins un port est requis",
"Backend health": "État de fonctionnement du backend",
"Bridge mapping": "Mappage de ponts",
"Bridge name": "Nom du pont",
"Browse...": "Parcourir...",
"CA certificate": "Certificat d’autorité de certification",
Expand Down Expand Up @@ -324,6 +323,7 @@
"Percent": "Pourcent",
"Persistent": "Persistant",
"Phase": "Phase",
"Physical network name": "Nom du réseau physique",
"Physical network name. A bridge mapping must be configured on cluster nodes to map between physical network names and Open vSwitch bridges.": "Nom du réseau physique. Un mappage de ponts doit être configuré sur les nœuds du cluster pour mapper les noms de réseaux physiques et les ponts Open\u00a0vSwitch.",
"Please <2>try again</2>.": "Veuillez <2>réessayer</2>.",
"Pod crash loop back-off": "Interruption de la boucle d’incidents du pod",
Expand Down
2 changes: 1 addition & 1 deletion locales/ja/plugin__networking-console-plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
"At creation time the namespace must be configured with <2>{{label}}</2> label. Go to <5>Namespaces</5> to create a new namespace.": "作成時に、namespace に <2>{{label}}</2> ラベルを設定する必要があります。<5>Namespaces</5> に移動して、新しい namespace を作成してください。",
"At least one port is required": "少なくとも 1 つのポートが必要です",
"Backend health": "バックエンドの健全性",
"Bridge mapping": "ブリッジマッピング",
"Bridge name": "ブリッジ名",
"Browse...": "参照...",
"CA certificate": "CA 証明書",
Expand Down Expand Up @@ -321,6 +320,7 @@
"Percent": "パーセント",
"Persistent": "永続的",
"Phase": "フェーズ",
"Physical network name": "物理ネットワーク名",
"Physical network name. A bridge mapping must be configured on cluster nodes to map between physical network names and Open vSwitch bridges.": "物理ネットワーク名。物理ネットワーク名と Open vSwitch ブリッジの間をマッピングするには、クラスターノード上にブリッジマッピングを設定する必要があります。",
"Please <2>try again</2>.": "<2>再試行</2> してください。",
"Pod crash loop back-off": "Pod クラッシュループのバックオフ",
Expand Down
2 changes: 1 addition & 1 deletion locales/ko/plugin__networking-console-plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
"At creation time the namespace must be configured with <2>{{label}}</2> label. Go to <5>Namespaces</5> to create a new namespace.": "생성 시 <2>{{label}}</2> 라벨을 사용하여 네임스페이스를 구성해야 합니다. 새 네임스페이스를 생성하려면 <5>Namespaces</5> 로 이동하십시오.",
"At least one port is required": "하나 이상의 포트가 필요합니다.",
"Backend health": "백엔드 상태",
"Bridge mapping": "브리지 매핑",
"Bridge name": "브리지 이름",
"Browse...": "찾아보기...",
"CA certificate": "CA 인증서",
Expand Down Expand Up @@ -321,6 +320,7 @@
"Percent": "백분율",
"Persistent": "영구적",
"Phase": "단계",
"Physical network name": "물리적 네트워크 이름",
"Physical network name. A bridge mapping must be configured on cluster nodes to map between physical network names and Open vSwitch bridges.": "물리적 네트워크 이름. 브리지 매핑은 물리적 네트워크 이름과 Open vSwitch 브리지 간에 매핑하려면 클러스터 노드에 구성해야 합니다.",
"Please <2>try again</2>.": "<2>다시 시도</2>하십시오",
"Pod crash loop back-off": "Pod 크래시 루프 백오프",
Expand Down
2 changes: 1 addition & 1 deletion locales/zh/plugin__networking-console-plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
"At creation time the namespace must be configured with <2>{{label}}</2> label. Go to <5>Namespaces</5> to create a new namespace.": "在创建时,命名空间必须配置带有 <2>{{label}}</2> 标签。进入 <5>Namespaces</5> 以创建一个新命名空间。",
"At least one port is required": "至少需要一个端口",
"Backend health": "后端健康状况",
"Bridge mapping": "网桥映射",
"Bridge name": "网桥名称",
"Browse...": "浏览...",
"CA certificate": "CA 证书",
Expand Down Expand Up @@ -321,6 +320,7 @@
"Percent": "百分比",
"Persistent": "持久性",
"Phase": "阶段",
"Physical network name": "物理网络名称",
"Physical network name. A bridge mapping must be configured on cluster nodes to map between physical network names and Open vSwitch bridges.": "物理网络名称。必须在集群节点上配置网桥映射,以便在物理网络名称和 Open vSwitch 网桥之间进行映射。",
"Please <2>try again</2>.": "请<2>再次尝试</2>。",
"Pod crash loop back-off": "Pod 崩溃(crash loop back-off)",
Expand Down
1 change: 1 addition & 0 deletions src/utils/resources/nads/types/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export type NetworkAttachmentDefinitionConfig = {
mtu?: number;
name: string;
netAttachDefName?: string;
physicalNetworkName?: string;
plugins?: NetworkAttachmentDefinitionPlugin[];
preserveDefaultVlan?: boolean;
role?: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ const OVNK8sSecondaryLocalnetParameters: FC = () => {
return (
<>
<FormGroup
fieldId="nads-ovn-physical-network-name"
isRequired
label={t('Bridge mapping')}
label={t('Physical network name')}
labelHelp={
<PopoverHelpIcon
bodyContent={t(
Expand All @@ -51,6 +52,8 @@ const OVNK8sSecondaryLocalnetParameters: FC = () => {
{...register(`${baseId}.bridgeMapping`, {
required: true,
})}
data-test="nads-ovn-physical-network-name"
id="nads-ovn-physical-network-name"
/>
</FormGroup>
<FormGroup label={t('MTU')}>
Expand Down
4 changes: 2 additions & 2 deletions src/views/nads/form/utils/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ const buildConfig = (
cniVersion: '0.4.0',
excludeSubnets: networkTypeData?.excludeSubnets ?? undefined,
mtu: parseInt(networkTypeData?.mtu, 10) || DEFAULT_MTU,
name: networkTypeData?.bridgeMapping,
netAttachDefName,
physicalNetworkName: networkTypeData?.bridgeMapping,
subnets,
topology: ovnK8sTopologyKeys.ovnK8sLocalnet,
type: NetworkTypeKeys.ovnKubernetesNetworkType,
Expand Down Expand Up @@ -106,7 +106,7 @@ export const fromNADObjToFormData = (
subnets: configParsed?.subnets,
},
[NetworkTypeKeys.ovnKubernetesSecondaryLocalnet]: {
bridgeMapping: configParsed?.name,
bridgeMapping: configParsed?.physicalNetworkName || configParsed?.name,
excludeSubnets: configParsed?.excludeSubnets,
mtu: (configParsed?.mtu || DEFAULT_MTU)?.toString(),
subnets: configParsed?.subnets,
Expand Down