Skip to content
This repository was archived by the owner on Jan 16, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
08e2f92
Stash to GitHub (#92)
JeremyTangCD Dec 21, 2018
68b1557
Dev-40217 support to set log levels and improve (#94)
JeremyTangCD Jan 2, 2019
2582900
bump version
Jan 2, 2019
73338c7
Remove beta tag (#97)
woz5999 Jan 7, 2019
0bd4050
Dev 42060 improve the initSync and the branch of the lm sdk (#98)
JeremyTangCD Jan 17, 2019
8f7491d
Merge branch 'master' into develop
woz5999 Jan 17, 2019
62c7a05
Dev 49046 fix the internal ip cannot found (#102)
JeremyTangCD Feb 18, 2019
261d044
Merge branch 'master' into develop
woz5999 Feb 21, 2019
da40fa7
DEV-48974 Upgrade the go version of the argus from 1.9 to 1.11 (#104)
JeremyTangCD Feb 28, 2019
2d6af21
Merge branch 'master' into develop
woz5999 Mar 28, 2019
46b3ac7
Develop (#108)
DzXiaoLMCD May 20, 2019
5c21dbd
Merge branch 'master' into develop
woz5999 May 22, 2019
34b0bf1
Add deployment and device uptime support (#110)
DzXiaoLMCD Jun 19, 2019
654d92c
Merge branch 'master' into develop
woz5999 Jun 26, 2019
cedf4e8
Develop (#112)
DzXiaoLMCD Jul 3, 2019
8db30a4
Merge branch 'master' into develop
Jul 11, 2019
0af387d
Develop (#114)
DzXiaoLMCD Jul 29, 2019
648acbc
Dev 55114 argus shouldn t overwrite system.categories values (#116)
JeremyTangCD Dec 13, 2019
d65944a
Merge branch 'master' into develop
Dec 13, 2019
72fc2d2
Adding support for k8s 1.167+ (#124)
vkumbhar94 Apr 21, 2020
0a19c59
Merge branch 'master' into develop
vkumbhar94 Apr 21, 2020
f27fb33
Milestone 3.0.1 Changes (#135)
vkumbhar94 Jun 4, 2020
a1946a8
Merge branch 'master' into develop
vkumbhar94 Jun 4, 2020
a1f384a
Gosec fixes (#138)
vkumbhar94 Jun 30, 2020
7165c1e
Merge branch 'master' into develop
vkumbhar94 Jul 1, 2020
c7721ca
Argus 3.1.0 dev (#140)
vkumbhar94 Aug 3, 2020
97da650
V4.0.0 changes 2 (#143)
vkumbhar94 Sep 11, 2020
836c58e
Merge branch 'master' into develop
vkumbhar94 Sep 11, 2020
29b823f
removed uncaught conflict
vkumbhar94 Sep 11, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 105 additions & 0 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@
branch = "release-14.0"
name = "k8s.io/client-go"

[[constraint]]
version = "v1.1.1"
name = "github.com/google/uuid"

[[override]]
name = "github.com/ugorji/go"
revision = "8c0409fcbb70099c748d71f714529204975f6c3f"
10 changes: 6 additions & 4 deletions cmd/watch.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,25 @@ var watchCmd = &cobra.Command{
// version to the next.

// Application configuration
config, err := config.GetConfig()
conf, err := config.GetConfig()
if err != nil {
fmt.Printf("Failed to open %s: %v", constants.ConfigPath, err)
os.Exit(1)
}

// Set the logging level.
if config.Debug {
if conf.Debug {
log.SetLevel(log.DebugLevel)
}
// Monitor config for log level change
lmlog.MonitorConfig()

// Add hook to log pod id in log context
hook := &lmlog.DefaultFieldHook{}
log.AddHook(hook)

// Instantiate the base struct.
base, err := argus.NewBase(config)
base, err := argus.NewBase(conf)
if err != nil {
log.Fatal(err.Error())
}
Expand All @@ -52,7 +54,7 @@ var watchCmd = &cobra.Command{
permission.Init(base.K8sClient)

// Set up a gRPC connection and CSC Client.
connection.Initialize(config)
connection.Initialize(conf)

connection.CreateConnectionHandler()

Expand Down
Loading