Skip to content

Commit c46573b

Browse files
shyamradhakrishnanshyamradhakrishnan
authored
Add node pool status in machine pool status (#338)
* Add node pool state in machine pool status
1 parent dcae832 commit c46573b

15 files changed

+103
-16
lines changed

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

+16-4
Original file line numberDiff line numberDiff line change
@@ -1373,7 +1373,10 @@ spec:
13731373
If the rule''s `destination` is the
13741374
`cidrBlock` value for a Service (the
13751375
rule is for traffic destined for a particular
1376-
`Service` through a service gateway).'
1376+
`Service` through a service gateway).
1377+
* `NETWORK_SECURITY_GROUP`: If the rule''s
1378+
`destination` is the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
1379+
of a NetworkSecurityGroup.'
13771380
type: string
13781381
icmpOptions:
13791382
description: 'IcmpOptions Optional and
@@ -1605,7 +1608,10 @@ spec:
16051608
If the rule''s `source` is the `cidrBlock`
16061609
value for a Service (the rule is for
16071610
traffic coming from a particular `Service`
1608-
through a service gateway).'
1611+
through a service gateway). * `NETWORK_SECURITY_GROUP`:
1612+
If the rule''s `destination` is the
1613+
OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
1614+
of a NetworkSecurityGroup.'
16091615
type: string
16101616
tcpOptions:
16111617
description: TcpOptions Optional and valid
@@ -1806,7 +1812,10 @@ spec:
18061812
* `SERVICE_CIDR_BLOCK`: If the rule''s `destination`
18071813
is the `cidrBlock` value for a Service (the
18081814
rule is for traffic destined for a particular
1809-
`Service` through a service gateway).'
1815+
`Service` through a service gateway). *
1816+
`NETWORK_SECURITY_GROUP`: If the rule''s
1817+
`destination` is the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
1818+
of a NetworkSecurityGroup.'
18101819
type: string
18111820
icmpOptions:
18121821
description: 'IcmpOptions Optional and valid
@@ -2018,7 +2027,10 @@ spec:
20182027
If the rule''s `source` is the `cidrBlock`
20192028
value for a Service (the rule is for traffic
20202029
coming from a particular `Service` through
2021-
a service gateway).'
2030+
a service gateway). * `NETWORK_SECURITY_GROUP`:
2031+
If the rule''s `destination` is the OCID
2032+
(https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
2033+
of a NetworkSecurityGroup.'
20222034
type: string
20232035
tcpOptions:
20242036
description: TcpOptions Optional and valid

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

+19-4
Original file line numberDiff line numberDiff line change
@@ -1439,7 +1439,11 @@ spec:
14391439
is the `cidrBlock` value for
14401440
a Service (the rule is for traffic
14411441
destined for a particular `Service`
1442-
through a service gateway).'
1442+
through a service gateway).
1443+
* `NETWORK_SECURITY_GROUP`:
1444+
If the rule''s `destination`
1445+
is the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
1446+
of a NetworkSecurityGroup.'
14431447
type: string
14441448
icmpOptions:
14451449
description: 'IcmpOptions Optional
@@ -1708,7 +1712,11 @@ spec:
17081712
`cidrBlock` value for a Service
17091713
(the rule is for traffic coming
17101714
from a particular `Service`
1711-
through a service gateway).'
1715+
through a service gateway).
1716+
* `NETWORK_SECURITY_GROUP`:
1717+
If the rule''s `destination`
1718+
is the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
1719+
of a NetworkSecurityGroup.'
17121720
type: string
17131721
tcpOptions:
17141722
description: TcpOptions Optional
@@ -1931,7 +1939,11 @@ spec:
19311939
`destination` is the `cidrBlock`
19321940
value for a Service (the rule is
19331941
for traffic destined for a particular
1934-
`Service` through a service gateway).'
1942+
`Service` through a service gateway).
1943+
* `NETWORK_SECURITY_GROUP`: If the
1944+
rule''s `destination` is the OCID
1945+
(https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
1946+
of a NetworkSecurityGroup.'
19351947
type: string
19361948
icmpOptions:
19371949
description: 'IcmpOptions Optional
@@ -2177,7 +2189,10 @@ spec:
21772189
`source` is the `cidrBlock` value
21782190
for a Service (the rule is for traffic
21792191
coming from a particular `Service`
2180-
through a service gateway).'
2192+
through a service gateway). * `NETWORK_SECURITY_GROUP`:
2193+
If the rule''s `destination` is
2194+
the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
2195+
of a NetworkSecurityGroup.'
21812196
type: string
21822197
tcpOptions:
21832198
description: TcpOptions Optional and

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

