@@ -693,7 +693,7 @@ function os::build::os_version_vars() {

       #

       # TODO: We continue calling this "git version" because so many

       # downstream consumers are expecting it there.

-      OS_GIT_VERSION=$(echo "${OS_GIT_VERSION}" | sed "s/-\([0-9]\{1,\}\)-g\([0-9a-f]\{7\}\)$/\+\2/")

+      OS_GIT_VERSION=$(echo "${OS_GIT_VERSION}" | sed "s/-\([0-9]\{1,\}\)-g\([0-9a-f]\{7,40\}\)$/\+\2/")

       if [[ "${OS_GIT_TREE_STATE}" == "dirty" ]]; then

         # git describe --dirty only considers changes to existing files, but

         # that is problematic since new untracked .go files affect the build,

@@ -724,7 +724,7 @@ function os::build::kube_version_vars() {

   #

   # TODO: We continue calling this "git version" because so many

   # downstream consumers are expecting it there.

-  KUBE_GIT_VERSION=$(echo "${KUBE_GIT_VERSION}" | sed "s/-\([0-9]\{1,\}\)-g\([0-9a-f]\{7\}\)$/\+\2/")

+  KUBE_GIT_VERSION=$(echo "${KUBE_GIT_VERSION}" | sed "s/-\([0-9]\{1,\}\)-g\([0-9a-f]\{7,40\}\)$/\+\2/")

   # Try to match the "git describe" output to a regex to try to extract

   # the "major" and "minor" versions and whether this is the exact tagged