Skip to content

USHIFT-4069: rebase fix to workaround MCO's use of go templates in yaml files #3776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
Aug 19, 2024
Merged

USHIFT-4069: rebase fix to workaround MCO's use of go templates in yaml files #3776

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9533013
use sed to remove field with gotemplate in kubelet.yaml. the addition…
copejon Aug 15, 2024
340a342
accidently renamed the kubelet file, fixed
copejon Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions scripts/auto-rebase/rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,12 @@ update_openshift_manifests() {
title "Modifying OpenShift manifests"

#-- Kubelet -------------------------------------------

# 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"
Copy link
Member

@pmtk pmtk Aug 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we can delete following line that's ~20-30 lines below?

    yq -i 'del(.tlsCipherSuites)' "${REPOROOT}/assets/core/kubelet.yaml"


# Drop MCO's boilerplate and keep KubeletConfiguration only
yq -i '.contents.inline' "${REPOROOT}/assets/core/kubelet.yaml"

Expand Down