Skip to content
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.

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

Fix template files. #154

Merged
merged 3 commits into from
Jul 3, 2019
Merged

Conversation

lveyde
Copy link
Contributor

@lveyde lveyde commented Jul 3, 2019

Due to the macro processing issue, an empty line was inserted as the very first line of CRB files.
This was causing issues with tools that use strict checking of the YAML file syntax.
Specifically it was causing the build using the latest origin-operator-registry image to fail.
This patch fixes the templates.

Signed-off-by: Lev Veyde lveyde@redhat.com

Due to the macro processing issue, an empty line was inserted as the very first line of CRB files.
This was causing issues with tools that use strict checking of the YAML file syntax.
Specifically it was causing the build using the latest origin-operator-registry image to fail.
This patch fixes the templates.

Signed-off-by: Lev Veyde <lveyde@redhat.com>
Copy link
Contributor

@djzager djzager left a comment

Choose a reason for hiding this comment

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

Neither of these cluster role bindings are needed anymore. You can just remove both files.

@lveyde
Copy link
Contributor Author

lveyde commented Jul 3, 2019

OK, replaced by another set of patches.

Please see PR#155.

We no longer need the CRB files of the CDI and CNA.
This patch removes the templates for both.

Signed-off-by: Lev Veyde <lveyde@redhat.com>

Conflicts:
	templates/olm-catalog/kubevirt-hyperconverged/VERSION/cdi-operator.crb.yaml.in
	templates/olm-catalog/kubevirt-hyperconverged/VERSION/cna-operator.crb.yaml.in
We no longer need the CRB files of the CDI and CNA.
This patch removes the manifests for both.

Signed-off-by: Lev Veyde <lveyde@redhat.com>
@lveyde
Copy link
Contributor Author

lveyde commented Jul 3, 2019

Per request added re-based set of patches to this PR as well.

@rthallisey
Copy link

ci test please

@djzager
Copy link
Contributor

djzager commented Jul 3, 2019

Which PR is winning here, this or #155 ?

@rthallisey
Copy link

I think #155 can be closed.

Copy link
Contributor

@djzager djzager left a comment

Choose a reason for hiding this comment

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

LGTM (assuming #155 is closed)

@djzager djzager merged commit b6294c2 into kubevirt:master Jul 3, 2019
@djzager djzager mentioned this pull request Jul 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants