-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
Upgrade crio to 1.15.0 #4703
Upgrade crio to 1.15.0 #4703
Conversation
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: afbjorklund 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 |
Currently doesn't build anymore, due to cri-o/cri-o#2450
|
Reported the workarounds for conmon/config.h as cri-o/cri-o#2575 |
The repository was moved to a separate organization strings.ReplaceAll only work in go1.12, not go1.10 Need to create conmon/config.h without tags and git The configuration _needs_ to be updated (yet again)
/retest |
I could upgrade the go version on the jenkins nodes, would that be sufficient ? or do we need to update the travis config too? |
@medyagh : it is the buildroot go, and it will be upgraded when we move from 2018.x to 2019.x |
# of trust of the workload. | ||
|
||
[crio.runtime.runtimes.runc] | ||
runtime_path = "" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please be aware that runc
has to be in $PATH
to let this work during runtime.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, this is what the crio generated by default. Compare it with our config (above).
runtime_path = "/usr/bin/runc"
I generated and added the default config, since it changes and breaks all. the. time
- plugin_dir, plugin_dirs
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess it should work fine :)
${RELEASE_TOOL} -n $(release) | ||
|
||
-conmon/config.h: git-vars cmd/crio-config/config.go oci/oci.go | ||
+conmon/config.h: cmd/crio-config/config.go oci/oci.go |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So the git executable is not available within your build environment? Because the git-vars target was introduced to actually fix this, but it only checks for the .git
folder. I think I can improve this :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually it was worse... We do have git, but that's for our buildroot. Thus it recorded commits from a different project. We build all our packages from tarballs, so have to supply the matching commit for each one.
The main problem here is that the "git-vars" target forces the conmon/config.h to be re-generated, even if it already exists (same with crio.conf too)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah I see, thanks. Let's see if we can get rid of the git-vars dependency of this target entirely.
On the plus side, the new release seem to be working fine with the tweaks made. Haven't tried it with the new runc yet, need to make a trial run with all the changes. |
/retest |
/retest |
/test Jenkins Cross Build |
@minikube-bot OK to test |
The repository was moved to a separate organization
strings.ReplaceAll only work in go1.12, not go1.10
Need to create conmon/config.h without tags and git
The configuration needs to be updated (yet again)