github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-05-01 21:36:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔨 Rename kubeshark package to misc

Browse Source
This commit is contained in:
M. Mert Yildiran 2022-12-29 03:45:24 +03:00
parent 6d06c53ebf
commit 9ab9f139c0
No known key found for this signature in database
GPG Key ID: DA5D6DCBB758A461
11 changed files with 23 additions and 23 deletions

6
cmd/common.go
View File

@ -12,8 +12,8 @@ import (
"github.com/kubeshark/kubeshark/errormessage" "github.com/kubeshark/kubeshark/errormessage"
"github.com/kubeshark/kubeshark/internal/connect" "github.com/kubeshark/kubeshark/internal/connect"
"github.com/kubeshark/kubeshark/kubernetes" "github.com/kubeshark/kubeshark/kubernetes"
"github.com/kubeshark/kubeshark/kubeshark" "github.com/kubeshark/kubeshark/misc"
"github.com/kubeshark/kubeshark/kubeshark/fsUtils" "github.com/kubeshark/kubeshark/misc/fsUtils"
"github.com/kubeshark/kubeshark/resources" "github.com/kubeshark/kubeshark/resources"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
@ -105,7 +105,7 @@ func dumpLogsIfNeeded(ctx context.Context, kubernetesProvider *kubernetes.Provid
if !config.Config.DumpLogs { if !config.Config.DumpLogs {
return return
} }
kubesharkDir := kubeshark.GetKubesharkFolderPath() kubesharkDir := misc.GetDotFolderPath()
filePath := path.Join(kubesharkDir, fmt.Sprintf("kubeshark_logs_%s.zip", time.Now().Format("2006_01_02__15_04_05"))) filePath := path.Join(kubesharkDir, fmt.Sprintf("kubeshark_logs_%s.zip", time.Now().Format("2006_01_02__15_04_05")))
if err := fsUtils.DumpLogs(ctx, kubernetesProvider, filePath); err != nil { if err := fsUtils.DumpLogs(ctx, kubernetesProvider, filePath); err != nil {
log.Error().Err(err).Msg("Failed to dump logs.") log.Error().Err(err).Msg("Failed to dump logs.")

2
cmd/logs.go
View File

@ -7,7 +7,7 @@ import (
"github.com/kubeshark/kubeshark/config" "github.com/kubeshark/kubeshark/config"
"github.com/kubeshark/kubeshark/config/configStructs" "github.com/kubeshark/kubeshark/config/configStructs"
"github.com/kubeshark/kubeshark/errormessage" "github.com/kubeshark/kubeshark/errormessage"
"github.com/kubeshark/kubeshark/kubeshark/fsUtils" "github.com/kubeshark/kubeshark/misc/fsUtils"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

12
cmd/version.go
View File

@ -6,7 +6,7 @@ import (
"time" "time"
"github.com/kubeshark/kubeshark/config" "github.com/kubeshark/kubeshark/config"
"github.com/kubeshark/kubeshark/kubeshark" "github.com/kubeshark/kubeshark/misc"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -15,16 +15,16 @@ var versionCmd = &cobra.Command{
Use: "version", Use: "version",
Short: "Print version info", Short: "Print version info",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
timeStampInt, _ := strconv.ParseInt(kubeshark.BuildTimestamp, 10, 0) timeStampInt, _ := strconv.ParseInt(misc.BuildTimestamp, 10, 0)
if config.DebugMode { if config.DebugMode {
log.Info(). log.Info().
Str("version", kubeshark.Ver). Str("version", misc.Ver).
Str("branch", kubeshark.Branch). Str("branch", misc.Branch).
Str("commit-hash", kubeshark.GitCommitHash). Str("commit-hash", misc.GitCommitHash).
Time("build-time", time.Unix(timeStampInt, 0)). Time("build-time", time.Unix(timeStampInt, 0)).
Send() Send()
} else { } else {
fmt.Println(kubeshark.Ver) fmt.Println(misc.Ver)
} }
return nil return nil
}, },

2
config/config.go
View File

@ -10,7 +10,7 @@ import (
"strings" "strings"
"github.com/creasty/defaults" "github.com/creasty/defaults"
"github.com/kubeshark/kubeshark/kubeshark/version" "github.com/kubeshark/kubeshark/misc/version"
"github.com/kubeshark/kubeshark/utils" "github.com/kubeshark/kubeshark/utils"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"

4
config/configStruct.go
View File

@ -6,7 +6,7 @@ import (
"path/filepath" "path/filepath"
"github.com/kubeshark/kubeshark/config/configStructs" "github.com/kubeshark/kubeshark/config/configStructs"
"github.com/kubeshark/kubeshark/kubeshark" "github.com/kubeshark/kubeshark/misc"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/client-go/util/homedir" "k8s.io/client-go/util/homedir"
) )
@ -38,7 +38,7 @@ type ConfigStruct struct {
} }
func (config *ConfigStruct) SetDefaults() { func (config *ConfigStruct) SetDefaults() {
config.ConfigFilePath = path.Join(kubeshark.GetKubesharkFolderPath(), "config.yaml") config.ConfigFilePath = path.Join(misc.GetDotFolderPath(), "config.yaml")
} }
func (config *ConfigStruct) ImagePullPolicy() v1.PullPolicy { func (config *ConfigStruct) ImagePullPolicy() v1.PullPolicy {

4
kubeshark/consts.go → misc/consts.go
View File

@ -1,4 +1,4 @@
package kubeshark package misc
import ( import (
"os" "os"
@ -14,7 +14,7 @@ var (
Platform = "" Platform = ""
) )
func GetKubesharkFolderPath() string { func GetDotFolderPath() string {
home, homeDirErr := os.UserHomeDir() home, homeDirErr := os.UserHomeDir()
if homeDirErr != nil { if homeDirErr != nil {
return "" return ""

0
kubeshark/fsUtils/dirUtils.go → misc/fsUtils/dirUtils.go
View File

0
kubeshark/fsUtils/kubesharkLogsUtils.go → misc/fsUtils/kubesharkLogsUtils.go
View File

0
kubeshark/fsUtils/zipUtils.go → misc/fsUtils/zipUtils.go
View File

10
kubeshark/version/versionCheck.go → misc/version/versionCheck.go
View File

@ -9,7 +9,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/kubeshark/kubeshark/kubeshark" "github.com/kubeshark/kubeshark/misc"
"github.com/kubeshark/kubeshark/pkg/version" "github.com/kubeshark/kubeshark/pkg/version"
"github.com/kubeshark/kubeshark/utils" "github.com/kubeshark/kubeshark/utils"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
@ -54,18 +54,18 @@ func CheckNewerVersion() {
gitHubVersion := string(data) gitHubVersion := string(data)
gitHubVersion = gitHubVersion[:len(gitHubVersion)-1] gitHubVersion = gitHubVersion[:len(gitHubVersion)-1]
greater, err := version.GreaterThen(gitHubVersion, kubeshark.Ver) greater, err := version.GreaterThen(gitHubVersion, misc.Ver)
if err != nil { if err != nil {
log.Error(). log.Error().
Str("upstream-version", gitHubVersion). Str("upstream-version", gitHubVersion).
Str("local-version", kubeshark.Ver). Str("local-version", misc.Ver).
Msg("Version is invalid!") Msg("Version is invalid!")
return return
} }
log.Debug(). log.Debug().
Str("upstream-version", gitHubVersion). Str("upstream-version", gitHubVersion).
Str("local-version", kubeshark.Ver). Str("local-version", misc.Ver).
Dur("elapsed-time", time.Since(start)). Dur("elapsed-time", time.Since(start)).
Msg("Finished version validation.") Msg("Finished version validation.")
@ -76,7 +76,7 @@ func CheckNewerVersion() {
} else { } else {
downloadCommand = "sh <(curl -Ls https://kubeshark.co/install)" downloadCommand = "sh <(curl -Ls https://kubeshark.co/install)"
} }
msg := fmt.Sprintf("Update available! %v -> %v run:", kubeshark.Ver, gitHubVersion) msg := fmt.Sprintf("Update available! %v -> %v run:", misc.Ver, gitHubVersion)
log.Warn().Str("command", downloadCommand).Msg(fmt.Sprintf(utils.Yellow, msg)) log.Warn().Str("command", downloadCommand).Msg(fmt.Sprintf(utils.Yellow, msg))
} }
} }

6
resources/createResources.go
View File

@ -7,7 +7,7 @@ import (
"github.com/kubeshark/kubeshark/docker" "github.com/kubeshark/kubeshark/docker"
"github.com/kubeshark/kubeshark/errormessage" "github.com/kubeshark/kubeshark/errormessage"
"github.com/kubeshark/kubeshark/kubernetes" "github.com/kubeshark/kubeshark/kubernetes"
"github.com/kubeshark/kubeshark/kubeshark" "github.com/kubeshark/kubeshark/misc"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
core "k8s.io/api/core/v1" core "k8s.io/api/core/v1"
) )
@ -84,11 +84,11 @@ func createSelfNamespace(ctx context.Context, kubernetesProvider *kubernetes.Pro
func createRBACIfNecessary(ctx context.Context, kubernetesProvider *kubernetes.Provider, isNsRestrictedMode bool, selfNamespace string, resources []string) (bool, error) { func createRBACIfNecessary(ctx context.Context, kubernetesProvider *kubernetes.Provider, isNsRestrictedMode bool, selfNamespace string, resources []string) (bool, error) {
if !isNsRestrictedMode { if !isNsRestrictedMode {
if err := kubernetesProvider.CreateKubesharkRBAC(ctx, selfNamespace, kubernetes.ServiceAccountName, kubernetes.ClusterRoleName, kubernetes.ClusterRoleBindingName, kubeshark.RBACVersion, resources); err != nil { if err := kubernetesProvider.CreateKubesharkRBAC(ctx, selfNamespace, kubernetes.ServiceAccountName, kubernetes.ClusterRoleName, kubernetes.ClusterRoleBindingName, misc.RBACVersion, resources); err != nil {
return false, err return false, err
} }
} else { } else {
if err := kubernetesProvider.CreateKubesharkRBACNamespaceRestricted(ctx, selfNamespace, kubernetes.ServiceAccountName, kubernetes.RoleName, kubernetes.RoleBindingName, kubeshark.RBACVersion); err != nil { if err := kubernetesProvider.CreateKubesharkRBACNamespaceRestricted(ctx, selfNamespace, kubernetes.ServiceAccountName, kubernetes.RoleName, kubernetes.RoleBindingName, misc.RBACVersion); err != nil {
return false, err return false, err
} }
} }