Skip to content

kubernetes: fix version subcommand for components#6722

Merged
mfrw merged 2 commits intomainfrom
mfrw/fix-k8s-version
Nov 15, 2023
Merged

kubernetes: fix version subcommand for components#6722
mfrw merged 2 commits intomainfrom
mfrw/fix-k8s-version

Conversation

@mfrw
Copy link
Copy Markdown
Member

@mfrw mfrw commented Nov 10, 2023

Signed-off-by: Muhammad Falak R Wani falakreyaz@gmail.com

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

What does the PR accomplish, why was it needed?

Fixes: #6719

The KUBE_GIT_VERSION_FILE seems to be not present in the release.
Use the alternative KUBE_GIT_VERSION instead.
Reference: https://github.com/kubernetes/kubernetes/blob/v1.28.3/hack/lib/version.sh#L26

Change Log
  • Fix version subcommand for components
Does this affect the toolchain?

NO

Associated issues
Links to CVEs
  • NA
Test Methodology
  • Pipeline build id: PR-6722
  • Local build w/o RUN_CHECK=y & verified with an install in a AzureLinux VM
root [ ~ ]# rpm -qa | grep kubeadm
kubernetes-kubeadm-1.28.3-2.cm2.x86_64
root [ ~ ]# kubeadm version
kubeadm version: &version.Info{Major:"1", Minor:"28", GitVersion:"v1.28.3", GitCommit:"a8a1abc25cad87333840cd7d54be2efaf31a3177", GitTreeState:"archive", BuildDate:"2023-11-10T08:27:30Z", GoVersion:"go1.20.7", Compiler:"gc", Platform:"linux/amd64"}

@microsoft-github-policy-service microsoft-github-policy-service Bot added the main PR Destined for main label Nov 10, 2023
@mfrw mfrw marked this pull request as ready for review November 10, 2023 09:08
@mfrw mfrw requested a review from a team as a code owner November 10, 2023 09:08
The KUBE_GIT_VERSION_FILE seems to be not present in the release.
Use the alternative KUBE_GIT_VERSION instead.

Fixes: #6719
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
@mfrw mfrw force-pushed the mfrw/fix-k8s-version branch from 9dc3b03 to d5828af Compare November 10, 2023 09:17
Comment thread SPECS/kubernetes/kubernetes.spec Outdated
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
@mfrw mfrw merged commit f52eea5 into main Nov 15, 2023
@mfrw mfrw deleted the mfrw/fix-k8s-version branch November 15, 2023 02:24
gmileka pushed a commit that referenced this pull request Dec 7, 2023
The KUBE_GIT_VERSION_FILE seems to be not present in the release.
Use the alternative KUBE_GIT_VERSION instead.

Fixes: #6719
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

main PR Destined for main

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants