USHIFT-4069: rebase fix to workaround MCO's use of go templates in yaml files#3776
Conversation
… of the template prevents yq from recognizing the contents as yaml, halting the rebase Signed-off-by: Jon Cope <jcope@redhat.com>
openshift-ci
bot
added
the
approved
copejon
changed the title
|
@copejon: This pull request references USHIFT-4069 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.18.0" version, but no target version was set. DetailsIn 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 openshift-eng/jira-lifecycle-plugin repository. |
openshift-ci-robot
added
the
jira/valid-reference
|
/retest-required |
|
test-rebase failed during builder image pull |
|
Same thing: |
Signed-off-by: Jon Cope <jcope@redhat.com>
|
@copejon: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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-sigs/prow repository. I understand the commands that are listed here. |
| # The tlsCipherSuites field was change from a scalar value to gotemplate which broke the yaml formatting and | ||
| # confused yq. Before processing, delete the offending go templated field. | ||
| # https://github.com/openshift/machine-config-operator/commit/3b979e1ddf2a6e2c3e9b4a7872e31db888da1d57 | ||
| sed -n -i '/tlsCipherSuites:/,/{{- end }}/d' "${REPOROOT}/assets/core/kubelet.yaml" |
There was a problem hiding this comment.
I guess we can delete following line that's ~20-30 lines below?
yq -i 'del(.tlsCipherSuites)' "${REPOROOT}/assets/core/kubelet.yaml"
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: copejon, pmtk The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/cherrypick release-4.17 |
|
@pmtk: once the present PR merges, I will cherry-pick it on top of release-4.17 in a new PR and assign it to you. DetailsIn 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-sigs/prow repository. |
|
@pmtk: new pull request created: #3790 DetailsIn 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-sigs/prow repository. |
5 participants
No description provided.