Upgrade crio to 1.15.0 #4703
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
|
|
||
| #if !defined(CONFIG_H) | ||
| #define CONFIG_H | ||
|
|
||
| #define BUF_SIZE 8192 | ||
| #define STDIO_BUF_SIZE 8192 | ||
| #define DEFAULT_SOCKET_PATH "/var/run/crio" | ||
|
|
||
| #endif // CONFIG_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| diff --git a/Makefile b/Makefile | ||
| index de79f63..a9ea13b 100644 | ||
| --- a/Makefile | ||
| +++ b/Makefile | ||
| @@ -136,7 +136,7 @@ crio.conf: bin/crio | ||
| release-note: ${RELEASE_TOOL} | ||
| ${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 | ||
| $(GO) build $(LDFLAGS) -tags "$(BUILDTAGS)" -o bin/crio-config $(PROJECT)/cmd/crio-config | ||
| ( cd conmon && $(CURDIR)/bin/crio-config ) | ||
|
|
||
| diff --git a/cmd/crio/main.go b/cmd/crio/main.go | ||
| index 0bc347a..ab9969f 100644 | ||
| --- a/cmd/crio/main.go | ||
| +++ b/cmd/crio/main.go | ||
| @@ -207,7 +207,7 @@ func mergeConfig(config *server.Config, ctx *cli.Context) (string, error) { | ||
| } | ||
|
|
||
| func writeCrioGoroutineStacks() { | ||
| - path := filepath.Join("/tmp", fmt.Sprintf("crio-goroutine-stacks-%s.log", strings.ReplaceAll(time.Now().Format(time.RFC3339), ":", ""))) | ||
| + path := filepath.Join("/tmp", fmt.Sprintf("crio-goroutine-stacks-%s.log", strings.Replace(time.Now().Format(time.RFC3339), ":", "", -1))) | ||
| if err := utils.WriteGoroutineStacksToFile(path); err != nil { | ||
| logrus.Warnf("Failed to write goroutine stacks: %s", err) | ||
| } | ||
| diff --git a/oci/runtime_vm.go b/oci/runtime_vm.go | ||
| index 57a1fde..64f853f 100644 | ||
| --- a/oci/runtime_vm.go | ||
| +++ b/oci/runtime_vm.go | ||
| @@ -172,7 +172,7 @@ func (r *runtimeVM) startRuntimeDaemon(c *Container) error { | ||
| args = append(args, "start") | ||
|
|
||
| // Modify the runtime path so that it complies with v2 shim API | ||
| - newRuntimePath := strings.ReplaceAll(r.path, "-", ".") | ||
| + newRuntimePath := strings.Replace(r.path, "-", ".", -1) | ||
|
|
||
| // Setup default namespace | ||
| r.ctx = namespaces.WithNamespace(r.ctx, namespaces.Default) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
.gitfolder. 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.