Skip to content

Commit dba67a4

Browse files
Add node pool recycling options
1 parent 946dbb1 commit dba67a4

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

cloud/scope/managed_machine_pool.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"context"
2121
"encoding/json"
2222
"fmt"
23-
"github.com/oracle/cluster-api-provider-oci/cloud/util"
2423
"reflect"
2524
"sort"
2625
"strconv"
@@ -699,7 +698,7 @@ func (m *ManagedMachinePoolScope) UpdateNodePool(ctx context.Context, pool *oke.
699698
}
700699
}
701700
if recycleConfig != nil && len(nodeConfigDetails.PlacementConfigs) != 0 {
702-
m.Logger.V(util.LogLevelWarn).Info("Placement configuration has been changed in the update, " +
701+
m.Logger.V(LogLevelWarn).Info("Placement configuration has been changed in the update, " +
703702
"hence node pool recycling configuration will not be sent with the update request")
704703
}
705704
if spec.NodeEvictionNodePoolSettings != nil {

cloud/scope/util.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ import (
2020
infrastructurev1beta2 "github.com/oracle/cluster-api-provider-oci/api/v1beta2"
2121
)
2222

23+
const (
24+
LogLevelWarn = 3
25+
)
26+
2327
// GetNsgNamesFromId returns the names of the NSGs with the provided IDs
2428
func GetNsgNamesFromId(ids []string, nsgs []*infrastructurev1beta2.NSG) []string {
2529
names := make([]string, 0)

cloud/util/util.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ import (
3434
"sigs.k8s.io/controller-runtime/pkg/client"
3535
)
3636

37-
const (
38-
LogLevelWarn = 3
39-
)
40-
4137
// GetClusterIdentityFromRef returns the OCIClusterIdentity referenced by the OCICluster.
4238
func GetClusterIdentityFromRef(ctx context.Context, c client.Client, ociClusterNamespace string, ref *corev1.ObjectReference) (*infrastructurev1beta2.OCIClusterIdentity, error) {
4339
identity := &infrastructurev1beta2.OCIClusterIdentity{}

0 commit comments

Comments
 (0)