From 5536e5bb447f204c1a2e885623df5b7bcfa1c79e Mon Sep 17 00:00:00 2001 From: Igor Gov Date: Sun, 30 Jan 2022 08:51:17 +0200 Subject: [PATCH] Fixing minor bugs and remove unused dependency (#714) --- agent/go.mod | 1 - cli/cmd/checkRunner.go | 27 ++++++++++++++------------- cli/cmd/logs.go | 2 +- cli/cmd/tapRunner.go | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/agent/go.mod b/agent/go.mod index de9f7022e..aca0c636e 100644 --- a/agent/go.mod +++ b/agent/go.mod @@ -12,7 +12,6 @@ require ( github.com/go-playground/locales v0.13.0 github.com/go-playground/universal-translator v0.17.0 github.com/go-playground/validator/v10 v10.5.0 - github.com/google/martian v2.1.0+incompatible github.com/google/uuid v1.1.2 github.com/gorilla/websocket v1.4.2 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 diff --git a/cli/cmd/checkRunner.go b/cli/cmd/checkRunner.go index 77bdb6518..f53bee0d4 100644 --- a/cli/cmd/checkRunner.go +++ b/cli/cmd/checkRunner.go @@ -3,13 +3,14 @@ package cmd import ( "context" "fmt" + "regexp" + "github.com/up9inc/mizu/cli/apiserver" "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/cli/uiUtils" "github.com/up9inc/mizu/shared/kubernetes" "github.com/up9inc/mizu/shared/logger" "github.com/up9inc/mizu/shared/semver" - "regexp" ) func runMizuCheck() { @@ -169,32 +170,32 @@ func checkAllResourcesExist(ctx context.Context, kubernetesProvider *kubernetes. allResourcesExist := checkResourceExist(config.Config.MizuResourcesNamespace, "namespace", exist, err) exist, err = kubernetesProvider.DoesConfigMapExist(ctx, config.Config.MizuResourcesNamespace, kubernetes.ConfigMapName) - allResourcesExist = checkResourceExist(kubernetes.ConfigMapName, "config map", exist, err) + allResourcesExist = allResourcesExist && checkResourceExist(kubernetes.ConfigMapName, "config map", exist, err) exist, err = kubernetesProvider.DoesServiceAccountExist(ctx, config.Config.MizuResourcesNamespace, kubernetes.ServiceAccountName) - allResourcesExist = checkResourceExist(kubernetes.ServiceAccountName, "service account", exist, err) + allResourcesExist = allResourcesExist && checkResourceExist(kubernetes.ServiceAccountName, "service account", exist, err) if config.Config.IsNsRestrictedMode() { exist, err = kubernetesProvider.DoesRoleExist(ctx, config.Config.MizuResourcesNamespace, kubernetes.RoleName) - allResourcesExist = checkResourceExist(kubernetes.RoleName, "role", exist, err) + allResourcesExist = allResourcesExist && checkResourceExist(kubernetes.RoleName, "role", exist, err) exist, err = kubernetesProvider.DoesRoleBindingExist(ctx, config.Config.MizuResourcesNamespace, kubernetes.RoleBindingName) - allResourcesExist = checkResourceExist(kubernetes.RoleBindingName, "role binding", exist, err) + allResourcesExist = allResourcesExist && checkResourceExist(kubernetes.RoleBindingName, "role binding", exist, err) } else { exist, err = kubernetesProvider.DoesClusterRoleExist(ctx, kubernetes.ClusterRoleName) - allResourcesExist = checkResourceExist(kubernetes.ClusterRoleName, "cluster role", exist, err) + allResourcesExist = allResourcesExist && checkResourceExist(kubernetes.ClusterRoleName, "cluster role", exist, err) exist, err = kubernetesProvider.DoesClusterRoleBindingExist(ctx, kubernetes.ClusterRoleBindingName) - allResourcesExist = checkResourceExist(kubernetes.ClusterRoleBindingName, "cluster role binding", exist, err) + allResourcesExist = allResourcesExist && checkResourceExist(kubernetes.ClusterRoleBindingName, "cluster role binding", exist, err) } exist, err = kubernetesProvider.DoesServiceExist(ctx, config.Config.MizuResourcesNamespace, kubernetes.ApiServerPodName) - allResourcesExist = checkResourceExist(kubernetes.ApiServerPodName, "service", exist, err) + allResourcesExist = allResourcesExist && checkResourceExist(kubernetes.ApiServerPodName, "service", exist, err) if isInstallCommand { - allResourcesExist = checkInstallResourcesExist(ctx, kubernetesProvider) + allResourcesExist = allResourcesExist && checkInstallResourcesExist(ctx, kubernetesProvider) } else { - allResourcesExist = checkTapResourcesExist(ctx, kubernetesProvider) + allResourcesExist = allResourcesExist && checkTapResourcesExist(ctx, kubernetesProvider) } return allResourcesExist @@ -205,13 +206,13 @@ func checkInstallResourcesExist(ctx context.Context, kubernetesProvider *kuberne installResourcesExist := checkResourceExist(kubernetes.DaemonRoleName, "role", exist, err) exist, err = kubernetesProvider.DoesRoleBindingExist(ctx, config.Config.MizuResourcesNamespace, kubernetes.DaemonRoleBindingName) - installResourcesExist = checkResourceExist(kubernetes.DaemonRoleBindingName, "role binding", exist, err) + installResourcesExist = installResourcesExist && checkResourceExist(kubernetes.DaemonRoleBindingName, "role binding", exist, err) exist, err = kubernetesProvider.DoesPersistentVolumeClaimExist(ctx, config.Config.MizuResourcesNamespace, kubernetes.PersistentVolumeClaimName) - installResourcesExist = checkResourceExist(kubernetes.PersistentVolumeClaimName, "persistent volume claim", exist, err) + installResourcesExist = installResourcesExist && checkResourceExist(kubernetes.PersistentVolumeClaimName, "persistent volume claim", exist, err) exist, err = kubernetesProvider.DoesDeploymentExist(ctx, config.Config.MizuResourcesNamespace, kubernetes.ApiServerPodName) - installResourcesExist = checkResourceExist(kubernetes.ApiServerPodName, "deployment", exist, err) + installResourcesExist = installResourcesExist && checkResourceExist(kubernetes.ApiServerPodName, "deployment", exist, err) return installResourcesExist } diff --git a/cli/cmd/logs.go b/cli/cmd/logs.go index fb985c338..662b8c266 100644 --- a/cli/cmd/logs.go +++ b/cli/cmd/logs.go @@ -23,7 +23,7 @@ var logsCmd = &cobra.Command{ if err != nil { return nil } - ctx, _ := context.WithCancel(context.Background()) + ctx := context.Background() if validationErr := config.Config.Logs.Validate(); validationErr != nil { return errormessage.FormatError(validationErr) diff --git a/cli/cmd/tapRunner.go b/cli/cmd/tapRunner.go index e8edc2af8..4b8a378ef 100644 --- a/cli/cmd/tapRunner.go +++ b/cli/cmd/tapRunner.go @@ -342,7 +342,7 @@ func watchApiServerPod(ctx context.Context, kubernetesProvider *kubernetes.Provi if modifiedPod.Status.Phase == core.PodRunning && !isPodReady { isPodReady = true - postApiServerStarted(ctx, kubernetesProvider, cancel, err) + postApiServerStarted(ctx, kubernetesProvider, cancel) } case kubernetes.EventBookmark: break @@ -405,7 +405,7 @@ func watchApiServerEvents(ctx context.Context, kubernetesProvider *kubernetes.Pr case "FailedScheduling", "Failed": logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Mizu API Server status: %s - %s", event.Reason, event.Note)) cancel() - break + } case err, ok := <-errorChan: if !ok { @@ -421,11 +421,11 @@ func watchApiServerEvents(ctx context.Context, kubernetesProvider *kubernetes.Pr } } -func postApiServerStarted(ctx context.Context, kubernetesProvider *kubernetes.Provider, cancel context.CancelFunc, err error) { +func postApiServerStarted(ctx context.Context, kubernetesProvider *kubernetes.Provider, cancel context.CancelFunc) { startProxyReportErrorIfAny(kubernetesProvider, ctx, cancel) options, _ := getMizuApiFilteringOptions() - if err = startTapperSyncer(ctx, cancel, kubernetesProvider, state.targetNamespaces, *options, state.startTime); err != nil { + if err := startTapperSyncer(ctx, cancel, kubernetesProvider, state.targetNamespaces, *options, state.startTime); err != nil { logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Error starting mizu tapper syncer: %v", err)) cancel() }