+16-4
Original file line numberDiff line numberDiff line change
@@ -1379,7 +1379,10 @@ spec:
13791379
If the rule''s `destination` is the
13801380
`cidrBlock` value for a Service (the
13811381
rule is for traffic destined for a particular
1382-
`Service` through a service gateway).'
1382+
`Service` through a service gateway).
1383+
* `NETWORK_SECURITY_GROUP`: If the rule''s
1384+
`destination` is the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
1385+
of a NetworkSecurityGroup.'
13831386
type: string
13841387
icmpOptions:
13851388
description: 'IcmpOptions Optional and
@@ -1611,7 +1614,10 @@ spec:
16111614
If the rule''s `source` is the `cidrBlock`
16121615
value for a Service (the rule is for
16131616
traffic coming from a particular `Service`
1614-
through a service gateway).'
1617+
through a service gateway). * `NETWORK_SECURITY_GROUP`:
1618+
If the rule''s `destination` is the
1619+
OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
1620+
of a NetworkSecurityGroup.'
16151621
type: string
16161622
tcpOptions:
16171623
description: TcpOptions Optional and valid
@@ -1812,7 +1818,10 @@ spec:
18121818
* `SERVICE_CIDR_BLOCK`: If the rule''s `destination`
18131819
is the `cidrBlock` value for a Service (the
18141820
rule is for traffic destined for a particular
1815-
`Service` through a service gateway).'
1821+
`Service` through a service gateway). *
1822+
`NETWORK_SECURITY_GROUP`: If the rule''s
1823+
`destination` is the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
1824+
of a NetworkSecurityGroup.'
18161825
type: string
18171826
icmpOptions:
18181827
description: 'IcmpOptions Optional and valid
@@ -2024,7 +2033,10 @@ spec:
20242033
If the rule''s `source` is the `cidrBlock`
20252034
value for a Service (the rule is for traffic
20262035
coming from a particular `Service` through
2027-
a service gateway).'
2036+
a service gateway). * `NETWORK_SECURITY_GROUP`:
2037+
If the rule''s `destination` is the OCID
2038+
(https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
2039+
of a NetworkSecurityGroup.'
20282040
type: string
20292041
tcpOptions:
20302042
description: TcpOptions Optional and valid

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

+19-4
Original file line numberDiff line numberDiff line change
@@ -1449,7 +1449,11 @@ spec:
14491449
is the `cidrBlock` value for
14501450
a Service (the rule is for traffic
14511451
destined for a particular `Service`
1452-
through a service gateway).'
1452+
through a service gateway).
1453+
* `NETWORK_SECURITY_GROUP`:
1454+
If the rule''s `destination`
1455+
is the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
1456+
of a NetworkSecurityGroup.'
14531457
type: string
14541458
icmpOptions:
14551459
description: 'IcmpOptions Optional
@@ -1718,7 +1722,11 @@ spec:
17181722
`cidrBlock` value for a Service
17191723
(the rule is for traffic coming
17201724
from a particular `Service`
1721-
through a service gateway).'
1725+
through a service gateway).
1726+
* `NETWORK_SECURITY_GROUP`:
1727+
If the rule''s `destination`
1728+
is the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
1729+
of a NetworkSecurityGroup.'
17221730
type: string
17231731
tcpOptions:
17241732
description: TcpOptions Optional
@@ -1941,7 +1949,11 @@ spec:
19411949
`destination` is the `cidrBlock`
19421950
value for a Service (the rule is
19431951
for traffic destined for a particular
1944-
`Service` through a service gateway).'
1952+
`Service` through a service gateway).
1953+
* `NETWORK_SECURITY_GROUP`: If the
1954+
rule''s `destination` is the OCID
1955+
(https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
1956+
of a NetworkSecurityGroup.'
19451957
type: string
19461958
icmpOptions:
19471959
description: 'IcmpOptions Optional
@@ -2187,7 +2199,10 @@ spec:
21872199
`source` is the `cidrBlock` value
21882200
for a Service (the rule is for traffic
21892201
coming from a particular `Service`
2190-
through a service gateway).'
2202+
through a service gateway). * `NETWORK_SECURITY_GROUP`:
2203+
If the rule''s `destination` is
2204+
the OCID (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
2205+
of a NetworkSecurityGroup.'
21912206
type: string
21922207
tcpOptions:
21932208
description: TcpOptions Optional and

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

+4
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,8 @@ spec:
268268
description: InfrastructureMachineKind is the kind of the infrastructure
269269
resources behind MachinePool Machines.
270270
type: string
271+
nodepoolLifecycleState:
272+
type: string
271273
ready:
272274
type: boolean
273275
replicas:
@@ -556,6 +558,8 @@ spec:
556558
description: InfrastructureMachineKind is the kind of the infrastructure
557559
resources behind MachinePool Machines.
558560
type: string
561+
nodepoolLifecycleState:
562+
type: string
559563
ready:
560564
type: boolean
561565
replicas:

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

+4
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,8 @@ spec:
192192
description: InfrastructureMachineKind is the kind of the infrastructure
193193
resources behind MachinePool Machines.
194194
type: string
195+
nodepoolLifecycleState:
196+
type: string
195197
ready:
196198
type: boolean
197199
replicas:
@@ -382,6 +384,8 @@ spec:
382384
description: InfrastructureMachineKind is the kind of the infrastructure
383385
resources behind MachinePool Machines.
384386
type: string
387+
nodepoolLifecycleState:
388+
type: string
385389
ready:
386390
type: boolean
387391
replicas:

‎exp/api/v1beta1/ocimanagedmachinepool_types.go

+3
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,9 @@ type OCIManagedMachinePoolStatus struct {
193193
// +optional
194194
Conditions clusterv1.Conditions `json:"conditions,omitempty"`
195195

196+
// +optional
197+
NodepoolLifecycleState string `json:"nodepoolLifecycleState,omitempty"`
198+
196199
// Replicas is the most recently observed number of replicas
197200
// +optional
198201
Replicas int32 `json:"replicas"`

‎exp/api/v1beta1/ocivirtualmachinepool_types.go

+3
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ type OCIVirtualMachinePoolStatus struct {
106106
// +optional
107107
Replicas int32 `json:"replicas"`
108108

109+
// +optional
110+
NodepoolLifecycleState string `json:"nodepoolLifecycleState,omitempty"`
111+
109112
// FailureReason will contains the CAPI MachinePoolStatusFailure if the virtual machine pool has hit an error condition.
110113
// +optional
111114
FailureReason *errors.MachinePoolStatusFailure `json:"failureReason,omitempty"`

0 commit comments

Comments
 (0)