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.

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

Jump to bottom

Bug 1928537: bump ignition to v3_2 #4653

Merged
merged 1 commit into from
Feb 16, 2021
Merged

Bug 1928537: bump ignition to v3_2 #4653

merged 1 commit into from
Feb 16, 2021

Conversation

yuvalk
Copy link
Contributor

@yuvalk yuvalk commented Feb 14, 2021

staebler
staebler reviewed Feb 14, 2021
View reviewed changes
Copy link
Contributor

@staebler staebler left a comment

Choose a reason for hiding this comment

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

These changes look good. You are just missing a similar change in the new pkg/asset/ignition/bootstrap/bootstrap_in_place.go file.

@staebler
Copy link
Contributor

/approve

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: staebler

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 14, 2021
@yuvalk
Copy link
Contributor Author

yuvalk commented Feb 15, 2021

These changes look good. You are just missing a similar change in the new pkg/asset/ignition/bootstrap/bootstrap_in_place.go file.

fixed, though it is weird as I was using:
`git grep -l 'v3_1' | xargs sed -i 's/v3_1/v3_2/g'

@yuvalk yuvalk force-pushed the ignition_v3_2 branch 2 times, most recently from d494d88 to 24d2c1b Compare February 15, 2021 08:11
@yuvalk
Copy link
Contributor Author

yuvalk commented Feb 15, 2021

I've re-added v3_1 as it is required for the terraform-provider
but I guess an update there is imminent too ?

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 16, 2021
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 16, 2021
@yuvalk
bump ignition to v3_2
0920b5b 
With tests modified accordingly
@staebler staebler changed the title bump ignition to v3_2 Bug 1928537: bump ignition to v3_2 Feb 16, 2021
@openshift-ci-robot
Copy link
Contributor

@yuvalk: An error was encountered adding this pull request to the external tracker bugs for bug 1928537 on the Bugzilla server at https://bugzilla.redhat.com. We were able to detect the following conditions from the error:

  • The Bugzilla server failed to load data from GitHub when creating the bug. This is usually caused by rate-limiting, please try again later.
Full error message. JSONRPC error 32000: There was an error reported for the RPC call to Jira: There was an error reported for a GitHub REST call. URL: https://api.github.com/repos/openshift/installer/pulls/4653 Error: 403 Forbidden at /loader/0x559582274ee8/Bugzilla/Extension/ExternalBugs/Type/GitHub.pm line 111. at /loader/0x559582274ee8/Bugzilla/Extension/ExternalBugs/Type/GitHub.pm line 111. eval {...} called at /loader/0x559582274ee8/Bugzilla/Extension/ExternalBugs/Type/GitHub.pm line 98 Bugzilla::Extension::ExternalBugs::Type::GitHub::_do_rest_call('Bugzilla::Extension::ExternalBugs::Type::GitHub=HASH(0x55958a...', 'https://api.github.com/repos/openshift/installer/pulls/4653', 'GET') called at /loader/0x559582274ee8/Bugzilla/Extension/ExternalBugs/Type/GitHub.pm line 62 Bugzilla::Extension::ExternalBugs::Type::GitHub::get_data('Bugzilla::Extension::ExternalBugs::Type::GitHub=HASH(0x55958a...', 'Bugzilla::Extension::ExternalBugs::Bug=HASH(0x55958a1ee6c0)') called at /loader/0x559582274ee8/Bugzilla/Extension/ExternalBugs/Bug.pm line 302 eval {...} called at /loader/0x559582274ee8/Bugzilla/Extension/ExternalBugs/Bug.pm line 302 Bugzilla::Extension::ExternalBugs::Bug::update_ext_info('Bugzilla::Extension::ExternalBugs::Bug=HASH(0x55958a1ee6c0)', 1) called at /loader/0x559582274ee8/Bugzilla/Extension/ExternalBugs/Bug.pm line 125 Bugzilla::Extension::ExternalBugs::Bug::create('Bugzilla::Extension::ExternalBugs::Bug', 'HASH(0x5595894a9f78)') called at /var/www/html/bugzilla/extensions/ExternalBugs/Extension.pm line 940 Bugzilla::Extension::ExternalBugs::bug_start_of_update('Bugzilla::Extension::ExternalBugs=HASH(0x559589fed2b0)', 'HASH(0x55958a118058)') called at /var/www/html/bugzilla/Bugzilla/Hook.pm line 21 Bugzilla::Hook::process('bug_start_of_update', 'HASH(0x55958a118058)') called at /var/www/html/bugzilla/Bugzilla/Bug.pm line 1173 Bugzilla::Bug::update('Bugzilla::Bug=HASH(0x55958a4e1658)') called at /loader/0x559582274ee8/Bugzilla/Extension/ExternalBugs/WebService.pm line 88 Bugzilla::Extension::ExternalBugs::WebService::add_external_bug('Bugzilla::WebService::Server::JSONRPC::Bugzilla::Extension::E...', 'HASH(0x55958a1404d8)') called at (eval 2507) line 1 eval ' $procedure->{code}->($self, @params) ;' called at /usr/share/perl5/vendor_perl/JSON/RPC/Legacy/Server.pm line 220 JSON::RPC::Legacy::Server::_handle('Bugzilla::WebService::Server::JSONRPC::Bugzilla::Extension::E...', 'HASH(0x5595892470e0)') called at /var/www/html/bugzilla/Bugzilla/WebService/Server/JSONRPC.pm line 297 Bugzilla::WebService::Server::JSONRPC::_handle('Bugzilla::WebService::Server::JSONRPC::Bugzilla::Extension::E...', 'HASH(0x5595892470e0)') called at /usr/share/perl5/vendor_perl/JSON/RPC/Legacy/Server.pm line 126 JSON::RPC::Legacy::Server::handle('Bugzilla::WebService::Server::JSONRPC::Bugzilla::Extension::E...') called at /var/www/html/bugzilla/Bugzilla/WebService/Server/JSONRPC.pm line 70 Bugzilla::WebService::Server::JSONRPC::handle('Bugzilla::WebService::Server::JSONRPC::Bugzilla::Extension::E...') called at /var/www/html/bugzilla/jsonrpc.cgi line 31 ModPerl::ROOT::Bugzilla::ModPerl::ResponseHandler::var_www_html_bugzilla_jsonrpc_2ecgi::handler('Apache2::RequestRec=SCALAR(0x5595894a6268)') called at /usr/lib64/perl5/vendor_perl/ModPerl/RegistryCooker.pm line 207 eval {...} called at /usr/lib64/perl5/vendor_perl/ModPerl/RegistryCooker.pm line 207 ModPerl::RegistryCooker::run('Bugzilla::ModPerl::ResponseHandler=HASH(0x55958a113528)') called at /usr/lib64/perl5/vendor_perl/ModPerl/RegistryCooker.pm line 173 ModPerl::RegistryCooker::default_handler('Bugzilla::ModPerl::ResponseHandler=HASH(0x55958a113528)') called at /usr/lib64/perl5/vendor_perl/ModPerl/Registry.pm line 32 ModPerl::Registry::handler('Bugzilla::ModPerl::ResponseHandler', 'Apache2::RequestRec=SCALAR(0x5595894a6268)') called at /var/www/html/bugzilla/mod_perl.pl line 139 Bugzilla::ModPerl::ResponseHandler::handler('Bugzilla::ModPerl::ResponseHandler', 'Apache2::RequestRec=SCALAR(0x5595894a6268)') called at (eval 2507) line 0 eval {...} called at (eval 2507) line 0 at /var/www/html/bugzilla/Bugzilla/Error.pm line 130. Bugzilla::Error::_throw_error('global/user-error.html.tmpl', 'ext_bz_rest_error', 'HASH(0x55958a18b228)') called at /var/www/html/bugzilla/Bugzilla/Error.pm line 193 Bugzilla::Error::ThrowUserError('ext_bz_rest_error', 'HASH(0x55958a18b228)') called at /loader/0x559582274ee8/Bugzilla/Extension/ExternalBugs/Type/GitHub.pm line 120 Bugzilla::Extension::ExternalBugs::Type::GitHub::_do_rest_call('Bugzilla::Extension::ExternalBugs::Type::GitHub=HASH(0x55958a...', 'https://api.github.com/repos/openshift/installer/pulls/4653', 'GET') called at /loader/0x559582274ee8/Bugzilla/Extension/ExternalBugs/Type/GitHub.pm line 62 Bugzilla::Extension::ExternalBugs::Type::GitHub::get_data('Bugzilla::Extension::ExternalBugs::Type::GitHub=HASH(0x55958a...', 'Bugzilla::Extension::ExternalBugs::Bug=HASH(0x55958a1ee6c0)') called at /loader/0x559582274ee8/Bugzilla/Extension/ExternalBugs/Bug.pm line 302 eval {...} called at /loader/0x559582274ee8/Bugzilla/Extension/ExternalBugs/Bug.pm line 302 Bugzilla::Extension::ExternalBugs::Bug::update_ext_info('Bugzilla::Extension::ExternalBugs::Bug=HASH(0x55958a1ee6c0)', 1) called at /loader/0x559582274ee8/Bugzilla/Extension/ExternalBugs/Bug.pm line 125 Bugzilla::Extension::ExternalBugs::Bug::create('Bugzilla::Extension::ExternalBugs::Bug', 'HASH(0x5595894a9f78)') called at /var/www/html/bugzilla/extensions/ExternalBugs/Extension.pm line 940 Bugzilla::Extension::ExternalBugs::bug_start_of_update('Bugzilla::Extension::ExternalBugs=HASH(0x559589fed2b0)', 'HASH(0x55958a118058)') called at /var/www/html/bugzilla/Bugzilla/Hook.pm line 21 Bugzilla::Hook::process('bug_start_of_update', 'HASH(0x55958a118058)') called at /var/www/html/bugzilla/Bugzilla/Bug.pm line 1173 Bugzilla::Bug::update('Bugzilla::Bug=HASH(0x55958a4e1658)') called at /loader/0x559582274ee8/Bugzilla/Extension/ExternalBugs/WebService.pm line 88 Bugzilla::Extension::ExternalBugs::WebService::add_external_bug('Bugzilla::WebService::Server::JSONRPC::Bugzilla::Extension::E...', 'HASH(0x55958a1404d8)') called at (eval 2507) line 1 eval ' $procedure->{code}->($self, @params) ;' called at /usr/share/perl5/vendor_perl/JSON/RPC/Legacy/Server.pm line 220 JSON::RPC::Legacy::Server::_handle('Bugzilla::WebService::Server::JSONRPC::Bugzilla::Extension::E...', 'HASH(0x5595892470e0)') called at /var/www/html/bugzilla/Bugzilla/WebService/Server/JSONRPC.pm line 297 Bugzilla::WebService::Server::JSONRPC::_handle('Bugzilla::WebService::Server::JSONRPC::Bugzilla::Extension::E...', 'HASH(0x5595892470e0)') called at /usr/share/perl5/vendor_perl/JSON/RPC/Legacy/Server.pm line 126 JSON::RPC::Legacy::Server::handle('Bugzilla::WebService::Server::JSONRPC::Bugzilla::Extension::E...') called at /var/www/html/bugzilla/Bugzilla/WebService/Server/JSONRPC.pm line 70 Bugzilla::WebService::Server::JSONRPC::handle('Bugzilla::WebService::Server::JSONRPC::Bugzilla::Extension::E...') called at /var/www/html/bugzilla/jsonrpc.cgi line 31 ModPerl::ROOT::Bugzilla::ModPerl::ResponseHandler::var_www_html_bugzilla_jsonrpc_2ecgi::handler('Apache2::RequestRec=SCALAR(0x5595894a6268)') called at /usr/lib64/perl5/vendor_perl/ModPerl/RegistryCooker.pm line 207 eval {...} called at /usr/lib64/perl5/vendor_perl/ModPerl/RegistryCooker.pm line 207 ModPerl::RegistryCooker::run('Bugzilla::ModPerl::ResponseHandler=HASH(0x55958a113528)') called at /usr/lib64/perl5/vendor_perl/ModPerl/RegistryCooker.pm line 173 ModPerl::RegistryCooker::default_handler('Bugzilla::ModPerl::ResponseHandler=HASH(0x55958a113528)') called at /usr/lib64/perl5/vendor_perl/ModPerl/Registry.pm line 32 ModPerl::Registry::handler('Bugzilla::ModPerl::ResponseHandler', 'Apache2::RequestRec=SCALAR(0x5595894a6268)') called at /var/www/html/bugzilla/mod_perl.pl line 139 Bugzilla::ModPerl::ResponseHandler::handler('Bugzilla::ModPerl::ResponseHandler', 'Apache2::RequestRec=SCALAR(0x5595894a6268)') called at (eval 2507) line 0 eval {...} called at (eval 2507) line 0

Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

In response to this:

Bug 1928537: bump ignition to v3_2

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.

@staebler
Copy link
Contributor

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Feb 16, 2021
@openshift-ci-robot
Copy link
Contributor

@staebler: This pull request references Bugzilla bug 1928537, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.8.0) matches configured target release for branch (4.8.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

/bugzilla refresh

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-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Feb 16, 2021
@yuvalk
Copy link
Contributor Author

yuvalk commented Feb 16, 2021

/retest e2e-openstack
/retest e2e-ovirt

@openshift-ci-robot
Copy link
Contributor

@yuvalk: The /retest command does not accept any targets.
The following commands are available to trigger jobs:

  • /test e2e-aws
  • /test e2e-aws-disruptive
  • /test e2e-aws-fips
  • /test e2e-aws-proxy
  • /test e2e-aws-rhel8
  • /test e2e-aws-shared-vpc
  • /test e2e-aws-single-node
  • /test e2e-aws-upgrade
  • /test e2e-aws-upi
  • /test e2e-aws-workers-rhel7
  • /test e2e-azure
  • /test e2e-azure-shared-vpc
  • /test e2e-azure-upi
  • /test e2e-crc
  • /test e2e-gcp
  • /test e2e-gcp-shared-vpc
  • /test e2e-gcp-upgrade
  • /test e2e-gcp-upi
  • /test e2e-gcp-upi-xpn
  • /test e2e-kubevirt
  • /test e2e-libvirt
  • /test e2e-metal
  • /test e2e-metal-assisted
  • /test e2e-metal-ipi
  • /test e2e-metal-ipi-ovn-dualstack
  • /test e2e-metal-ipi-ovn-ipv6
  • /test e2e-metal-ipi-virtualmedia
  • /test e2e-metal-single-node-live-iso
  • /test e2e-openstack
  • /test e2e-openstack-ipi
  • /test e2e-openstack-parallel
  • /test e2e-openstack-upi
  • /test e2e-ovirt
  • /test e2e-vsphere
  • /test e2e-vsphere-upi
  • /test gofmt
  • /test golint
  • /test govet
  • /test images
  • /test openstack-manifests
  • /test shellcheck
  • /test tf-fmt
  • /test tf-lint
  • /test unit
  • /test verify-codegen
  • /test verify-vendor
  • /test yaml-lint

Use /test all to run the following jobs:

  • pull-ci-openshift-installer-master-e2e-aws
  • pull-ci-openshift-installer-master-e2e-aws-fips
  • pull-ci-openshift-installer-master-e2e-aws-upgrade
  • pull-ci-openshift-installer-master-e2e-aws-workers-rhel7
  • pull-ci-openshift-installer-master-e2e-libvirt
  • pull-ci-openshift-installer-master-e2e-metal-ipi-ovn-ipv6
  • pull-ci-openshift-installer-master-e2e-openstack
  • pull-ci-openshift-installer-master-e2e-ovirt
  • pull-ci-openshift-installer-master-gofmt
  • pull-ci-openshift-installer-master-golint
  • pull-ci-openshift-installer-master-govet
  • pull-ci-openshift-installer-master-images
  • pull-ci-openshift-installer-master-openstack-manifests
  • pull-ci-openshift-installer-master-shellcheck
  • pull-ci-openshift-installer-master-tf-fmt
  • pull-ci-openshift-installer-master-tf-lint
  • pull-ci-openshift-installer-master-unit
  • pull-ci-openshift-installer-master-verify-codegen
  • pull-ci-openshift-installer-master-verify-vendor
  • pull-ci-openshift-installer-master-yaml-lint

In response to this:

/retest e2e-openstack
/retest e2e-ovirt

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.

@yuvalk
Copy link
Contributor Author

yuvalk commented Feb 16, 2021

/test e2e-openstack
/test e2e-ovirt

@staebler
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 16, 2021
@openshift-merge-robot openshift-merge-robot merged commit e5d3236 into openshift:master Feb 16, 2021
@openshift-ci-robot
Copy link
Contributor

@yuvalk: All pull requests linked via external trackers have merged:

Bugzilla bug 1928537 has been moved to the MODIFIED state.

In response to this:

Bug 1928537: bump ignition to v3_2

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.

@yuvalk
Copy link
Contributor Author

yuvalk commented Feb 18, 2021

/cherry-pick release-4.7

@openshift-cherrypick-robot
Copy link

@yuvalk: #4653 failed to apply on top of branch "release-4.7":

Applying: bump ignition to v3_2
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	pkg/asset/cluster/tfvars.go
A	pkg/asset/ignition/bootstrap/common.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging pkg/asset/ignition/bootstrap/bootstrap.go
Auto-merging pkg/asset/cluster/tfvars.go
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 bump ignition to v3_2
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.7

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.

@eranco74 eranco74 mentioned this pull request Feb 18, 2021
Merged
@cgwalters
Copy link
Member

A fundamental issue here is that by bumping the baseline Ignition version, we're now disallowing older RHCOS versions (e.g. 4.6) from reading configs generated by the new installer, even in cases where new features aren't used. In other words, it's clearly not going to work to use the new Ignition Tang+LUKS for 4.6 disk images, but it shouldn't break if that feature isn't used.

This issue actually mirrors a MCO bug - see coreos/ign-converter#22 for some work on teaching Ignition how to downgrade to the earliest version it can.

@yuvalk
Copy link
Contributor Author

yuvalk commented Jun 29, 2021

A fundamental issue here is that by bumping the baseline Ignition version, we're now disallowing older RHCOS versions (e.g. 4.6) from reading configs generated by the new installer, even in cases where new features aren't used. In other words, it's clearly not going to work to use the new Ignition Tang+LUKS for 4.6 disk images, but it shouldn't break if that feature isn't used.

This issue actually mirrors a MCO bug - see coreos/ign-converter#22 for some work on teaching Ignition how to downgrade to the earliest version it can.

the problem is that ignition itself is not fully backward compatible
https://github.com/coreos/ignition/blob/main/docs/migrating-configs.md#upgrading-configs

so if installer is not using latest ignition, there are features in rhcos that cant be used, NBDE for example.
ie - this broke NBDE support in 4.7.

@cgwalters
Copy link
Member

the problem is that ignition itself is not fully backward compatible

It is.

so if installer is not using latest ignition, there are features in rhcos that cant be used, NBDE for example.

Please re-read my comment - I am basically saying that openshift/installer should be using the same ign-converter PR to downgrade to the minimal Ignition version it can, for the same reasons as the MCO. This would allow using NBDE, but avoid breaking use of 4.6 bootimages if NBDE is not used.

@kikisdeliveryservice
Copy link
Contributor

kikisdeliveryservice commented Jun 29, 2021 •
edited
Loading

As per Colin's comments above, is there any further action intended on this?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@staebler staebler staebler left review comments

@dhellmann dhellmann Awaiting requested review from dhellmann

@jstuever jstuever Awaiting requested review from jstuever

Assignees

@staebler staebler

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@yuvalk @staebler @openshift-ci-robot @openshift-cherrypick-robot @cgwalters @kikisdeliveryservice @openshift-merge-robot