Skip to content

Commit

Permalink
fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
huaqing1994 committed Oct 30, 2024
1 parent 5b5f287 commit 4a25215
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 17 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
## --------------------------------------

.PHONY: docker-build
docker-build: docker-pull-prerequisites ## Build the docker image for controller-manager
docker-build: # docker-pull-prerequisites ## Build the docker image for controller-manager
docker build --build-arg ARCH=$(ARCH) --build-arg ldflags="$(LDFLAGS)" . -t $(CONTROLLER_IMG)-$(ARCH):$(IMAGE_TAG)

.PHONY: docker-push
Expand Down
16 changes: 0 additions & 16 deletions controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
cgscheme "k8s.io/client-go/kubernetes/scheme"
"k8s.io/klog/v2"
Expand Down Expand Up @@ -141,16 +140,6 @@ func newMachineContext(
}
}

func newMachineTemplateContext(
elfCluster *infrav1.ElfCluster, cluster *clusterv1.Cluster,
emt *infrav1.ElfMachineTemplate) *context.MachineTemplateContext {
return &context.MachineTemplateContext{
Cluster: cluster,
ElfCluster: elfCluster,
ElfMachineTemplate: emt,
}
}

type conditionAssertion struct {
conditionType clusterv1.ConditionType
status corev1.ConditionStatus
Expand All @@ -169,8 +158,3 @@ func expectConditions(getter conditions.Getter, expected []conditionAssertion) {
Expect(actual.Reason).To(Equal(c.reason))
}
}

func intOrStrPtr(i int32) *intstr.IntOrString {
res := intstr.FromInt(int(i))
return &res
}

0 comments on commit 4a25215

Please sign in to comment.