github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #671 from Random-Liu/ctrcri-to-ctr-cri

Browse Source 
Ctrcri to ctr cri
This commit is contained in:
Lantao Liu
2018-03-15 17:14:59 -07:00
committed by GitHub
parent 1eaef9ee10 7e67d96b9b
commit 5e5a5f50d1
92 changed files with 7103 additions and 3996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
pkg/version/version.go
View File

@@ -1,43 +0,0 @@
/*
Copyright 2017 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package version
import (
"fmt"
"github.com/blang/semver"
)
// CRIContainerdVersion is the version of the cri plugin.
var CRIContainerdVersion = "UNKNOWN"
func validateSemver(sv string) error {
_, err := semver.Parse(sv)
if err != nil {
return fmt.Errorf("couldn't parse version %q: %v", sv, err)
}
return nil
}
// PrintVersion outputs the release version of containerd/cri
func PrintVersion() {
err := validateSemver(CRIContainerdVersion)
if err != nil {
fmt.Println(err)
}
fmt.Println(CRIContainerdVersion)
}

31
pkg/version/version_test.go
View File

@@ -1,31 +0,0 @@
/*
Copyright 2017 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package version
import (
"testing"
"github.com/stretchr/testify/assert"
)
func TestValidateSemver(t *testing.T) {
err := validateSemver("UNKNOWN")
assert := assert.New(t)
assert.NotNil(err)
err = validateSemver("0.0.0-1-gdf6a1cc-dirty")
assert.Nil(err)
}