[release-4.12] OCPBUGS-7336: [build] Fix k8s version reporting #1407
Conversation
The openshift/kubernetes repo does not propagate all tags from upstream. Only the X.Y.0 tag is propagated. This causes the Windows kubelet and kube-proxy Z version to lag behind its Linux counterparts. The Linux build [0] of kubelet and kube-proxy figures out the Z version at build time. To do something similar for Windows, we can leverage the hack/update_submodules.sh script which is always used to update the kubelet and kube-proxy submodules. To achieve this, the following changes are made: - Add kubelet and kube-proxy version variables to the Makefile along with make endpoints - Call these make endpoints in the Dockerfile - Update hack/update_submodules.sh to pull upstream tags and generate a commit that updates the Makefile version variables Now the built binaries will have the correct version encoded in them. [0] https://github.com/openshift/doozer/blob/a34e303682ca180e4f071f85cc4c34e6d333787e/doozerlib/metadata.py#L788 (manually cherry picked from commit 60c4b4b)
|
@aravindhp: No Bugzilla bug is referenced in the title of this pull request. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
openshift-ci
bot
added
the
do-not-merge/work-in-progress
|
Skipping CI for Draft Pull Request. |
openshift-ci
bot
added
the
approved
|
/approve cancel |
openshift-ci
bot
removed
the
approved
|
/jira cherrypick OCPBUGS-6635 |
|
@aravindhp: Jira Issue OCPBUGS-6635 has been cloned as Jira Issue OCPBUGS-7336. Retitling PR to link against new bug. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
openshift-ci
bot
changed the title
|
@aravindhp: No Bugzilla bug is referenced in the title of this pull request. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
openshift-ci-robot
added
jira/severity-low
|
@aravindhp: This pull request references Jira Issue OCPBUGS-7336, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
/retitle [release-4.12] OCPBUGS-7336: [build] Fix k8s version reporting |
openshift-ci
bot
changed the title
|
@aravindhp: No Bugzilla bug is referenced in the title of this pull request. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
/retitle OCPBUGS-7336: [release-4.12][build] Fix k8s version reporting |
openshift-ci
bot
changed the title
|
@aravindhp: No Bugzilla bug is referenced in the title of this pull request. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
/retitle [release-4.12] OCPBUGS-7336: [build] Fix k8s version reporting |
openshift-ci
bot
changed the title
|
@aravindhp: No Bugzilla bug is referenced in the title of this pull request. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
/test images |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: sebsoto The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
/lgtm |
|
/hold In case want to order backport PRs for the release-4.12 branch. |
openshift-ci
bot
added
the
do-not-merge/hold
|
/jira refresh |
openshift-ci-robot
added
jira/valid-bug
|
@mtnbikenc: This pull request references Jira Issue OCPBUGS-7336, which is valid. 6 validation(s) were run on this bug
Requesting review from QA contact: The bug has been updated to refer to the pull request using the external bug tracker. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
openshift-ci
bot
removed
the
do-not-merge/hold
|
/test platform-none-vsphere-e2e-operator Failed in gather-extra. Hopefully it is a flake 🤞🏽 |
|
gather-extra failures related to https://issues.redhat.com/browse/TRT-861 |
|
/retest-required |
|
/retest-required |
|
Tests passed on this commit before and failures are after tests. |
|
@mtnbikenc: /override requires failed status contexts, check run or a prowjob name to operate on.
Only the following failed contexts/checkruns were expected:
If you are trying to override a checkrun that has a space in it, you must put a double quote on the context. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
/override ci/prow/aws-e2e-ccm-install Test has passed before for the same commit |
|
@aravindhp: Overrode contexts on behalf of aravindhp: ci/prow/aws-e2e-ccm-install In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
@aravindhp: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-7336 has been moved to the MODIFIED state. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
@aravindhp: new pull request created: #1420 In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
The openshift/kubernetes repo does not propagate all tags from upstream. Only the X.Y.0 tag is propagated. This causes the Windows kubelet and kube-proxy Z version to lag behind its Linux counterparts. The Linux build of kubelet and kube-proxy figures out the Z version at build time. To do something similar for Windows, we can leverage the hack/update_submodules.sh script which is always used to update the kubelet and kube-proxy submodules. To achieve this, the following changes are made:
Now the built binaries will have the correct version encoded in them.
(manually cherry picked from #1401)