Skip to content

Commit

Permalink
Merge pull request #191 from stader-labs/fix_invalid_subnet
Browse files Browse the repository at this point in the history
Choose different ip range
  • Loading branch information
batphonghan authored Feb 23, 2024
2 parents 64fadc3 + aa57123 commit 5b1a3e0
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
6 changes: 3 additions & 3 deletions install/override/prometheus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ networks:
ipam:
driver: default
config:
- subnet: 192.168.1.0/16
ip_range: 192.168.5.0/24
gateway: 192.168.5.254
- subnet: 172.23.0.0/16
ip_range: 172.23.5.0/24
gateway: 172.23.5.254
6 changes: 3 additions & 3 deletions install/templates/prometheus.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ networks:
ipam:
driver: default
config:
- subnet: 192.168.1.0/16
ip_range: 192.168.5.0/24
gateway: 192.168.5.254
- subnet: 172.23.0.0/16
ip_range: 172.23.5.0/24
gateway: 172.23.5.254
net:
volumes:
prometheus-data:
10 changes: 10 additions & 0 deletions stader-cli/service/migration.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ func migrate(c *cli.Context) (runBeforeUpgrades, rundAfterUpgrades []ConfigUpgra
return nil, nil, err
}

v1410, err := parseVersion("1.4.10")
if err != nil {
return nil, nil, err
}

// Create the collection of upgraders
upgraders := []ConfigUpgrader{
{
Expand All @@ -80,6 +85,11 @@ func migrate(c *cli.Context) (runBeforeUpgrades, rundAfterUpgrades []ConfigUpgra
upgradeFunc: func(c *cli.Context) error { return nil },
needInstall: true,
},
{
version: v1410,
upgradeFunc: func(c *cli.Context) error { return nil },
needInstall: true,
},
}

staderClient, err := stader.NewClientFromCtx(c)
Expand Down

0 comments on commit 5b1a3e0

Please sign in to comment.