Skip to content

Commit 38a4cda

Browse files
committed
refactor(web): Remove LB nodes from kuber service in Ansible template
- Add placeholder for k8s nodes inputs - Update select combobox version
1 parent 97299e4 commit 38a4cda

6 files changed

Lines changed: 12 additions & 67 deletions

File tree

web/src/pages/ansible/kuber/components/k8s-master-nodes.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ const K8SMasterNodes: FC = () => {
1313

1414
return (
1515
<div>
16-
<div className="flex items-center mb-2">
16+
<div className="mb-2 flex items-center">
1717
<p className="text-lg font-bold">K8s Master Nodes</p>
18-
<button type="button" onClick={append} className="ml-4 btn btn-xs">
18+
<button type="button" onClick={append} className="btn btn-xs ml-4">
1919
Add <Plus className="size-3" />
2020
</button>
2121
</div>
@@ -25,6 +25,7 @@ const K8SMasterNodes: FC = () => {
2525
<FormInput
2626
id={`k8s_master_nodes.${nodeIdx}`}
2727
name={`k8s_master_nodes.${nodeIdx}.value`}
28+
placeholder="www.example.com"
2829
label=""
2930
/>
3031
{nodeIdx > 0 && (

web/src/pages/ansible/kuber/components/k8s-worker-nodes.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ const K8SWorkerNodes: FC = () => {
1313

1414
return (
1515
<div>
16-
<div className="flex items-center mb-2">
16+
<div className="mb-2 flex items-center">
1717
<p className="text-lg font-bold">K8s Worker Nodes</p>
18-
<button type="button" onClick={append} className="ml-4 btn btn-xs">
18+
<button type="button" onClick={append} className="btn btn-xs ml-4">
1919
Add <Plus className="size-3" />
2020
</button>
2121
</div>
@@ -25,6 +25,7 @@ const K8SWorkerNodes: FC = () => {
2525
<FormInput
2626
id={`k8s_worker_nodes.${nodeIdx}`}
2727
name={`k8s_worker_nodes.${nodeIdx}.value`}
28+
placeholder="www.example.com"
2829
label=""
2930
/>
3031
{nodeIdx > 0 && (

web/src/pages/ansible/kuber/components/lb-nodes.tsx

Lines changed: 0 additions & 45 deletions
This file was deleted.

web/src/pages/ansible/kuber/data/select-options.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ export const OSOptions = [
66
];
77

88
export const versionOptions = [
9+
{
10+
label: '1.31',
11+
value: '1.31',
12+
},
913
{
1014
label: '1.30',
1115
value: '1.30',
@@ -14,8 +18,4 @@ export const versionOptions = [
1418
label: '1.29',
1519
value: '1.29',
1620
},
17-
{
18-
label: '1.28',
19-
value: '1.28',
20-
},
2121
];

web/src/pages/ansible/kuber/kuber.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import { isAxiosError } from 'axios';
1919
import { toast } from 'sonner';
2020
import K8SMasterNodes from './components/k8s-master-nodes';
2121
import K8SWorkerNodes from './components/k8s-worker-nodes';
22-
import LBNodes from './components/lb-nodes';
2322

2423
const KubernetesAnsible: FC = () => {
2524
const { mutateAsync: kuberAnsibleMutate, isPending: kuberAnsiblePending } =
@@ -39,7 +38,6 @@ const KubernetesAnsible: FC = () => {
3938
os: { label: 'Ubuntu', value: 'ubuntu' },
4039
k8s_worker_nodes: [{ value: '' }],
4140
k8s_master_nodes: [{ value: '' }],
42-
lb_nodes: [{ value: '' }],
4341
};
4442

4543
const methods = useForm<KuberAnsible>({
@@ -53,7 +51,6 @@ const KubernetesAnsible: FC = () => {
5351
...data,
5452
k8s_worker_nodes: data.k8s_worker_nodes.map((worker) => worker.value),
5553
k8s_master_nodes: data.k8s_master_nodes.map((master) => master.value),
56-
lb_nodes: data.lb_nodes.map((lb) => lb.value),
5754
os: data.os.value,
5855
version: data.version.value,
5956
};
@@ -107,9 +104,6 @@ const KubernetesAnsible: FC = () => {
107104
<div className="mb-4">
108105
<K8SWorkerNodes />
109106
</div>
110-
<div className="mb-4">
111-
<LBNodes />
112-
</div>
113107
<div className="mb-4">
114108
<FormSelect
115109
name={`version`}

web/src/pages/ansible/kuber/kuber.types.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export interface KuberAnsibleBody {
1010
os: string;
1111
k8s_worker_nodes: string[];
1212
k8s_master_nodes: string[];
13-
lb_nodes: string[];
1413
version: string;
1514
}
1615

@@ -37,18 +36,13 @@ export const kuberAnsibleSchema = zod.object({
3736
k8s_worker_nodes: zod
3837
.array(
3938
zod.object({
40-
value: zod.string().min(1, 'Required!'),
39+
value: zod.string().min(1, 'Required!').default('www.example.com'),
4140
}),
4241
)
4342
.min(1),
4443
k8s_master_nodes: zod.array(
4544
zod.object({
46-
value: zod.string().min(1, 'Required!'),
47-
}),
48-
),
49-
lb_nodes: zod.array(
50-
zod.object({
51-
value: zod.string().min(1, 'Required!'),
45+
value: zod.string().min(1, 'Required!').default('www.example.com'),
5246
}),
5347
),
5448
version: zod.object({

0 commit comments

Comments
 (0)