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

Master #2795

Merged
merged 53 commits into from
Jan 24, 2024
Merged

Master #2795

Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
4dd9d35
cleanup script
abhishek9686 Jan 18, 2024
abe7f4c
upgrade flag
abhishek9686 Jan 18, 2024
6749fb4
add trial license logic
abhishek9686 Jan 19, 2024
5b7d170
remvove license input on pro in script
abhishek9686 Jan 19, 2024
c674929
invoke trial from main
abhishek9686 Jan 19, 2024
040e700
revamp pro trial invocation
abhishek9686 Jan 19, 2024
34e6140
fix build
abhishek9686 Jan 19, 2024
ffb9790
store trial as bytes
abhishek9686 Jan 19, 2024
e390398
conv key pair to bytes
abhishek9686 Jan 19, 2024
7a39ef3
add trial end date to server status api
abhishek9686 Jan 19, 2024
17980cc
get trial end date only if license key is missing
abhishek9686 Jan 19, 2024
dbc48b1
check if trial table is empty
abhishek9686 Jan 22, 2024
5b335fb
add upgrade and downgrade options
abhishek9686 Jan 22, 2024
49641df
fix script args
abhishek9686 Jan 22, 2024
49c64ef
save config only if values are not empty
abhishek9686 Jan 22, 2024
cf9febb
fix script args
abhishek9686 Jan 22, 2024
dc953c7
fix script args
abhishek9686 Jan 22, 2024
c16ea48
fix script args
abhishek9686 Jan 22, 2024
ce34a3f
more info log
abhishek9686 Jan 22, 2024
96c6495
check if netclient exists
abhishek9686 Jan 23, 2024
1f44817
add tenantid check
abhishek9686 Jan 23, 2024
487c3f5
addtional logs in script
abhishek9686 Jan 23, 2024
32974e2
skip trial end date check on err
abhishek9686 Jan 23, 2024
1d25096
add license logs
abhishek9686 Jan 23, 2024
2a4d04c
limit api handler if trail has ended
abhishek9686 Jan 23, 2024
4fe282d
add trial license status to server status api
abhishek9686 Jan 23, 2024
13caec2
get pro override compose only on upgrade
abhishek9686 Jan 23, 2024
a57c669
turn of exporter only on upgrade
abhishek9686 Jan 23, 2024
b7e900f
turn of exporter only on upgrade
abhishek9686 Jan 23, 2024
c2eb662
rm overeride file if present
abhishek9686 Jan 23, 2024
1e90772
rm overide file if present
abhishek9686 Jan 23, 2024
1a17f4e
script fixes
abhishek9686 Jan 23, 2024
17a6392
image tag for testing
abhishek9686 Jan 23, 2024
a446c50
check for pro, if host is getting relayed
abhishek9686 Jan 23, 2024
c690eb1
mover failOver func to pro pkg
abhishek9686 Jan 23, 2024
baaba59
check for pro, if host is getting relayed
abhishek9686 Jan 23, 2024
c67571e
on upgrade and downgrade of tier perisist image tag
abhishek9686 Jan 24, 2024
f535722
avoid pull new config on upgrade and downgrade
abhishek9686 Jan 24, 2024
4a0ec26
get override files on upgrade
abhishek9686 Jan 24, 2024
2164797
copy build tag
abhishek9686 Jan 24, 2024
69dd212
fix upgrade and downgrade
abhishek9686 Jan 24, 2024
dc6ffe1
fix upgrade and downgrade
abhishek9686 Jan 24, 2024
0298532
fix upgrade and downgrade
abhishek9686 Jan 24, 2024
330c230
fix upgrade and downgrade
abhishek9686 Jan 24, 2024
5f20383
replace readthedocs url
abhishek9686 Jan 24, 2024
7a36b93
change trial period to 14 days
abhishek9686 Jan 24, 2024
1d1b9bb
Merge pull request #2786 from gravitl/NET-898
abhishek9686 Jan 24, 2024
790f118
Merge pull request #2792 from gravitl/release-v0.22.0
abhishek9686 Jan 24, 2024
f35087b
fix pro setup link
abhishek9686 Jan 24, 2024
0bb2641
Merge pull request #2793 from gravitl/release-v0.22.0
abhishek9686 Jan 24, 2024
567a8ff
Update README.md
abhishek9686 Jan 24, 2024
0e6881d
fix pro setup link
abhishek9686 Jan 24, 2024
15e414d
Merge pull request #2794 from gravitl/release-v0.22.0
abhishek9686 Jan 24, 2024
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
Prev Previous commit
Next Next commit
skip trial end date check on err
abhishek9686 committed Jan 23, 2024
commit 32974e21d4b09cda5daa15520809820e580428e9
12 changes: 7 additions & 5 deletions pro/initialize.go
Original file line number Diff line number Diff line change
@@ -49,12 +49,14 @@ func InitPro() {
if err != nil {
slog.Error("failed to get trial end date", "error", err)
enableLicenseHook = true
} else {
// check if trial ended
if time.Now().After(trialEndDate) {
// trial ended already
enableLicenseHook = true
}
}
// check if trial ended
if time.Now().After(trialEndDate) {
// trial ended already
enableLicenseHook = true
}

}

if enableLicenseHook {
2 changes: 1 addition & 1 deletion pro/trial.go
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ func initTrial() error {
return err
}
if telData.Hosts > 0 || telData.Networks > 0 || telData.Users > 0 {
return nil
return nil // database is already populated, so skip creating trial
}
database.CreateTable(trial_table_name)
records, err := database.FetchRecords(trial_table_name)