Merge pull request #500 from jcaamano/master

Set Major and Minor in kubernetes version info

Dockerfile

@@ -64,17 +64,23 @@ WORKDIR ${GOPATH}/src/github.com/kubernetes/kubernetes
 # force code generation
 RUN make WHAT=cmd/kube-apiserver
 ARG TAG
+ARG MAJOR
+ARG MINOR
 # build statically linked executables
 RUN echo "export GIT_COMMIT=$(git rev-parse HEAD)" \
     >> /usr/local/go/bin/go-build-static-k8s.sh
 RUN echo "export BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
     >> /usr/local/go/bin/go-build-static-k8s.sh
 RUN echo "export GO_LDFLAGS=\"-linkmode=external \
     -X k8s.io/component-base/version.gitVersion=${TAG} \
+    -X k8s.io/component-base/version.gitMajor=${MAJOR} \
+    -X k8s.io/component-base/version.gitMinor=${MINOR} \
     -X k8s.io/component-base/version.gitCommit=\${GIT_COMMIT} \
     -X k8s.io/component-base/version.gitTreeState=clean \
     -X k8s.io/component-base/version.buildDate=\${BUILD_DATE} \
     -X k8s.io/client-go/pkg/version.gitVersion=${TAG} \
+    -X k8s.io/client-go/pkg/version.gitMajor=${MAJOR} \
+    -X k8s.io/client-go/pkg/version.gitMinor=${MINOR} \
     -X k8s.io/client-go/pkg/version.gitCommit=\${GIT_COMMIT} \
     -X k8s.io/client-go/pkg/version.gitTreeState=clean \
     -X k8s.io/client-go/pkg/version.buildDate=\${BUILD_DATE} \

scripts/build-image-kubernetes

@@ -7,6 +7,8 @@ source ./scripts/version.sh
 
 DOCKER_BUILDKIT=${DOCKER_BUILDKIT:-1} docker image build \
     --build-arg TAG=${VERSION} \
+    --build-arg MAJOR=${VERSION_MAJOR} \
+    --build-arg MINOR=${VERSION_MINOR} \
     --build-arg KUBERNETES_VERSION=${KUBERNETES_VERSION} \
     --tag ${REPO}/hardened-kubernetes:${DOCKERIZED_VERSION} \
     --tag ${REPO}/hardened-kubernetes:${DOCKERIZED_VERSION}-${GOARCH} \

scripts/version.sh

@@ -53,4 +53,9 @@ else
     VERSION="${KUBERNETES_VERSION}-dev+${COMMIT:0:8}$DIRTY"
 fi
 
+if [[ "${VERSION}" =~ ^v([0-9]+)\.([0-9]+)(\.[0-9]+)?([-+].*)?$ ]]; then
+    VERSION_MAJOR=${BASH_REMATCH[1]}
+    VERSION_MINOR=${BASH_REMATCH[2]}
+fi
+
 DOCKERIZED_VERSION="${VERSION/+/-}" # this mimics what kubernetes builds do