Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Choose different ip range #191

Merged
merged 1 commit into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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 @@
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 @@
upgradeFunc: func(c *cli.Context) error { return nil },
needInstall: true,
},
{
version: v1410,
upgradeFunc: func(c *cli.Context) error { return nil },

Check warning on line 90 in stader-cli/service/migration.go

View workflow job for this annotation

GitHub Actions / build

unused-parameter: parameter 'c' seems to be unused, consider removing or renaming it as _ (revive)
needInstall: true,
},
}

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