github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #82721 from hwdef/add-err-handling-in-images/etcd/migrate

Browse Source 
add-err-handling-in-images/etcd/migrate
This commit is contained in:
Kubernetes Prow Robot 2019-09-18 22:13:00 -07:00 committed by GitHub
commit 8453e90500
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/images/etcd/migrate/data_dir_test.go
View File

@ -151,9 +151,12 @@ func TestBackup(t *testing.T) {
func newTestPath(t *testing.T) string { func newTestPath(t *testing.T) string {
path, err := ioutil.TempDir("", "etcd-migrate-test-") path, err := ioutil.TempDir("", "etcd-migrate-test-")
os.Chmod(path, 0777)
if err != nil { if err != nil {
t.Fatalf("Failed to create tmp dir for test: %v", err) t.Fatalf("Failed to create tmp dir for test: %v", err)
} }
err = os.Chmod(path, 0777)
if err != nil {
t.Fatalf("Failed to granting permission to tmp dir for test: %v", err)
}
return path return path
} }

5
cluster/images/etcd/migrate/migrate.go
View File

@ -77,7 +77,10 @@ func main() {
flags.StringVar(&opts.targetVersion, "target-version", "", "version of etcd to migrate to. Format must be '<major>.<minor>.<patch>'") flags.StringVar(&opts.targetVersion, "target-version", "", "version of etcd to migrate to. Format must be '<major>.<minor>.<patch>'")
flags.StringVar(&opts.targetStorage, "target-storage", "", "storage version of etcd to migrate to, one of: etcd2, etcd3") flags.StringVar(&opts.targetStorage, "target-storage", "", "storage version of etcd to migrate to, one of: etcd2, etcd3")
flags.StringVar(&opts.etcdServerArgs, "etcd-server-extra-args", "", "additional etcd server args for starting etcd servers during migration steps, --peer-* TLS cert flags should be added for etcd clusters with more than 1 member that use mutual TLS for peer communication.") flags.StringVar(&opts.etcdServerArgs, "etcd-server-extra-args", "", "additional etcd server args for starting etcd servers during migration steps, --peer-* TLS cert flags should be added for etcd clusters with more than 1 member that use mutual TLS for peer communication.")
migrateCmd.Execute() err := migrateCmd.Execute()
if err != nil {
fmt.Printf("Failed to execute migratecmd: %s", err)
}
} }
// runMigrate validates the command line flags and starts the migration. // runMigrate validates the command line flags and starts the migration.