Skip to content

Commit

Permalink
Cleanup (#55)
Browse files Browse the repository at this point in the history 
* go 1.17 has deprecated installing executables with `go get`
Use go install instead
Set GOFLAGS to empty string to overcome the `cannot query module due to
-mod=vendor` error we get in presubmit job

* Updated kustomize version to a version that support go install
See kubernetes-sigs/kustomize#3618

* Install golangci-lint from source
See golangci/golangci-lint#2374

* Fix lint issue
See golangci/golangci-lint#2601

* Refactor - don't pass around origRes and origErr
  • Loading branch information
@eranco74
eranco74 committed Sep 19, 2022
1 parent e6fa01e commit dc2d7dd
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 36 deletions.
14 changes: 5 additions & 9 deletions Makefile
View file
Expand Up @@ -153,31 +153,27 @@ controller-gen: ## Download controller-gen locally if necessary.

KUSTOMIZE = $(shell pwd)/bin/kustomize
kustomize: ## Download kustomize locally if necessary.
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v3@v3.8.7)
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v4@v4.5.2)

ENVTEST = $(shell pwd)/bin/setup-envtest
envtest: ## Download envtest-setup locally if necessary.
$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)

MOCKGEN = $(shell pwd)/bin/mockgen
mockgen: ## Download mockgen locally if necessary.
$(call go-get-tool,$(MOCKGEN),github.com/golang/mock/mockgen)
$(call go-get-tool,$(MOCKGEN),github.com/golang/mock/mockgen@latest)

GOLINT = $(shell pwd)/bin/golangci-lint
golint: ## Download golangci-lint locally if necessary.
@[ -f $(GOLINT) ] || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell pwd)/bin v1.43.0
$(call go-get-tool,$(GOLINT),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.44.2)

# go-get-tool will 'go get' any package $2 and install it to $1.
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
define go-get-tool
@[ -f $(1) ] || { \
set -e ;\
TMP_DIR=$$(mktemp -d) ;\
cd $$TMP_DIR ;\
go mod init tmp ;\
echo "Downloading $(2)" ;\
GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\
rm -rf $$TMP_DIR ;\
echo "Installing $(2)" ;\
GOFLAGS="" GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
}
endef

Expand Down
52 changes: 27 additions & 25 deletions controllers/agentmachine_controller.go
View file
Expand Up @@ -101,7 +101,7 @@ func (r *AgentMachineReconciler) Reconcile(ctx context.Context, req ctrl.Request
}
if machine == nil {
log.Info("Waiting for Machine Controller to set OwnerRef on AgentMachine")
return r.updateStatus(ctx, log, agentMachine, ctrl.Result{}, nil)
return ctrl.Result{}, r.updateStatus(ctx, log, agentMachine, nil)
}

res, err := r.handleDeletionHook(ctx, log, agentMachine, machine)
Expand All @@ -120,7 +120,9 @@ func (r *AgentMachineReconciler) Reconcile(ctx context.Context, req ctrl.Request
}

if agentCluster.Status.ClusterDeploymentRef.Name == "" {
return r.updateStatus(ctx, log, agentMachine, ctrl.Result{}, fmt.Errorf("No cluster deployment reference on agentCluster %s", agentCluster.GetName()))
err = fmt.Errorf("No cluster deployment reference on agentCluster %s", agentCluster.GetName())
log.Warning(err.Error())
return ctrl.Result{}, r.updateStatus(ctx, log, agentMachine, err)
}

machineConfigPool, ignitionTokenSecretRef, err := r.processBootstrapDataSecret(ctx, log, machine)
Expand All @@ -130,20 +132,21 @@ func (r *AgentMachineReconciler) Reconcile(ctx context.Context, req ctrl.Request

// If the AgentMachine doesn't have an agent, find one and set the agentRef
if agentMachine.Status.AgentRef == nil {
foundAgent, err := r.findAgent(ctx, log, agentMachine, agentCluster.Status.ClusterDeploymentRef, machineConfigPool, ignitionTokenSecretRef)
var foundAgent *aiv1beta1.Agent
foundAgent, err = r.findAgent(ctx, log, agentMachine, agentCluster.Status.ClusterDeploymentRef, machineConfigPool, ignitionTokenSecretRef)
if foundAgent == nil || err != nil {
return r.updateStatus(ctx, log, agentMachine, ctrl.Result{}, err)
return ctrl.Result{}, r.updateStatus(ctx, log, agentMachine, err)
}

err = r.updateAgentMachineWithFoundAgent(ctx, log, agentMachine, foundAgent)
if err != nil {
log.WithError(err).Error("failed to update AgentMachine with found agent")
return r.updateStatus(ctx, log, agentMachine, ctrl.Result{}, err)
return ctrl.Result{}, r.updateStatus(ctx, log, agentMachine, err)
}
}

// If the AgentMachine has an agent, check its conditions and update ready/error
return r.updateStatus(ctx, log, agentMachine, ctrl.Result{}, nil)
return ctrl.Result{}, r.updateStatus(ctx, log, agentMachine, nil)
}

