Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add node pool status in machine pool status #338

Merged
merged 4 commits into from
Oct 17, 2023
Merged

Add node pool status in machine pool status #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff299de
Add node pool status in machine pool status
shyamradhakrishnan Oct 16, 2023
a2ea6b2
Add node pool status in machine pool status
shyamradhakrishnan Oct 16, 2023
f4b12ba
Merge branch 'oracle:main' into add_oke_nodepool_state
shyamradhakrishnan Oct 16, 2023
56f5cdf
Add node pool state in machine pool status
shyamradhakrishnan Oct 16, 2023
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
20 changes: 16 additions & 4 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_ociclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1373,7 +1373,10 @@ spec:
If the rule''s `destination` is the
`cidrBlock` value for a Service (the
rule is for traffic destined for a particular
`Service` through a service gateway).'
`Service` through a service gateway).
shyamradhakrishnan marked this conversation as resolved.
Show resolved Hide resolved
* `NETWORK_SECURITY_GROUP`: If the rule''s
`destination` is the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
of a NetworkSecurityGroup.'
type: string
icmpOptions:
description: 'IcmpOptions Optional and
Expand Down Expand Up @@ -1605,7 +1608,10 @@ spec:
If the rule''s `source` is the `cidrBlock`
value for a Service (the rule is for
traffic coming from a particular `Service`
through a service gateway).'
through a service gateway). * `NETWORK_SECURITY_GROUP`:
If the rule''s `destination` is the
OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
of a NetworkSecurityGroup.'
type: string
tcpOptions:
description: TcpOptions Optional and valid
Expand Down Expand Up @@ -1806,7 +1812,10 @@ spec:
* `SERVICE_CIDR_BLOCK`: If the rule''s `destination`
is the `cidrBlock` value for a Service (the
rule is for traffic destined for a particular
`Service` through a service gateway).'
`Service` through a service gateway). *
`NETWORK_SECURITY_GROUP`: If the rule''s
`destination` is the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
of a NetworkSecurityGroup.'
type: string
icmpOptions:
description: 'IcmpOptions Optional and valid
Expand Down Expand Up @@ -2018,7 +2027,10 @@ spec:
If the rule''s `source` is the `cidrBlock`
value for a Service (the rule is for traffic
coming from a particular `Service` through
a service gateway).'
a service gateway). * `NETWORK_SECURITY_GROUP`:
If the rule''s `destination` is the OCID
(https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
of a NetworkSecurityGroup.'
type: string
tcpOptions:
description: TcpOptions Optional and valid
Expand Down
23 changes: 19 additions & 4 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_ociclustertemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,7 +1439,11 @@ spec:
is the `cidrBlock` value for
a Service (the rule is for traffic
destined for a particular `Service`
through a service gateway).'
through a service gateway).
* `NETWORK_SECURITY_GROUP`:
If the rule''s `destination`
is the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
of a NetworkSecurityGroup.'
type: string
icmpOptions:
description: 'IcmpOptions Optional
Expand Down Expand Up @@ -1708,7 +1712,11 @@ spec:
`cidrBlock` value for a Service
(the rule is for traffic coming
from a particular `Service`
through a service gateway).'
through a service gateway).
* `NETWORK_SECURITY_GROUP`:
If the rule''s `destination`
is the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
of a NetworkSecurityGroup.'
type: string
tcpOptions:
description: TcpOptions Optional
Expand Down Expand Up @@ -1931,7 +1939,11 @@ spec:
`destination` is the `cidrBlock`
value for a Service (the rule is
for traffic destined for a particular
`Service` through a service gateway).'
`Service` through a service gateway).
* `NETWORK_SECURITY_GROUP`: If the
rule''s `destination` is the OCID
(https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
of a NetworkSecurityGroup.'
type: string
icmpOptions:
description: 'IcmpOptions Optional
Expand Down Expand Up @@ -2177,7 +2189,10 @@ spec:
`source` is the `cidrBlock` value
for a Service (the rule is for traffic
coming from a particular `Service`
through a service gateway).'
through a service gateway). * `NETWORK_SECURITY_GROUP`:
If the rule''s `destination` is
the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
of a NetworkSecurityGroup.'
type: string
tcpOptions:
description: TcpOptions Optional and
Expand Down
20 changes: 16 additions & 4 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,7 +1379,10 @@ spec:
If the rule''s `destination` is the
`cidrBlock` value for a Service (the
rule is for traffic destined for a particular
`Service` through a service gateway).'
`Service` through a service gateway).
* `NETWORK_SECURITY_GROUP`: If the rule''s
`destination` is the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
of a NetworkSecurityGroup.'
type: string
icmpOptions:
description: 'IcmpOptions Optional and
Expand Down Expand Up @@ -1611,7 +1614,10 @@ spec:
If the rule''s `source` is the `cidrBlock`
value for a Service (the rule is for
traffic coming from a particular `Service`
through a service gateway).'
through a service gateway). * `NETWORK_SECURITY_GROUP`:
If the rule''s `destination` is the
OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
of a NetworkSecurityGroup.'
type: string
tcpOptions:
description: TcpOptions Optional and valid
Expand Down Expand Up @@ -1812,7 +1818,10 @@ spec:
* `SERVICE_CIDR_BLOCK`: If the rule''s `destination`
is the `cidrBlock` value for a Service (the
rule is for traffic destined for a particular
`Service` through a service gateway).'
`Service` through a service gateway). *
`NETWORK_SECURITY_GROUP`: If the rule''s
`destination` is the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
of a NetworkSecurityGroup.'
type: string
icmpOptions:
description: 'IcmpOptions Optional and valid
Expand Down Expand Up @@ -2024,7 +2033,10 @@ spec:
If the rule''s `source` is the `cidrBlock`
value for a Service (the rule is for traffic
coming from a particular `Service` through
a service gateway).'
a service gateway). * `NETWORK_SECURITY_GROUP`:
If the rule''s `destination` is the OCID
(https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
of a NetworkSecurityGroup.'
type: string
tcpOptions:
description: TcpOptions Optional and valid
Expand Down
23 changes: 19 additions & 4 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedclustertemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1449,7 +1449,11 @@ spec:
is the `cidrBlock` value for
a Service (the rule is for traffic
destined for a particular `Service`
through a service gateway).'
through a service gateway).
* `NETWORK_SECURITY_GROUP`:
If the rule''s `destination`
is the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
of a NetworkSecurityGroup.'
type: string
icmpOptions:
description: 'IcmpOptions Optional
Expand Down Expand Up @@ -1718,7 +1722,11 @@ spec:
`cidrBlock` value for a Service
(the rule is for traffic coming
from a particular `Service`
through a service gateway).'
through a service gateway).
* `NETWORK_SECURITY_GROUP`:
If the rule''s `destination`
is the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
of a NetworkSecurityGroup.'
type: string
tcpOptions:
description: TcpOptions Optional
Expand Down Expand Up @@ -1941,7 +1949,11 @@ spec:
`destination` is the `cidrBlock`
value for a Service (the rule is
for traffic destined for a particular
`Service` through a service gateway).'
`Service` through a service gateway).
* `NETWORK_SECURITY_GROUP`: If the
rule''s `destination` is the OCID
(https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
of a NetworkSecurityGroup.'
type: string
icmpOptions:
description: 'IcmpOptions Optional
Expand Down Expand Up @@ -2187,7 +2199,10 @@ spec:
`source` is the `cidrBlock` value
for a Service (the rule is for traffic
coming from a particular `Service`
through a service gateway).'
through a service gateway). * `NETWORK_SECURITY_GROUP`:
If the rule''s `destination` is
the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
of a NetworkSecurityGroup.'
type: string
tcpOptions:
description: TcpOptions Optional and
Expand Down
4 changes: 4 additions & 0 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedmachinepools.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ spec:
description: InfrastructureMachineKind is the kind of the infrastructure
resources behind MachinePool Machines.
type: string
nodepoolLifecycleState:
type: string
ready:
type: boolean
replicas:
Expand Down Expand Up @@ -556,6 +558,8 @@ spec:
description: InfrastructureMachineKind is the kind of the infrastructure
resources behind MachinePool Machines.
type: string
nodepoolLifecycleState:
type: string
ready:
type: boolean
replicas:
Expand Down
4 changes: 4 additions & 0 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_ocivirtualmachinepools.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ spec:
description: InfrastructureMachineKind is the kind of the infrastructure
resources behind MachinePool Machines.
type: string
nodepoolLifecycleState:
type: string
ready:
type: boolean
replicas:
Expand Down Expand Up @@ -382,6 +384,8 @@ spec:
description: InfrastructureMachineKind is the kind of the infrastructure
resources behind MachinePool Machines.
type: string
nodepoolLifecycleState:
type: string
ready:
type: boolean
replicas:
Expand Down
3 changes: 3 additions & 0 deletions exp/api/v1beta1/ocimanagedmachinepool_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,9 @@ type OCIManagedMachinePoolStatus struct {
// +optional
Conditions clusterv1.Conditions `json:"conditions,omitempty"`

// +optional
NodepoolLifecycleState string `json:"nodepoolLifecycleState,omitempty"`

// Replicas is the most recently observed number of replicas
// +optional
Replicas int32 `json:"replicas"`
Expand Down
3 changes: 3 additions & 0 deletions exp/api/v1beta1/ocivirtualmachinepool_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ type OCIVirtualMachinePoolStatus struct {
// +optional
Replicas int32 `json:"replicas"`

// +optional
NodepoolLifecycleState string `json:"nodepoolLifecycleState,omitempty"`

// FailureReason will contains the CAPI MachinePoolStatusFailure if the virtual machine pool has hit an error condition.
// +optional
FailureReason *errors.MachinePoolStatusFailure `json:"failureReason,omitempty"`
Expand Down
Loading