Skip to content

feat(node_info_controller): add providerid to node patch bytes #523

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

Open
pree wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(node_info_controller): add providerid to node patch bytes #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
81 changes: 51 additions & 30 deletions pkg/cloudprovider/providers/oci/node_info_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package oci

import (
"context"
"encoding/json"
"fmt"
"strings"
"time"
Expand Down Expand Up @@ -60,6 +61,20 @@ type NodeInfoController struct {
ociClient client.Interface
}

type NodeMetadataPatch struct {
Labels map[string]string `json:"labels,omitempty"`
Annotations map[string]string `json:"annotations,omitempty"`
}

type NodeSpecPatch struct {
ProviderID string `json:"providerID,omitempty"`
}

type NodePatch struct {
Metadata *NodeMetadataPatch `json:"metadata,omitempty"`
Spec *NodeSpecPatch `json:"spec,omitempty"`
}

// NewNodeInfoController creates a NodeInfoController object
func NewNodeInfoController(
nodeInformer coreinformers.NodeInformer,
Expand Down Expand Up @@ -149,7 +164,7 @@ func (nic *NodeInfoController) processNextItem() bool {
return true
}

// A function which is responsible for adding the fault domain label and CompartmentID annotation to the node if it
// A function which is responsible for adding the ProviderID, fault domain label and CompartmentID annotation to the node if it
// is not already present. Also cache the instance information
func (nic *NodeInfoController) processItem(key string) error {

Expand All @@ -161,9 +176,9 @@ func (nic *NodeInfoController) processItem(key string) error {
return err
}

// if node has required labels already, don't process agin
// if node has required labels already, don't process again
if validateNodeHasRequiredLabels(cacheNode) {
logger.With("nodeName", cacheNode.Name).Debugf("The node has the fault domain label and compartmentID annotation already, will not process")
logger.With("nodeName", cacheNode.Name).Debugf("The node has the ProviderID, fault domain label and compartmentID annotation already, will not process")
return nil
}

Expand Down Expand Up @@ -199,44 +214,50 @@ func getNodePatchBytes(cacheNode *v1.Node, instance *core.Instance, logger *zap.
if validateNodeHasRequiredLabels(cacheNode) {
return nil
}
isProviderIDPresent := cacheNode.Spec.ProviderID != ""
_, isFaultDomainLabelPresent := cacheNode.ObjectMeta.Labels[FaultDomainLabel]
_, isAvailabilityDomainLabelPresent := cacheNode.ObjectMeta.Labels[AvailabilityDomainLabel]
_, isCompartmentIDAnnotationPresent := cacheNode.ObjectMeta.Annotations[CompartmentIDAnnotation]

//labels only allow ., -, _ special characters
availabilityDomainLabelValue := strings.ReplaceAll(*instance.AvailabilityDomain, ":", ".")

var nodePatchBytes []byte
if isFaultDomainLabelPresent && (!client.IsIpv6SingleStackCluster() || isAvailabilityDomainLabelPresent) {
//In this case CompartmentIDAnnotation not present but FaultDomainLabel present
logger.Infof("Adding node annotation from cloud provider: %s=%s", CompartmentIDAnnotation, *instance.CompartmentId)
nodePatchBytes = []byte(fmt.Sprintf("{\"metadata\": {\"annotations\": {\"%s\":\"%s\"}}}",
CompartmentIDAnnotation, *instance.CompartmentId))
} else if isCompartmentIDAnnotationPresent {
//In this case FaultDomainLabel not present but CompartmentIDAnnotation present
logger.Infof("Adding node label from cloud provider: %s=%s", FaultDomainLabel, *instance.FaultDomain)
if client.IsIpv6SingleStackCluster() {
logger.Infof("Adding node label from cloud provider: %s=%s", AvailabilityDomainLabel, availabilityDomainLabelValue)
nodePatchBytes = []byte(fmt.Sprintf("{\"metadata\": {\"labels\": {\"%s\":\"%s\",\"%s\":\"%s\"}}}", FaultDomainLabel, *instance.FaultDomain,
AvailabilityDomainLabel, availabilityDomainLabelValue))
} else {
nodePatchBytes = []byte(fmt.Sprintf("{\"metadata\": {\"labels\": {\"%s\":\"%s\"}}}", FaultDomainLabel, *instance.FaultDomain))
nodePatch := &NodePatch{}

if !isProviderIDPresent {
nodePatch.Spec = &NodeSpecPatch{}
nodePatch.Spec.ProviderID = providerPrefix + *instance.Id
}

// Handle Labels
if !isFaultDomainLabelPresent || (!isAvailabilityDomainLabelPresent && client.IsIpv6SingleStackCluster()) {
nodePatch.Metadata = &NodeMetadataPatch{}
nodePatch.Metadata.Labels = make(map[string]string)

if !isFaultDomainLabelPresent {
nodePatch.Metadata.Labels[FaultDomainLabel] = *instance.FaultDomain
}

} else {
//In this case none of FaultDomainLabel or CompartmentIDAnnotation present
logger.Infof("Adding node label from cloud provider: %s=%s", FaultDomainLabel, *instance.FaultDomain)
logger.Infof("Adding node annotation from cloud provider: %s=%s", CompartmentIDAnnotation, *instance.CompartmentId)

if client.IsIpv6SingleStackCluster() {
logger.Infof("Adding node label from cloud provider: %s=%s", AvailabilityDomainLabel, availabilityDomainLabelValue)
nodePatchBytes = []byte(fmt.Sprintf("{\"metadata\": {\"labels\": {\"%s\":\"%s\",\"%s\":\"%s\"},\"annotations\": {\"%s\":\"%s\"}}}",
FaultDomainLabel, *instance.FaultDomain, AvailabilityDomainLabel, availabilityDomainLabelValue, CompartmentIDAnnotation, *instance.CompartmentId))
} else {
nodePatchBytes = []byte(fmt.Sprintf("{\"metadata\": {\"labels\": {\"%s\":\"%s\"},\"annotations\": {\"%s\":\"%s\"}}}",
FaultDomainLabel, *instance.FaultDomain, CompartmentIDAnnotation, *instance.CompartmentId))
if !isAvailabilityDomainLabelPresent && client.IsIpv6SingleStackCluster() {
nodePatch.Metadata.Labels[AvailabilityDomainLabel] = availabilityDomainLabelValue
}
}

// Handle Annotations
if !isCompartmentIDAnnotationPresent {
if nodePatch.Metadata == nil {
nodePatch.Metadata = &NodeMetadataPatch{}
}
nodePatch.Metadata.Annotations = make(map[string]string)
nodePatch.Metadata.Annotations[CompartmentIDAnnotation] = *instance.CompartmentId
}

nodePatchBytes, err := json.Marshal(nodePatch)
if err != nil {
logger.With(zap.Error(err)).Error("Error in creating node patch %v", err)
return nil
}

return nodePatchBytes
}

Expand Down
29 changes: 20 additions & 9 deletions pkg/cloudprovider/providers/oci/node_info_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ func TestGetNodePatchBytes(t *testing.T) {
CompartmentId: &instanceCompID,
FaultDomain: &instanceFD,
AvailabilityDomain: &instanceAD,
Id: &instanceID,
},
expectedPatchBytes: nil,
clusterIpFamily: "IPv4",
Expand All @@ -76,6 +77,7 @@ func TestGetNodePatchBytes(t *testing.T) {
CompartmentId: &instanceCompID,
FaultDomain: &instanceFD,
AvailabilityDomain: &instanceAD,
Id: &instanceID,
},
expectedPatchBytes: nil,
clusterIpFamily: "IPv6",
Expand All @@ -93,9 +95,10 @@ func TestGetNodePatchBytes(t *testing.T) {
CompartmentId: &instanceCompID,
FaultDomain: &instanceFD,
AvailabilityDomain: &instanceAD,
Id: &instanceID,
},
clusterIpFamily: "IPv4",
expectedPatchBytes: []byte("{\"metadata\": {\"annotations\": {\"oci.oraclecloud.com/compartment-id\":\"instanceCompID\"}}}"),
expectedPatchBytes: []byte("{\"metadata\":{\"annotations\":{\"oci.oraclecloud.com/compartment-id\":\"instanceCompID\"}},\"spec\":{\"providerID\":\"oci://ocid1.instanceID\"}}"),
},
"Only CompartmentID annotation present Ipv4": {
node: &v1.Node{
Expand All @@ -109,9 +112,10 @@ func TestGetNodePatchBytes(t *testing.T) {
CompartmentId: &instanceCompID,
FaultDomain: &instanceFD,
AvailabilityDomain: &instanceAD,
Id: &instanceID,
},
clusterIpFamily: "IPv4",
expectedPatchBytes: []byte("{\"metadata\": {\"labels\": {\"oci.oraclecloud.com/fault-domain\":\"instanceFD\"}}}"),
expectedPatchBytes: []byte("{\"metadata\":{\"labels\":{\"oci.oraclecloud.com/fault-domain\":\"instanceFD\"}},\"spec\":{\"providerID\":\"oci://ocid1.instanceID\"}}"),
},
"Only CompartmentID annotation present Ipv6": {
node: &v1.Node{
Expand All @@ -125,9 +129,10 @@ func TestGetNodePatchBytes(t *testing.T) {
CompartmentId: &instanceCompID,
FaultDomain: &instanceFD,
AvailabilityDomain: &instanceAD,
Id: &instanceID,
},
clusterIpFamily: "IPv6",
expectedPatchBytes: []byte("{\"metadata\": {\"labels\": {\"oci.oraclecloud.com/fault-domain\":\"instanceFD\",\"csi-ipv6-full-ad-name\":\"prefix.instanceAD\"}}}"),
expectedPatchBytes: []byte("{\"metadata\":{\"labels\":{\"csi-ipv6-full-ad-name\":\"prefix.instanceAD\",\"oci.oraclecloud.com/fault-domain\":\"instanceFD\"}},\"spec\":{\"providerID\":\"oci://ocid1.instanceID\"}}"),
},
"Only FD label is present IPv4 dual stack": {
node: &v1.Node{
Expand All @@ -141,9 +146,10 @@ func TestGetNodePatchBytes(t *testing.T) {
CompartmentId: &instanceCompID,
FaultDomain: &instanceFD,
AvailabilityDomain: &instanceAD,
Id: &instanceID,
},
clusterIpFamily: "IPv4,IPv6",
expectedPatchBytes: []byte("{\"metadata\": {\"annotations\": {\"oci.oraclecloud.com/compartment-id\":\"instanceCompID\"}}}"),
expectedPatchBytes: []byte("{\"metadata\":{\"annotations\":{\"oci.oraclecloud.com/compartment-id\":\"instanceCompID\"}},\"spec\":{\"providerID\":\"oci://ocid1.instanceID\"}}"),
},
"Only FD label is present IPv6": {
node: &v1.Node{
Expand All @@ -157,9 +163,10 @@ func TestGetNodePatchBytes(t *testing.T) {
CompartmentId: &instanceCompID,
FaultDomain: &instanceFD,
AvailabilityDomain: &instanceAD,
Id: &instanceID,
},
clusterIpFamily: "IPv6",
expectedPatchBytes: []byte("{\"metadata\": {\"labels\": {\"oci.oraclecloud.com/fault-domain\":\"instanceFD\",\"csi-ipv6-full-ad-name\":\"prefix.instanceAD\"},\"annotations\": {\"oci.oraclecloud.com/compartment-id\":\"instanceCompID\"}}}"),
expectedPatchBytes: []byte("{\"metadata\":{\"labels\":{\"csi-ipv6-full-ad-name\":\"prefix.instanceAD\"},\"annotations\":{\"oci.oraclecloud.com/compartment-id\":\"instanceCompID\"}},\"spec\":{\"providerID\":\"oci://ocid1.instanceID\"}}"),
},
"Only AD label present Ipv4": {
node: &v1.Node{
Expand All @@ -173,9 +180,10 @@ func TestGetNodePatchBytes(t *testing.T) {
CompartmentId: &instanceCompID,
FaultDomain: &instanceFD,
AvailabilityDomain: &instanceAD,
Id: &instanceID,
},
clusterIpFamily: "IPv4",
expectedPatchBytes: []byte("{\"metadata\": {\"labels\": {\"oci.oraclecloud.com/fault-domain\":\"instanceFD\"},\"annotations\": {\"oci.oraclecloud.com/compartment-id\":\"instanceCompID\"}}}"),
expectedPatchBytes: []byte("{\"metadata\":{\"labels\":{\"oci.oraclecloud.com/fault-domain\":\"instanceFD\"},\"annotations\":{\"oci.oraclecloud.com/compartment-id\":\"instanceCompID\"}},\"spec\":{\"providerID\":\"oci://ocid1.instanceID\"}}"),
},
"Only AD label present Ipv6": {
node: &v1.Node{
Expand All @@ -189,9 +197,10 @@ func TestGetNodePatchBytes(t *testing.T) {
CompartmentId: &instanceCompID,
FaultDomain: &instanceFD,
AvailabilityDomain: &instanceAD,
Id: &instanceID,
},
clusterIpFamily: "IPv6",
expectedPatchBytes: []byte("{\"metadata\": {\"labels\": {\"oci.oraclecloud.com/fault-domain\":\"instanceFD\",\"csi-ipv6-full-ad-name\":\"prefix.instanceAD\"},\"annotations\": {\"oci.oraclecloud.com/compartment-id\":\"instanceCompID\"}}}"),
expectedPatchBytes: []byte("{\"metadata\":{\"labels\":{\"oci.oraclecloud.com/fault-domain\":\"instanceFD\"},\"annotations\":{\"oci.oraclecloud.com/compartment-id\":\"instanceCompID\"}},\"spec\":{\"providerID\":\"oci://ocid1.instanceID\"}}"),
},
"none present Ipv4": {
node: &v1.Node{
Expand All @@ -201,9 +210,10 @@ func TestGetNodePatchBytes(t *testing.T) {
CompartmentId: &instanceCompID,
FaultDomain: &instanceFD,
AvailabilityDomain: &instanceAD,
Id: &instanceID,
},
clusterIpFamily: "IPv4",
expectedPatchBytes: []byte("{\"metadata\": {\"labels\": {\"oci.oraclecloud.com/fault-domain\":\"instanceFD\"},\"annotations\": {\"oci.oraclecloud.com/compartment-id\":\"instanceCompID\"}}}"),
expectedPatchBytes: []byte("{\"metadata\":{\"labels\":{\"oci.oraclecloud.com/fault-domain\":\"instanceFD\"},\"annotations\":{\"oci.oraclecloud.com/compartment-id\":\"instanceCompID\"}},\"spec\":{\"providerID\":\"oci://ocid1.instanceID\"}}"),
},
"none present Ipv6": {
node: &v1.Node{
Expand All @@ -213,9 +223,10 @@ func TestGetNodePatchBytes(t *testing.T) {
CompartmentId: &instanceCompID,
FaultDomain: &instanceFD,
AvailabilityDomain: &instanceAD,
Id: &instanceID,
},
clusterIpFamily: "IPv6",
expectedPatchBytes: []byte("{\"metadata\": {\"labels\": {\"oci.oraclecloud.com/fault-domain\":\"instanceFD\",\"csi-ipv6-full-ad-name\":\"prefix.instanceAD\"},\"annotations\": {\"oci.oraclecloud.com/compartment-id\":\"instanceCompID\"}}}"),
expectedPatchBytes: []byte("{\"metadata\":{\"labels\":{\"csi-ipv6-full-ad-name\":\"prefix.instanceAD\",\"oci.oraclecloud.com/fault-domain\":\"instanceFD\"},\"annotations\":{\"oci.oraclecloud.com/compartment-id\":\"instanceCompID\"}},\"spec\":{\"providerID\":\"oci://ocid1.instanceID\"}}"),
},
}
logger := zap.L()
Expand Down