func (r *AgentMachineReconciler) removeMachineDeletionHookAnnotation(ctx context.Context, machine *clusterv1.Machine) (err error) {
Expand Down Expand Up @@ -479,27 +482,27 @@ func isValidAgent(agent *aiv1beta1.Agent, agentMachine *capiproviderv1alpha1.Age
return true
}

func (r *AgentMachineReconciler) updateStatus(ctx context.Context, log logrus.FieldLogger, agentMachine *capiproviderv1alpha1.AgentMachine, origRes ctrl.Result, origErr error) (ctrl.Result, error) {
installationInProgress := false
conditionPassed := setAgentReservedCondition(agentMachine, origErr)
func (r *AgentMachineReconciler) updateStatus(ctx context.Context, log logrus.FieldLogger, agentMachine *capiproviderv1alpha1.AgentMachine, err error) error {
conditionPassed := setAgentReservedCondition(agentMachine, err)
if !conditionPassed {
conditions.MarkFalse(agentMachine, capiproviderv1alpha1.AgentSpecSyncedCondition, capiproviderv1alpha1.AgentNotYetFoundReason, clusterv1.ConditionSeverityInfo, "Agent not yet reserved")
conditions.MarkFalse(agentMachine, capiproviderv1alpha1.AgentValidatedCondition, capiproviderv1alpha1.AgentNotYetFoundReason, clusterv1.ConditionSeverityInfo, "Agent not yet reserved")
conditions.MarkFalse(agentMachine, capiproviderv1alpha1.AgentRequirementsMetCondition, capiproviderv1alpha1.AgentNotYetFoundReason, clusterv1.ConditionSeverityInfo, "Agent not yet reserved")
conditions.MarkFalse(agentMachine, capiproviderv1alpha1.InstalledCondition, capiproviderv1alpha1.AgentNotYetFoundReason, clusterv1.ConditionSeverityInfo, "Agent not yet reserved")
return r.setStatus(ctx, log, agentMachine, origRes, origErr, installationInProgress)
err = r.setStatus(ctx, log, agentMachine)
return err
}

agent, err := r.getAgent(ctx, log, agentMachine)
if err != nil {
return ctrl.Result{}, err
agent, getErr := r.getAgent(ctx, log, agentMachine)
if getErr != nil {
return getErr
}

setConditionByAgentCondition(agentMachine, agent, capiproviderv1alpha1.AgentSpecSyncedCondition, aiv1beta1.SpecSyncedCondition, clusterv1.ConditionSeverityError)
setConditionByAgentCondition(agentMachine, agent, capiproviderv1alpha1.AgentValidatedCondition, aiv1beta1.ValidatedCondition, clusterv1.ConditionSeverityError)
setConditionByAgentCondition(agentMachine, agent, capiproviderv1alpha1.AgentRequirementsMetCondition, aiv1beta1.RequirementsMetCondition, clusterv1.ConditionSeverityError)
installationInProgress = !setConditionByAgentCondition(agentMachine, agent, capiproviderv1alpha1.InstalledCondition, aiv1beta1.InstalledCondition, clusterv1.ConditionSeverityInfo)
return r.setStatus(ctx, log, agentMachine, origRes, origErr, installationInProgress)
setConditionByAgentCondition(agentMachine, agent, capiproviderv1alpha1.InstalledCondition, aiv1beta1.InstalledCondition, clusterv1.ConditionSeverityInfo)
err = r.setStatus(ctx, log, agentMachine)
return err
}

func (r *AgentMachineReconciler) getAgent(ctx context.Context, log logrus.FieldLogger, agentMachine *capiproviderv1alpha1.AgentMachine) (*aiv1beta1.Agent, error) {
Expand Down Expand Up @@ -532,12 +535,12 @@ func setConditionByAgentCondition(agentMachine *capiproviderv1alpha1.AgentMachin
return false
}

func setAgentReservedCondition(agentMachine *capiproviderv1alpha1.AgentMachine, origErr error) bool {
func setAgentReservedCondition(agentMachine *capiproviderv1alpha1.AgentMachine, err error) bool {
if agentMachine.Status.AgentRef == nil {
if origErr == nil {
if err == nil {
conditions.MarkFalse(agentMachine, capiproviderv1alpha1.AgentReservedCondition, capiproviderv1alpha1.NoSuitableAgentsReason, clusterv1.ConditionSeverityWarning, "")
} else {
conditions.MarkFalse(agentMachine, capiproviderv1alpha1.AgentReservedCondition, capiproviderv1alpha1.AgentNotYetFoundReason, clusterv1.ConditionSeverityInfo, origErr.Error())
conditions.MarkFalse(agentMachine, capiproviderv1alpha1.AgentReservedCondition, capiproviderv1alpha1.AgentNotYetFoundReason, clusterv1.ConditionSeverityInfo, err.Error())
}
return false
}
Expand All @@ -546,7 +549,7 @@ func setAgentReservedCondition(agentMachine *capiproviderv1alpha1.AgentMachine,
return true
}

func (r *AgentMachineReconciler) setStatus(ctx context.Context, log logrus.FieldLogger, agentMachine *capiproviderv1alpha1.AgentMachine, origRes ctrl.Result, origErr error, installationInProgress bool) (ctrl.Result, error) {
func (r *AgentMachineReconciler) setStatus(ctx context.Context, log logrus.FieldLogger, agentMachine *capiproviderv1alpha1.AgentMachine) error {
conditions.SetSummary(agentMachine,
conditions.WithConditions(capiproviderv1alpha1.AgentReservedCondition,
capiproviderv1alpha1.AgentSpecSyncedCondition,
Expand All @@ -559,12 +562,11 @@ func (r *AgentMachineReconciler) setStatus(ctx context.Context, log logrus.Field

agentMachine.Status.Ready, _ = strconv.ParseBool(string(conditions.Get(agentMachine, clusterv1.ReadyCondition).Status))

if updateErr := r.Status().Update(ctx, agentMachine); updateErr != nil {
log.WithError(updateErr).Error("failed to update AgentMachine Status")
return ctrl.Result{}, updateErr
err := r.Status().Update(ctx, agentMachine)
if err != nil {
log.WithError(err).Error("failed to update AgentMachine Status")
}

return origRes, origErr
return err
}

func getAddresses(foundAgent *aiv1beta1.Agent) []clusterv1.MachineAddress {
Expand Down
2 changes: 0 additions & 2 deletions main.go
View file
Expand Up @@ -29,8 +29,6 @@ import (
"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"

// to ensure that exec-entrypoint and run can make use of them.
_ "k8s.io/client-go/plugin/pkg/client/auth"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/cache"
Expand Down

0 comments on commit dc2d7dd

Please sign in to comment.