From 8bf537806c0162bbd724c4c5926d1e366e92a744 Mon Sep 17 00:00:00 2001 From: Shyam Radhakrishnan Date: Tue, 19 Mar 2024 12:18:14 +0530 Subject: [PATCH] Add support for name in RPC --- api/v1beta1/types.go | 4 ++++ api/v1beta1/zz_generated.conversion.go | 2 ++ api/v1beta2/types.go | 4 ++++ .../infrastructure.cluster.x-k8s.io_ociclusters.yaml | 10 ++++++++++ ...ructure.cluster.x-k8s.io_ociclustertemplates.yaml | 12 ++++++++++++ ...tructure.cluster.x-k8s.io_ocimanagedclusters.yaml | 10 ++++++++++ ....cluster.x-k8s.io_ocimanagedclustertemplates.yaml | 12 ++++++++++++ 7 files changed, 54 insertions(+) diff --git a/api/v1beta1/types.go b/api/v1beta1/types.go index 58b2916c..d6202e11 100644 --- a/api/v1beta1/types.go +++ b/api/v1beta1/types.go @@ -1027,6 +1027,10 @@ type RemotePeeringConnection struct { // will be created between local and peer RPC. ManagePeerRPC bool `json:"managePeerRPC,omitempty"` + // A unique name identifying the RPC, please note this is to identify the RPC + // from other RPC elements, and will not be used in any OCI API call. + Name string `json:"name,omitempty"` + // PeerRegionName defined the region name of Peer VCN. PeerRegionName string `json:"peerRegionName,omitempty"` diff --git a/api/v1beta1/zz_generated.conversion.go b/api/v1beta1/zz_generated.conversion.go index 9641177b..4f5fee72 100644 --- a/api/v1beta1/zz_generated.conversion.go +++ b/api/v1beta1/zz_generated.conversion.go @@ -3013,6 +3013,7 @@ func Convert_v1beta2_PreemptibleInstanceConfig_To_v1beta1_PreemptibleInstanceCon func autoConvert_v1beta1_RemotePeeringConnection_To_v1beta2_RemotePeeringConnection(in *RemotePeeringConnection, out *v1beta2.RemotePeeringConnection, s conversion.Scope) error { out.ManagePeerRPC = in.ManagePeerRPC + out.Name = in.Name out.PeerRegionName = in.PeerRegionName out.PeerDRGId = (*string)(unsafe.Pointer(in.PeerDRGId)) out.PeerRPCConnectionId = (*string)(unsafe.Pointer(in.PeerRPCConnectionId)) @@ -3027,6 +3028,7 @@ func Convert_v1beta1_RemotePeeringConnection_To_v1beta2_RemotePeeringConnection( func autoConvert_v1beta2_RemotePeeringConnection_To_v1beta1_RemotePeeringConnection(in *v1beta2.RemotePeeringConnection, out *RemotePeeringConnection, s conversion.Scope) error { out.ManagePeerRPC = in.ManagePeerRPC + out.Name = in.Name out.PeerRegionName = in.PeerRegionName out.PeerDRGId = (*string)(unsafe.Pointer(in.PeerDRGId)) out.PeerRPCConnectionId = (*string)(unsafe.Pointer(in.PeerRPCConnectionId)) diff --git a/api/v1beta2/types.go b/api/v1beta2/types.go index 7cd4984a..f5a01607 100644 --- a/api/v1beta2/types.go +++ b/api/v1beta2/types.go @@ -1035,6 +1035,10 @@ type RemotePeeringConnection struct { // will be created between local and peer RPC. ManagePeerRPC bool `json:"managePeerRPC,omitempty"` + // A unique name identifying the RPC, please note this is to identify the RPC + // from other RPC elements, and will not be used in any OCI API call. + Name string `json:"name,omitempty"` + // PeerRegionName defined the region name of Peer VCN. PeerRegionName string `json:"peerRegionName,omitempty"` diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ociclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ociclusters.yaml index d724c9ff..1035bb5b 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_ociclusters.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_ociclusters.yaml @@ -970,6 +970,11 @@ spec: connection will be created between local and peer RPC. type: boolean + name: + description: A unique name identifying the RPC, please + note this is to identify the RPC from other RPC elements, + and will not be used in any OCI API call. + type: string peerDRGId: description: PeerDRGId defines the DRG ID of the peer. type: string @@ -2196,6 +2201,11 @@ spec: connection will be created between local and peer RPC. type: boolean + name: + description: A unique name identifying the RPC, please + note this is to identify the RPC from other RPC elements, + and will not be used in any OCI API call. + type: string peerDRGId: description: PeerDRGId defines the DRG ID of the peer. type: string diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ociclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ociclustertemplates.yaml index 53742447..195d2dff 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_ociclustertemplates.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_ociclustertemplates.yaml @@ -1097,6 +1097,12 @@ spec: in the Peer DRG and the connection will be created between local and peer RPC. type: boolean + name: + description: A unique name identifying the RPC, + please note this is to identify the RPC from + other RPC elements, and will not be used in + any OCI API call. + type: string peerDRGId: description: PeerDRGId defines the DRG ID of the peer. @@ -2376,6 +2382,12 @@ spec: in the Peer DRG and the connection will be created between local and peer RPC. type: boolean + name: + description: A unique name identifying the RPC, + please note this is to identify the RPC from + other RPC elements, and will not be used in + any OCI API call. + type: string peerDRGId: description: PeerDRGId defines the DRG ID of the peer. diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedclusters.yaml index 7dadbe65..603d6412 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedclusters.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedclusters.yaml @@ -973,6 +973,11 @@ spec: connection will be created between local and peer RPC. type: boolean + name: + description: A unique name identifying the RPC, please + note this is to identify the RPC from other RPC elements, + and will not be used in any OCI API call. + type: string peerDRGId: description: PeerDRGId defines the DRG ID of the peer. type: string @@ -2202,6 +2207,11 @@ spec: connection will be created between local and peer RPC. type: boolean + name: + description: A unique name identifying the RPC, please + note this is to identify the RPC from other RPC elements, + and will not be used in any OCI API call. + type: string peerDRGId: description: PeerDRGId defines the DRG ID of the peer. type: string diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedclustertemplates.yaml index c77e3b3b..656da99b 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedclustertemplates.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedclustertemplates.yaml @@ -1102,6 +1102,12 @@ spec: in the Peer DRG and the connection will be created between local and peer RPC. type: boolean + name: + description: A unique name identifying the RPC, + please note this is to identify the RPC from + other RPC elements, and will not be used in + any OCI API call. + type: string peerDRGId: description: PeerDRGId defines the DRG ID of the peer. @@ -2386,6 +2392,12 @@ spec: in the Peer DRG and the connection will be created between local and peer RPC. type: boolean + name: + description: A unique name identifying the RPC, + please note this is to identify the RPC from + other RPC elements, and will not be used in + any OCI API call. + type: string peerDRGId: description: PeerDRGId defines the DRG ID of the peer.