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

runtime: Fix firecracker config #1002

Merged
merged 2 commits into from
Oct 23, 2020
Merged

runtime: Fix firecracker config #1002

merged 2 commits into from
Oct 23, 2020

Conversation

jodh-intel
Copy link
Contributor

@jodh-intel jodh-intel commented Oct 20, 2020 •
edited
Loading

The build was setting a FCVALIDPATHS variable for firecracker, but
that was never being used. Conversely, the firecracker configuration
template was expecting a FCVALIDHYPERVISORPATHS, but that variable was
never being set.

Resolve by only setting the FCVALIDHYPERVISORPATHS variable to ensure
the generated firecracker config is valid once again.

Fixes: #1001.

Signed-off-by: James O. D. Hunt [email protected]

@jodh-intel
runtime: Simplify make variables for clh
e5d4259 
Simplify definition of the `CLHVALIDHYPERVISORPATHS` build variable to
use the already defined `CLHPATH`.

Signed-off-by: James O. D. Hunt <[email protected]>
@jodh-intel
runtime: Fix firecracker config
2738b18 
The build was setting a `FCVALIDPATHS` variable for firecracker, but
that was never being used. Conversely, the firecracker configuration
template was expecting a `FCVALIDHYPERVISORPATHS`, but that variable was
never being set.

Resolve by only setting the `FCVALIDHYPERVISORPATHS` variable to ensure
the generated firecracker config is valid once again.

Fixes: kata-containers#1001.

Signed-off-by: James O. D. Hunt <[email protected]>
@jodh-intel jodh-intel changed the title 2.0 dev unbreak fc config runtime: Fix firecracker config Oct 20, 2020
@jodh-intel
Copy link
Contributor Author

/test

fidencio
fidencio approved these changes Oct 20, 2020
View reviewed changes
Copy link
Member

@fidencio fidencio left a comment

Choose a reason for hiding this comment

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

lgtm, thanks @jodh-intel!

@jodh-intel jodh-intel mentioned this pull request Oct 20, 2020
Merged
@jodh-intel
Copy link
Contributor Author

These fixes should get applied to kata-containers/runtime#3005 so this PR won't need to be backported to 1.x. However, it will need to be backported to the stable 2.0 branch in this repo.

I don't know who created the stable-2.0.0 branch (?), but it needs renaming to stable-2.0 to match all the other stable branches imho.

@bergwolf - do you know anything about this?

c3d
c3d approved these changes Oct 20, 2020
View reviewed changes
Copy link
Member

@c3d c3d left a comment

Choose a reason for hiding this comment

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

Ooops, my bad. Good catch.

c3d pushed a commit to c3d/runtime that referenced this pull request Oct 20, 2020
@jodh-intel @c3d
runtime: Fix firecracker config
06b4ab9 
The build was setting a `FCVALIDPATHS` variable for firecracker, but
that was never being used. Conversely, the firecracker configuration
template was expecting a `FCVALIDHYPERVISORPATHS`, but that variable was
never being set.

Resolve by only setting the `FCVALIDHYPERVISORPATHS` variable to ensure
the generated firecracker config is valid once again.

Fixes: kata-containers#3005

From kata-containers/kata-containers#1002
Fixing kata-containers/kata-containers#1001

Signed-off-by: James O. D. Hunt <[email protected]>
Signed-off-by: Christophe de Dinechin <[email protected]>
c3d
c3d approved these changes Oct 20, 2020
View reviewed changes
@devimc
Copy link

devimc commented Oct 20, 2020

restarting clh CIs

c3d pushed a commit to c3d/runtime that referenced this pull request Oct 21, 2020
@jodh-intel @c3d
runtime: Fix firecracker config
32283c8 
The build was setting a `FCVALIDPATHS` variable for firecracker, but
that was never being used. Conversely, the firecracker configuration
template was expecting a `FCVALIDHYPERVISORPATHS`, but that variable was
never being set.

Resolve by only setting the `FCVALIDHYPERVISORPATHS` variable to ensure
the generated firecracker config is valid once again.

Fixes: kata-containers#3005

From kata-containers/kata-containers#1002
Fixing kata-containers/kata-containers#1001

Signed-off-by: James O. D. Hunt <[email protected]>
Signed-off-by: Christophe de Dinechin <[email protected]>
c3d pushed a commit to c3d/runtime that referenced this pull request Oct 22, 2020
@jodh-intel @c3d
runtime: Fix firecracker config
0d8dfc4 
The build was setting a `FCVALIDPATHS` variable for firecracker, but
that was never being used. Conversely, the firecracker configuration
template was expecting a `FCVALIDHYPERVISORPATHS`, but that variable was
never being set.

