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

[v1.1] Added etcd snapshot timeout parameter #2418

Merged
merged 2 commits into from
Jan 22, 2021

Conversation

rawmind0
Copy link
Contributor

@rawmind0 rawmind0 commented Jan 14, 2021

Issue rancher/rancher#30663

Requires rancher/types#1196 : Timeout field has been added to Services.Etcd. BackupConfig. Once types PR is merged, this PR should be updated to use it.

Required by rancher/rancher#30885

This PR adds the feature to set etcd snapshot timeout instead of the default.

To limit the changes at the rke logic and functions parameters, the Services.Etcd. BackupConfig.Timeout field is read at cluster. SnapshotEtcd and cluster.RestoreEtcdSnapshot functions, using execution context to propagate the argument. docker.WaitForContainer function has been modified to set default WaitTimeout=300 or timeout provided by context value wait_timeout if provided

superseb
superseb previously approved these changes Jan 20, 2021
@rawmind0
Copy link
Contributor Author

Merged rancher/types#1196 and updated PR with proper go mod

Copy link
Contributor

@superseb superseb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are my changes after running the following:

go get github.com/rancher/types@39b83aaa4bed
go mod vendor
go mod tidy
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   go.mod
        modified:   go.sum
        modified:   vendor/github.com/rancher/types/apis/management.cattle.io/v3/backup_types.go
        modified:   vendor/modules.txt

@rawmind0
Copy link
Contributor Author

You are right @superseb . Updated PR with the proper go mod and vendor files

@superseb superseb self-requested a review January 22, 2021 12:10
@rawmind0 rawmind0 merged commit 6918894 into rancher:release/v1.1 Jan 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants