Skip to content

Commit bf3d86c

Browse files
shyamradhakrishnanshyamradhakrishnan
authored
Add changes for crdsdev (#168)
1 parent 61d306c commit bf3d86c

File tree

7,258 files changed

+63
-1879285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

7,258 files changed

+63
-1879285
lines changed

‎Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ COPY controllers/ controllers/
1717
COPY cloud/ cloud/
1818
COPY exp/ exp/
1919
COPY feature/ feature/
20-
COPY vendor/ vendor/
2120
COPY version/ version/
2221

2322
# Build

‎api/v1beta1/types.go‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,11 @@ type AmdMilanBmPlatformConfig struct {
265265
PercentageOfCoresEnabled *int `json:"percentageOfCoresEnabled,omitempty"`
266266

267267
// The number of NUMA nodes per socket (NPS).
268+
// The following values are supported:
269+
// * `NPS0`
270+
// * `NPS1`
271+
// * `NPS2`
272+
// * `NPS4`
268273
NumaNodesPerSocket AmdMilanBmPlatformConfigNumaNodesPerSocketEnum `json:"numaNodesPerSocket,omitempty"`
269274
}
270275

@@ -318,6 +323,11 @@ type AmdRomeBmPlatformConfig struct {
318323
PercentageOfCoresEnabled *int `json:"percentageOfCoresEnabled,omitempty"`
319324

320325
// The number of NUMA nodes per socket (NPS).
326+
// The following values are supported:
327+
// * `NPS0`
328+
// * `NPS1`
329+
// * `NPS2`
330+
// * `NPS4`
321331
NumaNodesPerSocket AmdRomeBmPlatformConfigNumaNodesPerSocketEnum `json:"numaNodesPerSocket,omitempty"`
322332
}
323333

@@ -377,6 +387,11 @@ type AmdRomeBmGpuPlatformConfig struct {
377387
IsInputOutputMemoryManagementUnitEnabled *bool `json:"isInputOutputMemoryManagementUnitEnabled,omitempty"`
378388

379389
// The number of NUMA nodes per socket (NPS).
390+
// The following values are supported:
391+
// * `NPS0`
392+
// * `NPS1`
393+
// * `NPS2`
394+
// * `NPS4`
380395
NumaNodesPerSocket AmdRomeBmGpuPlatformConfigNumaNodesPerSocketEnum `json:"numaNodesPerSocket,omitempty"`
381396
}
382397

@@ -421,6 +436,9 @@ type IntelIcelakeBmPlatformConfig struct {
421436
PercentageOfCoresEnabled *int `json:"percentageOfCoresEnabled,omitempty"`
422437

423438
// The number of NUMA nodes per socket (NPS).
439+
// The following values are supported:
440+
// * `NPS1`
441+
// * `NPS2`
424442
NumaNodesPerSocket IntelIcelakeBmPlatformConfigNumaNodesPerSocketEnum `json:"numaNodesPerSocket,omitempty"`
425443
}
426444

@@ -484,6 +502,7 @@ type LaunchInstanceAvailabilityConfig struct {
484502

485503
// PreemptibleInstanceConfig Configuration options for preemptible instances.
486504
type PreemptibleInstanceConfig struct {
505+
// TerminatePreemptionAction terminates the preemptible instance when it is interrupted for eviction.
487506
TerminatePreemptionAction *TerminatePreemptionAction `json:"terminatePreemptionAction,omitempty"`
488507
}
489508

@@ -556,6 +575,9 @@ type InstanceAgentPluginConfig struct {
556575
// DesiredState defines whether the plugin should be enabled or disabled.
557576
// To enable the monitoring and management plugins, the `isMonitoringDisabled` and
558577
// `isManagementDisabled` attributes must also be set to false.
578+
// The following values are supported:
579+
// * `ENABLED`
580+
// * `DISABLED`
559581
DesiredState InstanceAgentPluginConfigDetailsDesiredStateEnum `json:"desiredState,omitempty"`
560582
}
561583

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ocimachines.yaml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,11 @@ spec:
8686
of plugins associated with this instance.
8787
properties:
8888
desiredState:
89-
description: DesiredState defines whether the plugin should
89+
description: 'DesiredState defines whether the plugin should
9090
be enabled or disabled. To enable the monitoring and management
9191
plugins, the `isMonitoringDisabled` and `isManagementDisabled`
92-
attributes must also be set to false.
92+
attributes must also be set to false. The following values
93+
are supported: * `ENABLED` * `DISABLED`'
9394
type: string
9495
name:
9596
description: Name defines the name of the plugin. To get
@@ -344,7 +345,9 @@ spec:
344345
enabled on the instance.
345346
type: boolean
346347
numaNodesPerSocket:
347-
description: The number of NUMA nodes per socket (NPS).
348+
description: 'The number of NUMA nodes per socket (NPS). The
349+
following values are supported: * `NPS0` * `NPS1` * `NPS2`
350+
* `NPS4`'
348351
type: string
349352
percentageOfCoresEnabled:
350353
description: The percentage of cores enabled. Value must be
@@ -400,7 +403,9 @@ spec:
400403
enabled on the instance.
401404
type: boolean
402405
numaNodesPerSocket:
403-
description: The number of NUMA nodes per socket (NPS).
406+
description: 'The number of NUMA nodes per socket (NPS). The
407+
following values are supported: * `NPS0` * `NPS1` * `NPS2`
408+
* `NPS4`'
404409
type: string
405410
type: object
406411
amdRomeBmPlatformConfig:
@@ -444,7 +449,9 @@ spec:
444449
enabled on the instance.
445450
type: boolean
446451
numaNodesPerSocket:
447-
description: The number of NUMA nodes per socket (NPS).
452+
description: 'The number of NUMA nodes per socket (NPS). The
453+
following values are supported: * `NPS0` * `NPS1` * `NPS2`
454+
* `NPS4`'
448455
type: string
449456
percentageOfCoresEnabled:
450457
description: The percentage of cores enabled. Value must be
@@ -506,7 +513,8 @@ spec:
506513
enabled on the instance.
507514
type: boolean
508515
numaNodesPerSocket:
509-
description: The number of NUMA nodes per socket (NPS).
516+
description: 'The number of NUMA nodes per socket (NPS). The
517+
following values are supported: * `NPS1` * `NPS2`'
510518
type: string
511519
percentageOfCoresEnabled:
512520
description: The percentage of cores enabled. Value must be
@@ -566,7 +574,7 @@ spec:
566574
instances.
567575
properties:
568576
terminatePreemptionAction:
569-
description: TerminatePreemptionAction Terminates the preemptible
577+
description: TerminatePreemptionAction terminates the preemptible
570578
instance when it is interrupted for eviction.
571579
properties:
572580
preserveBootVolume:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ocimachinetemplates.yaml‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,12 @@ spec:
9898
of plugins associated with this instance.
9999
properties:
100100
desiredState:
101-
description: DesiredState defines whether the plugin
101+
description: 'DesiredState defines whether the plugin
102102
should be enabled or disabled. To enable the monitoring
103103
and management plugins, the `isMonitoringDisabled`
104104
and `isManagementDisabled` attributes must also
105-
be set to false.
105+
be set to false. The following values are supported:
106+
* `ENABLED` * `DISABLED`'
106107
type: string
107108
name:
108109
description: Name defines the name of the plugin.
@@ -374,7 +375,9 @@ spec:
374375
is enabled on the instance.
375376
type: boolean
376377
numaNodesPerSocket:
377-
description: The number of NUMA nodes per socket (NPS).
378+
description: 'The number of NUMA nodes per socket
379+
(NPS). The following values are supported: * `NPS0`
380+
* `NPS1` * `NPS2` * `NPS4`'
378381
type: string
379382
percentageOfCoresEnabled:
380383
description: The percentage of cores enabled. Value
@@ -435,7 +438,9 @@ spec:
435438
is enabled on the instance.
436439
type: boolean
437440
numaNodesPerSocket:
438-
description: The number of NUMA nodes per socket (NPS).
441+
description: 'The number of NUMA nodes per socket
442+
(NPS). The following values are supported: * `NPS0`
443+
* `NPS1` * `NPS2` * `NPS4`'
439444
type: string
440445
type: object
441446
amdRomeBmPlatformConfig:
@@ -483,7 +488,9 @@ spec:
483488
is enabled on the instance.
484489
type: boolean
485490
numaNodesPerSocket:
486-
description: The number of NUMA nodes per socket (NPS).
491+
description: 'The number of NUMA nodes per socket
492+
(NPS). The following values are supported: * `NPS0`
493+
* `NPS1` * `NPS2` * `NPS4`'
487494
type: string
488495
percentageOfCoresEnabled:
489496
description: The percentage of cores enabled. Value
@@ -550,7 +557,9 @@ spec:
550557
is enabled on the instance.
551558
type: boolean
552559
numaNodesPerSocket:
553-
description: The number of NUMA nodes per socket (NPS).
560+
description: 'The number of NUMA nodes per socket
561+
(NPS). The following values are supported: * `NPS1`
562+
* `NPS2`'
554563
type: string
555564
percentageOfCoresEnabled:
556565
description: The percentage of cores enabled. Value
@@ -613,7 +622,7 @@ spec:
613622
for preemptible instances.
614623
properties:
615624
terminatePreemptionAction:
616-
description: TerminatePreemptionAction Terminates the
625+
description: TerminatePreemptionAction terminates the
617626
preemptible instance when it is interrupted for eviction.
618627
properties:
619628
preserveBootVolume:

‎docs/src/SUMMARY.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@
3232
- [Custom Networking](./networking/custom-networking.md)
3333
- [Private Cluster](./networking/private-cluster.md)
3434
- [Reference](./reference/reference.md)
35+
- [API Reference](./reference/api-reference.md)
3536
- [Glossary](./reference/glossary.md)

‎docs/src/reference/api-reference.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# API Reference
2+
3+
Cluster API Provider for OCI API Reference is published [here](https://doc.crds.dev/github.com/oracle/cluster-api-provider-oci).
4+

‎test/e2e/config/e2e_conf.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ variables:
7878
EXP_CLUSTER_RESOURCE_SET: "true"
7979
NODE_DRAIN_TIMEOUT: "60s"
8080
CI_VERSION: ""
81-
CNI: "${PWD}/test/e2e/data/cni/calico.yaml"
82-
ANTREA_CNI: "${PWD}/test/e2e/data/cni/antrea.yaml"
81+
CNI: "${PWD}/test/e2e/data/cni/calico"
82+
ANTREA_CNI: "${PWD}/test/e2e/data/cni/antrea"
8383
CCM_PATH: "${PWD}/test/e2e/data/ccm/ccm.yaml"
8484
CONFORMANCE_WORKER_MACHINE_COUNT: "2"
8585
CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"

‎test/e2e/data/cni/README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
The yaml file extension for the files in this folder has been removed so that the CRDs referenced
2+
in the files are not added to CAPOCI API
3+
reference documentation here https://doc.crds.dev/github.com/oracle/cluster-api-provider-oci

‎test/e2e/data/cni/antrea.yaml‎ renamed to ‎test/e2e/data/cni/antrea‎

File renamed without changes.

‎test/e2e/data/cni/calico.yaml‎ renamed to ‎test/e2e/data/cni/calico‎

File renamed without changes.

0 commit comments

Comments
 (0)