Skip to content

Commit

Permalink
Add changes for crdsdev (#168)
Browse files Browse the repository at this point in the history
  • Loading branch information
@shyamradhakrishnan
shyamradhakrishnan committed Sep 22, 2022
1 parent 61d306c commit bf3d86c
Show file tree
Hide file tree
Showing 7,258 changed files with 63 additions and 1,879,285 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 0 additions & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ COPY controllers/ controllers/
COPY cloud/ cloud/
COPY exp/ exp/
COPY feature/ feature/
COPY vendor/ vendor/
COPY version/ version/

# Build
Expand Down
22 changes: 22 additions & 0 deletions api/v1beta1/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,11 @@ type AmdMilanBmPlatformConfig struct {
PercentageOfCoresEnabled *int `json:"percentageOfCoresEnabled,omitempty"`

// The number of NUMA nodes per socket (NPS).
// The following values are supported:
// * `NPS0`
// * `NPS1`
// * `NPS2`
// * `NPS4`
NumaNodesPerSocket AmdMilanBmPlatformConfigNumaNodesPerSocketEnum `json:"numaNodesPerSocket,omitempty"`
}

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

// The number of NUMA nodes per socket (NPS).
// The following values are supported:
// * `NPS0`
// * `NPS1`
// * `NPS2`
// * `NPS4`
NumaNodesPerSocket AmdRomeBmPlatformConfigNumaNodesPerSocketEnum `json:"numaNodesPerSocket,omitempty"`
}

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

// The number of NUMA nodes per socket (NPS).
// The following values are supported:
// * `NPS0`
// * `NPS1`
// * `NPS2`
// * `NPS4`
NumaNodesPerSocket AmdRomeBmGpuPlatformConfigNumaNodesPerSocketEnum `json:"numaNodesPerSocket,omitempty"`
}

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

// The number of NUMA nodes per socket (NPS).
// The following values are supported:
// * `NPS1`
// * `NPS2`
NumaNodesPerSocket IntelIcelakeBmPlatformConfigNumaNodesPerSocketEnum `json:"numaNodesPerSocket,omitempty"`
}