Resolve by only setting the `FCVALIDHYPERVISORPATHS` variable to ensure
the generated firecracker config is valid once again.

Fixes: kata-containers#3005

From kata-containers/kata-containers#1002
Fixing kata-containers/kata-containers#1001

Signed-off-by: James O. D. Hunt <[email protected]>
Signed-off-by: Christophe de Dinechin <[email protected]>
@chavafg
Copy link
Contributor

chavafg commented Oct 23, 2020

/test-arm

@amshinde amshinde merged commit e833e3b into kata-containers:2.0-dev Oct 23, 2020
@amshinde
Copy link
Member

@jodh-intel Needs port to stable 2.0.0 branch.

c3d pushed a commit to c3d/runtime that referenced this pull request Oct 27, 2020
@jodh-intel @c3d
runtime: Fix firecracker config
4dcc464 
The build was setting a `FCVALIDPATHS` variable for firecracker, but
that was never being used. Conversely, the firecracker configuration
template was expecting a `FCVALIDHYPERVISORPATHS`, but that variable was
never being set.

Resolve by only setting the `FCVALIDHYPERVISORPATHS` variable to ensure
the generated firecracker config is valid once again.

Fixes: kata-containers#3005

From kata-containers/kata-containers#1002
Fixing kata-containers/kata-containers#1001

Signed-off-by: James O. D. Hunt <[email protected]>
Signed-off-by: Christophe de Dinechin <[email protected]>
c3d pushed a commit to c3d/runtime that referenced this pull request Nov 5, 2020
@jodh-intel @c3d
runtime: Fix firecracker config
e1f792c 
The build was setting a `FCVALIDPATHS` variable for firecracker, but
that was never being used. Conversely, the firecracker configuration
template was expecting a `FCVALIDHYPERVISORPATHS`, but that variable was
never being set.

Resolve by only setting the `FCVALIDHYPERVISORPATHS` variable to ensure
the generated firecracker config is valid once again.

Fixes: kata-containers#3005

From kata-containers/kata-containers#1002
Fixing kata-containers/kata-containers#1001

Signed-off-by: James O. D. Hunt <[email protected]>
Signed-off-by: Christophe de Dinechin <[email protected]>
c3d pushed a commit to c3d/runtime that referenced this pull request Nov 10, 2020
@jodh-intel @c3d
runtime: Fix firecracker config
90ff89e 
The build was setting a `FCVALIDPATHS` variable for firecracker, but
that was never being used. Conversely, the firecracker configuration
template was expecting a `FCVALIDHYPERVISORPATHS`, but that variable was
never being set.

Resolve by only setting the `FCVALIDHYPERVISORPATHS` variable to ensure
the generated firecracker config is valid once again.

Fixes: kata-containers#3005

From kata-containers/kata-containers#1002
Fixing kata-containers/kata-containers#1001

Signed-off-by: James O. D. Hunt <[email protected]>
Signed-off-by: Christophe de Dinechin <[email protected]>
fidencio pushed a commit to fidencio/kata-runtime that referenced this pull request Nov 11, 2020
@jodh-intel @fidencio
runtime: Fix firecracker config
ff869d5 
The build was setting a `FCVALIDPATHS` variable for firecracker, but
that was never being used. Conversely, the firecracker configuration
template was expecting a `FCVALIDHYPERVISORPATHS`, but that variable was
never being set.

Resolve by only setting the `FCVALIDHYPERVISORPATHS` variable to ensure
the generated firecracker config is valid once again.

Fixes: kata-containers#3005

From kata-containers/kata-containers#1002
Fixing kata-containers/kata-containers#1001

Signed-off-by: James O. D. Hunt <[email protected]>
Signed-off-by: Christophe de Dinechin <[email protected]>
fidencio pushed a commit to fidencio/kata-runtime that referenced this pull request Nov 11, 2020
@jodh-intel @fidencio
runtime: Fix firecracker config
14bb5f1 
The build was setting a `FCVALIDPATHS` variable for firecracker, but
that was never being used. Conversely, the firecracker configuration
template was expecting a `FCVALIDHYPERVISORPATHS`, but that variable was
never being set.

Resolve by only setting the `FCVALIDHYPERVISORPATHS` variable to ensure
the generated firecracker config is valid once again.

Fixes: kata-containers#3005

From kata-containers/kata-containers#1002
Fixing kata-containers/kata-containers#1001

Signed-off-by: James O. D. Hunt <[email protected]>
Signed-off-by: Christophe de Dinechin <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@c3d c3d c3d approved these changes

@fidencio fidencio fidencio approved these changes

@devimc devimc devimc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fix generation of firecracker config
6 participants
@jodh-intel @devimc @chavafg @amshinde @fidencio @c3d