diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 2305b52f..2ec5a9ae 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -468,11 +468,11 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "498bb3d8b5a6" + "Rev": "6c086a5e99d5" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "6d2f20b34738" + "Rev": "17b79e78ed4a" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 8fd7c5b0..f7204ae7 100644 --- a/go.mod +++ b/go.mod @@ -26,14 +26,14 @@ require ( golang.org/x/net v0.0.0-20201110031124-69a78807bb2b golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e - k8s.io/api v0.0.0-20210218021651-498bb3d8b5a6 - k8s.io/apimachinery v0.0.0-20210219091810-6d2f20b34738 + k8s.io/api v0.0.0-20210226052003-6c086a5e99d5 + k8s.io/apimachinery v0.0.0-20210226011828-17b79e78ed4a k8s.io/klog/v2 v2.5.0 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 sigs.k8s.io/yaml v1.2.0 ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20210218021651-498bb3d8b5a6 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210219091810-6d2f20b34738 + k8s.io/api => k8s.io/api v0.0.0-20210226052003-6c086a5e99d5 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210226011828-17b79e78ed4a ) diff --git a/go.sum b/go.sum index 8176ec61..b70cc444 100644 --- a/go.sum +++ b/go.sum @@ -423,8 +423,8 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20210218021651-498bb3d8b5a6/go.mod h1:60tmSUpHxGPFerNHbo/ayI2lKxvtrhbxFyXuEIWJd78= -k8s.io/apimachinery v0.0.0-20210219091810-6d2f20b34738/go.mod h1:Z7ps/g0rjlTeMstYrMOUttJfT2Gg34DEaG/f2PYLCWY= +k8s.io/api v0.0.0-20210226052003-6c086a5e99d5/go.mod h1:Nh18pQLKkWHD2cDdPwWlWMoPOzjckp60G74Ryb+pTHU= +k8s.io/apimachinery v0.0.0-20210226011828-17b79e78ed4a/go.mod h1:Z7ps/g0rjlTeMstYrMOUttJfT2Gg34DEaG/f2PYLCWY= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.5.0 h1:8mOnjf1RmUPW6KRqQCfYSZq/K20Unmp3IhuZUhxl8KI= diff --git a/pkg/version/base.go b/pkg/version/base.go index 9b4c79f8..51e34dda 100644 --- a/pkg/version/base.go +++ b/pkg/version/base.go @@ -55,7 +55,7 @@ var ( // NOTE: The $Format strings are replaced during 'git archive' thanks to the // companion .gitattributes file containing 'export-subst' in this same // directory. See also https://git-scm.com/docs/gitattributes - gitVersion string = "v0.0.0-master+$Format:%h$" + gitVersion string = "v0.0.0-master+$Format:%H$" gitCommit string = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD) gitTreeState string = "" // state of git tree, either "clean" or "dirty"