-
Notifications
You must be signed in to change notification settings - Fork 376
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tetragon-oci-hook-setup: crio.conf annotations
Add a command to patch crio.conf to add allowed annotations. For example: > $ ssh cat /etc/crio/crio.conf > crio.conf > $ ./tetragon-oci-hook-setup patch-crio-conf enable-annotations --config-file=crio.conf --output-file crio-patched.conf --annotations='io.kubernetes.cri-o.cgroup2-mount-hierarchy-rw' > $ diff -u crio.conf crio-patched.conf > --- crio.conf 2024-11-29 10:47:11.622015385 +0100 > +++ crio-patched.conf 2024-11-29 11:03:39.856306109 +0100 > @@ -300,6 +300,7 @@ > runtime_path = "/usr/bin/runc" > runtime_type = "oci" > runtime_root = "/run/runc" > +allowed_annotations = ["io.kubernetes.cri-o.cgroup2-mount-hierarchy-rw"] Signed-off-by: Kornilios Kourtis <[email protected]>
- Loading branch information
Showing
44 changed files
with
2,735 additions
and
247 deletions.
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
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,136 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // Copyright Authors of Tetragon | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "log/slog" | ||
| "os" | ||
| "strings" | ||
|
|
||
| "github.com/pelletier/go-toml" | ||
| tomlparser "github.com/pelletier/go-toml/v2/unstable" | ||
| ) | ||
|
|
||
| type patchCrioConf struct { | ||
| EnableAnnotations enableAnnotations `cmd:"" help:"enable annotations"` | ||
| } | ||
|
|
||
| type enableAnnotations struct { | ||
| ConfFile string `name:"config-file" default:"/etc/crio/crio.conf" help:"crio configuration file location (input) (${default}))"` | ||
| Outfile string `name:"output-file" default:"" help:"output file location"` | ||
| Annotations []string `name:"annotations"` | ||
| } | ||
|
|
||
| func doEnableAnnotations(log *slog.Logger, c *enableAnnotations) ([]addLine, error) { | ||
| data, err := os.ReadFile(c.ConfFile) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| p := tomlparser.Parser{ | ||
| KeepComments: true, | ||
| } | ||
| p.Reset(data) | ||
|
|
||
| lines := []addLine{} | ||
| insideRuntime := false | ||
| var annotationsLoc tomlparser.Shape | ||
| for p.NextExpression() { | ||
| e := p.Expression() | ||
| switch insideRuntime { | ||
| case false: | ||
| if e.Kind == tomlparser.Table { | ||
| c := e.Child() | ||
| if c == nil || c.Kind != tomlparser.Key || string(c.Data) != "crio" { | ||
| continue | ||
| } | ||
| c = c.Next() | ||
| if c == nil || c.Kind != tomlparser.Key || string(c.Data) != "runtime" { | ||
| continue | ||
| } | ||
| c = c.Next() | ||
| if c == nil || c.Kind != tomlparser.Key || string(c.Data) != "runtimes" { | ||
| continue | ||
| } | ||
| c = c.Next() | ||
| if c == nil || c.Kind != tomlparser.Key { | ||
| continue | ||
| } | ||
| insideRuntime = true | ||
| } | ||
| case true: | ||
| foundAnnotations := false | ||
| done := false | ||
| annotations := []string{} | ||
| if e.Kind == tomlparser.KeyValue { | ||
| var array *tomlparser.Node | ||
| for c := e.Child(); c != nil; c = c.Next() { | ||
| annotationsLoc = p.Shape(c.Raw) | ||
| if c.Kind == tomlparser.Key && string(c.Data) == "allowed_annotations" { | ||
| foundAnnotations = true | ||
| } else if c.Kind == tomlparser.Array { | ||
| array = c | ||
| } | ||
|
|
||
| if foundAnnotations && array != nil { | ||
| for cc := array.Child(); cc != nil; cc = cc.Next() { | ||
| if cc.Kind == tomlparser.String { | ||
| annotations = append(annotations, string(cc.Data)) | ||
| } | ||
| } | ||
| break | ||
| } | ||
| } | ||
|
|
||
| } else { | ||
| done = true | ||
| } | ||
|
|
||
| if foundAnnotations || done { | ||
| annotations = append(annotations, c.Annotations...) | ||
| qannotations := make([]string, 0, len(annotations)) | ||
| for _, a := range annotations { | ||
| qannotations = append(qannotations, fmt.Sprintf("%q", a)) | ||
| } | ||
| insideRuntime = false | ||
| lines = append(lines, addLine{ | ||
| pos: toml.Position{Col: annotationsLoc.Start.Column, Line: annotationsLoc.Start.Line}, | ||
| line: fmt.Sprintf("allowed_annotations = [%s]", strings.Join(qannotations, ", ")), | ||
| replaceLine: foundAnnotations, | ||
| }) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return lines, nil | ||
|
|
||
| } | ||
|
|
||
| func (c *enableAnnotations) Run(log *slog.Logger) error { | ||
|
|
||
| changes, err := doEnableAnnotations(log, c) | ||
| if len(changes) == 0 { | ||
| log.Info("nothing to do") | ||
| return nil | ||
| } | ||
|
|
||
| outFname := c.Outfile | ||
| if outFname == "" { | ||
| f, err := os.CreateTemp("", "crio.*.conf") | ||
| if err != nil { | ||
| return err | ||
| } | ||
| outFname = f.Name() | ||
| f.Close() | ||
| } | ||
|
|
||
| err = applyChanges(c.ConfFile, outFname, changes) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| log.Info("written output", "filename", outFname) | ||
| return nil | ||
|
|
||
| } |
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
10 changes: 10 additions & 0 deletions
10
contrib/tetragon-rthooks/vendor/github.com/godbus/dbus/v5/.cirrus.yml
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
7 changes: 7 additions & 0 deletions
7
contrib/tetragon-rthooks/vendor/github.com/godbus/dbus/v5/.golangci.yml
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
3 changes: 2 additions & 1 deletion
3
contrib/tetragon-rthooks/vendor/github.com/godbus/dbus/v5/README.md
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
13 changes: 13 additions & 0 deletions
13
contrib/tetragon-rthooks/vendor/github.com/godbus/dbus/v5/SECURITY.md
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
44 changes: 22 additions & 22 deletions
44
contrib/tetragon-rthooks/vendor/github.com/godbus/dbus/v5/auth.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.