Skip to content

Commit 36203e2

Browse files
committed
chore: fix linting issues
Signed-off-by: Chris Privitere <23177737+cprivitere@users.noreply.github.com>
1 parent 68c3793 commit 36203e2

File tree

6 files changed

+9
-7
lines changed

6 files changed

+9
-7
lines changed

api/v1beta1/packetcluster_webhook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func (c *PacketCluster) ValidateUpdate(oldRaw runtime.Object) (admission.Warning
9494
}
9595

9696
// Must have only one of Metro or Facility
97-
if len(c.Spec.Facility) > 0 && len(c.Spec.Metro) > 0 {
97+
if c.Spec.Facility != "" && c.Spec.Metro != "" {
9898
allErrs = append(allErrs,
9999
field.Invalid(field.NewPath("spec", "Facility"),
100100
c.Spec.Facility, "Metro and Facility are mutually exclusive, Metro is recommended"),

api/v1beta1/packetmachine_webhook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func (m *PacketMachine) ValidateUpdate(old runtime.Object) (admission.Warnings,
5353
var allErrs field.ErrorList
5454

5555
// Must have only one of Metro or Facility specified
56-
if len(m.Spec.Facility) > 0 && len(m.Spec.Metro) > 0 {
56+
if m.Spec.Facility != "" && m.Spec.Metro != "" {
5757
allErrs = append(allErrs,
5858
field.Invalid(field.NewPath("spec", "Facility"),
5959
m.Spec.Facility, "Metro and Facility field are mutually exclusive"),

cmd/ci-clean/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func main() {
4343
rootCmd := &cobra.Command{ //nolint:exhaustivestruct
4444
Use: "ci-clean",
4545
Short: "Clean up any stray resources in CI",
46-
RunE: func(cmd *cobra.Command, args []string) error {
46+
RunE: func(_ *cobra.Command, _ []string) error {
4747
metalAuthToken := os.Getenv(authTokenEnvVar)
4848
if metalAuthToken == "" {
4949
return fmt.Errorf("%s: %w", authTokenEnvVar, errMissingRequiredEnvVar)

controllers/packetcluster_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func (r *PacketClusterReconciler) reconcileNormal(ctx context.Context, clusterSc
116116
packetCluster := clusterScope.PacketCluster
117117

118118
switch {
119-
case packetCluster.Spec.VIPManager == "EMLB":
119+
case packetCluster.Spec.VIPManager == emlb.EMLBVIPID:
120120
if !packetCluster.Spec.ControlPlaneEndpoint.IsValid() {
121121
// Create new EMLB object
122122
lb := emlb.NewEMLB(r.PacketClient.GetConfig().DefaultHeader["X-Auth-Token"], packetCluster.Spec.ProjectID, packetCluster.Spec.Metro)
@@ -134,7 +134,7 @@ func (r *PacketClusterReconciler) reconcileNormal(ctx context.Context, clusterSc
134134
}
135135
}
136136

137-
if packetCluster.Spec.VIPManager != "EMLB" {
137+
if packetCluster.Spec.VIPManager != emlb.EMLBVIPID {
138138
ipReserv, err := r.PacketClient.GetIPByClusterIdentifier(ctx, clusterScope.Namespace(), clusterScope.Name(), packetCluster.Spec.ProjectID)
139139
switch {
140140
case errors.Is(err, packet.ErrControlPlanEndpointNotFound):

controllers/packetmachine_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ func (r *PacketMachineReconciler) reconcile(ctx context.Context, machineScope *s
367367
addrs = append(addrs, a)
368368
}
369369
controlPlaneEndpointAddress = controlPlaneEndpoint.GetAddress()
370-
case machineScope.PacketCluster.Spec.VIPManager == "EMLB":
370+
case machineScope.PacketCluster.Spec.VIPManager == emlb.EMLBVIPID:
371371
controlPlaneEndpointAddress = machineScope.Cluster.Spec.ControlPlaneEndpoint.Host
372372
cpemLBConfig = "emlb:///" + machineScope.PacketCluster.Spec.Metro
373373
emlbID = machineScope.PacketCluster.Annotations["equinix.com/loadbalancerID"]
@@ -440,7 +440,7 @@ func (r *PacketMachineReconciler) reconcile(ctx context.Context, machineScope *s
440440
return ctrl.Result{RequeueAfter: time.Second * 20}, nil
441441
}
442442
}
443-
case machineScope.PacketCluster.Spec.VIPManager == "EMLB":
443+
case machineScope.PacketCluster.Spec.VIPManager == emlb.EMLBVIPID:
444444
if machineScope.IsControlPlane() {
445445
// Create new EMLB object
446446
lb := emlb.NewEMLB(r.PacketClient.GetConfig().DefaultHeader["X-Auth-Token"], machineScope.PacketCluster.Spec.ProjectID, machineScope.PacketCluster.Spec.Metro)

internal/emlb/emlb.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ const (
4949
loadBalancerPoolIDAnnotation = "equinix.com/loadbalancerpoolID"
5050
// loadBalancerPoolOriginIDAnnotation is the anotation key representing the origin ID of a PacketMachine.
5151
loadBalancerOriginIDAnnotation = "equinix.com/loadbalanceroriginID"
52+
// EMLBVIPID is the stringused to refer to the EMLB load balancer and VIP Manager type.
53+
EMLBVIPID = "EMLB"
5254
)
5355

5456
var lbMetros = map[string]string{

0 commit comments

Comments
 (0)