Move sed a few lines higher #532
Conversation
build/generate-manifests.sh
Outdated
| # workaround for https://github.com/kubernetes-sigs/controller-tools/issues/457 | ||
| #sed -i -e "s/\( *\)\(description\: The IP protocol for this port\)/\1default: TCP\n\1\2/" \ | ||
| # deploy/crds/maistra.io_servicemeshcontrolplanes.yaml | ||
| sed -i -e '/x-kubernetes-list-map-keys:/,/x-kubernetes-list-type: map/ { /- protocol/d }' deploy/crds/* |
There was a problem hiding this comment.
I really think this should be constrained to just the SMCP crd.
There was a problem hiding this comment.
Sure. I can constrain this one to just the SMCP crd. Are you ok with the next one on all CRDs? All of them are currently broken.
| #sed -i -e "s/\( *\)\(description\: The IP protocol for this port\)/\1default: TCP\n\1\2/" \ | ||
| # deploy/crds/maistra.io_servicemeshcontrolplanes.yaml | ||
| sed -i -e '/x-kubernetes-list-map-keys:/,/x-kubernetes-list-type: map/ { /- protocol/d }' deploy/crds/* | ||
| sed -i -e '/---/d' deploy/crds/* |
There was a problem hiding this comment.
Maybe add a comment about why we're doing this. It's not obvious, because it shouldn't be a problem applying the resource and there's nothing to tie it back to problems with OLM metadata builds.
brian-avery
force-pushed
the
backportDaily
branch
from
ee1af0c
to
394a465
Compare
brian-avery
force-pushed
the
backportDaily
branch
from
394a465
to
7dd7709
Compare
brian-avery
changed the title
brian-avery
changed the title
| @@ -0,0 +1,148 @@ | |||
|
|
|||
| --- | |||
There was a problem hiding this comment.
@rcernich what makes these?
There was a problem hiding this comment.
run make generate-manifests
There was a problem hiding this comment.
Ran make generate-manifests. All of the new files are still there though. I'm assuming that's good.
Closed the previous PR without addressing the request to move the sed. This PR accomplishes that.