Expand Down Expand Up @@ -484,6 +502,7 @@ type LaunchInstanceAvailabilityConfig struct {

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

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

Expand Down
22 changes: 15 additions & 7 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_ocimachines.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,11 @@ spec:
of plugins associated with this instance.
properties:
desiredState:
description: DesiredState defines whether the plugin should
description: 'DesiredState defines whether the plugin should
be enabled or disabled. To enable the monitoring and management
plugins, the `isMonitoringDisabled` and `isManagementDisabled`
attributes must also be set to false.
attributes must also be set to false. The following values
are supported: * `ENABLED` * `DISABLED`'
type: string
name:
description: Name defines the name of the plugin. To get
Expand Down Expand Up @@ -344,7 +345,9 @@ spec:
enabled on the instance.
type: boolean
numaNodesPerSocket:
description: The number of NUMA nodes per socket (NPS).
description: 'The number of NUMA nodes per socket (NPS). The
following values are supported: * `NPS0` * `NPS1` * `NPS2`
* `NPS4`'
type: string
percentageOfCoresEnabled:
description: The percentage of cores enabled. Value must be
Expand Down Expand Up @@ -400,7 +403,9 @@ spec:
enabled on the instance.
type: boolean
numaNodesPerSocket:
description: The number of NUMA nodes per socket (NPS).
description: 'The number of NUMA nodes per socket (NPS). The
following values are supported: * `NPS0` * `NPS1` * `NPS2`
* `NPS4`'
type: string
type: object
amdRomeBmPlatformConfig:
Expand Down Expand Up @@ -444,7 +449,9 @@ spec:
enabled on the instance.
type: boolean
numaNodesPerSocket:
description: The number of NUMA nodes per socket (NPS).
description: 'The number of NUMA nodes per socket (NPS). The
following values are supported: * `NPS0` * `NPS1` * `NPS2`
* `NPS4`'
type: string
percentageOfCoresEnabled:
description: The percentage of cores enabled. Value must be
Expand Down Expand Up @@ -506,7 +513,8 @@ spec:
enabled on the instance.
type: boolean
numaNodesPerSocket:
description: The number of NUMA nodes per socket (NPS).
description: 'The number of NUMA nodes per socket (NPS). The
following values are supported: * `NPS1` * `NPS2`'
type: string
percentageOfCoresEnabled:
description: The percentage of cores enabled. Value must be
Expand Down Expand Up @@ -566,7 +574,7 @@ spec:
instances.
properties:
terminatePreemptionAction:
description: TerminatePreemptionAction Terminates the preemptible
description: TerminatePreemptionAction terminates the preemptible
instance when it is interrupted for eviction.
properties:
preserveBootVolume:
Expand Down
23 changes: 16 additions & 7 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_ocimachinetemplates.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,12 @@ spec:
of plugins associated with this instance.
properties:
desiredState:
description: DesiredState defines whether the plugin
description: 'DesiredState defines whether the plugin
should be enabled or disabled. To enable the monitoring
and management plugins, the `isMonitoringDisabled`
and `isManagementDisabled` attributes must also
be set to false.
be set to false. The following values are supported:
* `ENABLED` * `DISABLED`'
type: string
name:
description: Name defines the name of the plugin.
Expand Down Expand Up @@ -374,7 +375,9 @@ spec:
is enabled on the instance.
type: boolean
numaNodesPerSocket:
description: The number of NUMA nodes per socket (NPS).
description: 'The number of NUMA nodes per socket
(NPS). The following values are supported: * `NPS0`
* `NPS1` * `NPS2` * `NPS4`'
type: string
percentageOfCoresEnabled:
description: The percentage of cores enabled. Value
Expand Down Expand Up @@ -435,7 +438,9 @@ spec:
is enabled on the instance.
type: boolean
numaNodesPerSocket:
description: The number of NUMA nodes per socket (NPS).
description: 'The number of NUMA nodes per socket
(NPS). The following values are supported: * `NPS0`
* `NPS1` * `NPS2` * `NPS4`'
type: string
type: object
amdRomeBmPlatformConfig:
Expand Down Expand Up @@ -483,7 +488,9 @@ spec:
is enabled on the instance.
type: boolean
numaNodesPerSocket:
description: The number of NUMA nodes per socket (NPS).
description: 'The number of NUMA nodes per socket
(NPS). The following values are supported: * `NPS0`
* `NPS1` * `NPS2` * `NPS4`'
type: string
percentageOfCoresEnabled:
description: The percentage of cores enabled. Value
Expand Down Expand Up @@ -550,7 +557,9 @@ spec:
is enabled on the instance.
type: boolean
numaNodesPerSocket:
description: The number of NUMA nodes per socket (NPS).
description: 'The number of NUMA nodes per socket
(NPS). The following values are supported: * `NPS1`
* `NPS2`'
type: string
percentageOfCoresEnabled:
description: The percentage of cores enabled. Value
Expand Down Expand Up @@ -613,7 +622,7 @@ spec:
for preemptible instances.
properties:
terminatePreemptionAction:
description: TerminatePreemptionAction Terminates the
description: TerminatePreemptionAction terminates the
preemptible instance when it is interrupted for eviction.
properties:
preserveBootVolume:
Expand Down
1 change: 1 addition & 0 deletions docs/src/SUMMARY.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@
- [Custom Networking](./networking/custom-networking.md)
- [Private Cluster](./networking/private-cluster.md)
- [Reference](./reference/reference.md)
- [API Reference](./reference/api-reference.md)
- [Glossary](./reference/glossary.md)
4 changes: 4 additions & 0 deletions docs/src/reference/api-reference.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# API Reference

Cluster API Provider for OCI API Reference is published [here](https://doc.crds.dev/github.com/oracle/cluster-api-provider-oci).

4 changes: 2 additions & 2 deletions test/e2e/config/e2e_conf.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ variables:
EXP_CLUSTER_RESOURCE_SET: "true"
NODE_DRAIN_TIMEOUT: "60s"
CI_VERSION: ""
CNI: "${PWD}/test/e2e/data/cni/calico.yaml"
ANTREA_CNI: "${PWD}/test/e2e/data/cni/antrea.yaml"
CNI: "${PWD}/test/e2e/data/cni/calico"
ANTREA_CNI: "${PWD}/test/e2e/data/cni/antrea"
CCM_PATH: "${PWD}/test/e2e/data/ccm/ccm.yaml"
CONFORMANCE_WORKER_MACHINE_COUNT: "2"
CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
Expand Down
3 changes: 3 additions & 0 deletions test/e2e/data/cni/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
The yaml file extension for the files in this folder has been removed so that the CRDs referenced
in the files are not added to CAPOCI API
reference documentation here https://doc.crds.dev/github.com/oracle/cluster-api-provider-oci
0 test/e2e/data/cni/antrea.yaml → test/e2e/data/cni/antrea
View file
File renamed without changes.
0 test/e2e/data/cni/calico.yaml → test/e2e/data/cni/calico
View file
File renamed without changes.

0 comments on commit bf3d86c

Please sign in to comment.