github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 10:43:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix verify staticcheck flake in cluster/images/etcd

Browse Source
This commit is contained in:
tiloso 2021-06-21 12:05:42 +02:00
parent 513ae557a3
commit b22d0b13cc
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cluster/images/etcd/migrate/integration_test.go
View File

@ -42,7 +42,7 @@ import (
) )
var ( var (
testSupportedVersions = MustParseSupportedVersions([]string{"3.0.17", "3.1.12"}) testSupportedVersions = mustParseSupportedVersions([]string{"3.0.17", "3.1.12"})
testVersionPrevious = &EtcdVersion{semver.MustParse("3.0.17")} testVersionPrevious = &EtcdVersion{semver.MustParse("3.0.17")}
testVersionLatest = &EtcdVersion{semver.MustParse("3.1.12")} testVersionLatest = &EtcdVersion{semver.MustParse("3.1.12")}
) )
@ -79,8 +79,8 @@ func TestMigrate(t *testing.T) {
for _, m := range migrations { for _, m := range migrations {
t.Run(m.title, func(t *testing.T) { t.Run(m.title, func(t *testing.T) {
start := MustParseEtcdVersionPair(m.startVersion) start := mustParseEtcdVersionPair(m.startVersion)
end := MustParseEtcdVersionPair(m.endVersion) end := mustParseEtcdVersionPair(m.endVersion)
testCfgs := clusterConfig(t, m.title, m.memberCount, m.protocol, m.clientListenUrls) testCfgs := clusterConfig(t, m.title, m.memberCount, m.protocol, m.clientListenUrls)
@ -363,3 +363,22 @@ func generateSelfSignedCertKey(host string, alternateIPs []net.IP, alternateDNS
return certBuffer.Bytes(), keyBuffer.Bytes(), nil return certBuffer.Bytes(), keyBuffer.Bytes(), nil
} }
// mustParseEtcdVersionPair parses a "<version>/<storage-version>" string to an EtcdVersionPair
// or panics if the parse fails.
func mustParseEtcdVersionPair(s string) *EtcdVersionPair {
pair, err := ParseEtcdVersionPair(s)
if err != nil {
panic(err)
}
return pair
}
// mustParseSupportedVersions parses a comma separated list of etcd versions or panics if the parse fails.
func mustParseSupportedVersions(list []string) SupportedVersions {
versions, err := ParseSupportedVersions(list)
if err != nil {
panic(err)
}
return versions
}

21
cluster/images/etcd/migrate/versions.go
View File

@ -124,17 +124,6 @@ func ParseEtcdVersionPair(s string) (*EtcdVersionPair, error) {
return &EtcdVersionPair{version, storageVersion}, nil return &EtcdVersionPair{version, storageVersion}, nil
} }
// MustParseEtcdVersionPair parses a "<version>/<storage-version>" string to an EtcdVersionPair
// or panics if the parse fails.
//lint:ignore U1000 Keep unused but exported MustParseEtcdVersionPair until deprecated package is being removed
func MustParseEtcdVersionPair(s string) *EtcdVersionPair {
pair, err := ParseEtcdVersionPair(s)
if err != nil {
panic(err)
}
return pair
}
// String returns "<version>/<storage-version>" string of the EtcdVersionPair. // String returns "<version>/<storage-version>" string of the EtcdVersionPair.
func (vp *EtcdVersionPair) String() string { func (vp *EtcdVersionPair) String() string {
return fmt.Sprintf("%s/%s", vp.version, vp.storageVersion) return fmt.Sprintf("%s/%s", vp.version, vp.storageVersion)
@ -187,13 +176,3 @@ func ParseSupportedVersions(list []string) (SupportedVersions, error) {
} }
return versions, nil return versions, nil
} }
// MustParseSupportedVersions parses a comma separated list of etcd versions or panics if the parse fails.
//lint:ignore U1000 Keep unused but exported MustParseSupportedVersions until deprecated package is being removed
func MustParseSupportedVersions(list []string) SupportedVersions {
versions, err := ParseSupportedVersions(list)
if err != nil {
panic(err)
}
return versions
}