[release-4.11] OCPBUGS-7726: [build] Fix k8s version reporting #1420
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)
|
@openshift-cherrypick-robot: An error was encountered cloning bug for cherrypick for bug OCPBUGS-7336 on the Jira server at https://issues.redhat.com/. No known errors were detected, please see the full error message for details. Full error message.
request failed. Please analyze the request body for more details. Status code: 400: {"errorMessages":[],"errors":{"summary":"You must specify a summary of the issue.","versions":"Affects Version/s is required."}}
Please contact an administrator to resolve this issue, then request a bug refresh with 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. |
|
/jira refresh |
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. |
|
/jira cherrypick OCPBUGS-7336 |
|
@aravindhp: Jira Issue OCPBUGS-7336 has been cloned as Jira Issue OCPBUGS-7726. 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
|
@openshift-cherrypick-robot: 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-cherrypick-robot: This pull request references Jira Issue OCPBUGS-7726, 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.11] OCPBUGS-7726: [build] Fix k8s version reporting |
|
/cherry-pick release-4.10 |
|
@aravindhp: once the present PR merges, I will cherry-pick it on top of release-4.10 in a new PR and assign it to you. 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
|
@openshift-cherrypick-robot: 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
lgtm
|
/hold Kubelet version test is failing: We can either force merge this PR as the next submodule update should fix things up. Or we have to manually cherry pick this with a fake "correct" kubelet version. We don't see this issue in the release-4.12 branch because we removed the test there. |
openshift-ci
bot
added
the
do-not-merge/hold
Update the fake k8s version in the branch to match the cluster.
|
/retest-required |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: aravindhp, openshift-cherrypick-robot 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 |
|
/tide merge-method-squash |
|
/unhold Added commit to workaround the version test failing. |
openshift-ci
bot
removed
the
do-not-merge/hold
|
@openshift-cherrypick-robot: The following test failed, say
Full PR test history. Your PR dashboard. 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. I understand the commands that are listed here. |
|
/retest-required Windows nodes are again taking a long time to get configured. |
|
/label tide/merge-method-squash |
openshift-ci
bot
added
the
tide/merge-method-squash
|
/remove-label tide/merge-method-squash Not sure if missing the merge commit will cause issues in the pipeline. |
openshift-ci
bot
removed
the
tide/merge-method-squash
|
/jira refresh |
openshift-ci-robot
added
jira/valid-bug
|
@aravindhp: This pull request references Jira Issue OCPBUGS-7726, which is valid. The bug has been moved to the POST state. 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-cherrypick-robot: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-7726 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: #1430 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-cherrypick-robot/cherry-pick-1407-to-release-4.11 Updated upstream source commit. Commit details follow: Signed-off-by: OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> Project: https://github.com/openshift/windows-machine-config-operator.git Branch: release-4.11 Commit: d430d7a Author: OpenShift Merge Robot Date: Thu, 23 Feb 2023 19:31:02 +0100 Merge pull request openshift#1420 from openshift-cherrypick-robot/cherry-pick-1407-to-release-4.11 [release-4.11] OCPBUGS-7726: [build] Fix k8s version reporting Referenced RedHat JIRA issue: OCPBUGS-7726 automerge: yes x-md5: 71d010e48a05ac73c156be1074ed641e Change-Id: I1d200610034e922aa3656915b9744748f122a5d0
…ed641e' into 'rhaos-4.11-rhel-8' Updated US source to: d430d7a Merge pull request openshift#1420 from openshift-cherrypick-robot/cherry-pick-1407-to-release-4.11 See merge request openshift-winc-midstream/openshift-winc-midstream!136
This is an automated cherry-pick of #1407
/assign aravindhp