Merge pull request #1933 from k8s-infra-cherrypick-robot/cherry-pick-…

…1908-to-release-1.1

[release-1.1] Show correct CCM/CNM version in apiserver

hack/pkg-config.sh

@@ -35,10 +35,13 @@ else
 fi
 
 VERSION_PKG=sigs.k8s.io/cloud-provider-azure/pkg/version
+CLIENT_GO_VERSION_PKG=k8s.io/client-go/pkg/version
+BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+
 LDFLAGS="-s -w"
-LDFLAGS="$LDFLAGS -X $VERSION_PKG.gitVersion=${GIT_VERSION}"
-LDFLAGS="$LDFLAGS -X $VERSION_PKG.gitCommit=${GIT_COMMIT}"
-LDFLAGS="$LDFLAGS -X $VERSION_PKG.gitMajor=${VERSION_MAJOR}"
-LDFLAGS="$LDFLAGS -X $VERSION_PKG.gitMinor=${VERSION_MINOR}"
-LDFLAGS="$LDFLAGS -X $VERSION_PKG.buildDate=$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+LDFLAGS="$LDFLAGS -X ${VERSION_PKG}.gitVersion=${GIT_VERSION} -X ${CLIENT_GO_VERSION_PKG}.gitVersion=${GIT_VERSION}"
+LDFLAGS="$LDFLAGS -X ${VERSION_PKG}.gitCommit=${GIT_COMMIT} -X ${CLIENT_GO_VERSION_PKG}.gitCommit=${GIT_COMMIT}"
+LDFLAGS="$LDFLAGS -X ${VERSION_PKG}.gitMajor=${VERSION_MAJOR} -X ${CLIENT_GO_VERSION_PKG}.gitMajor=${VERSION_MAJOR}"
+LDFLAGS="$LDFLAGS -X ${VERSION_PKG}.gitMinor=${VERSION_MINOR} -X ${CLIENT_GO_VERSION_PKG}.gitMinor=${VERSION_MINOR}"
+LDFLAGS="$LDFLAGS -X ${VERSION_PKG}.buildDate=${BUILD_DATE} -X ${CLIENT_GO_VERSION_PKG}.buildDate=${BUILD_DATE}"
 echo -ldflags \'$LDFLAGS\'