github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-11 21:02:34 +00:00
Code Issues Projects Releases Wiki Activity

katautils: Use config paths set during the build

Browse Source 
When building kata runtime packagers can simply do something like
`make CONFDIR=/usr/share/kata-containers/defaults` and it'll make
runtime understand that `/usr/share/defaults/kata-containers/` shouldn't
be used as `defaultRuntimeConfiguration` and, instead, runtime will use
whatever as passed to `make` during build time.

This is a quite common approach, mainly for distros, as there's no
perfect agreement on directory layout and whatnot.

Kwowing that, let's also make `containerd-shim-kata-v2`, which reads the
configurations from `pkg/katautils/config-settings.go`, to have a
similar behaviour as `runtime` and respect a "build-time" configured
`defaultRuntimeConfiguration` and `defaultSysConfRuntimeConfiguration`
paths.

Fixes: #2610

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
This commit is contained in:
Fabiano Fidêncio 2020-04-15 13:32:05 +02:00
parent c369692924
commit bf9758bf86
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -16,6 +16,7 @@
/data/kata-collect-data.sh /data/kata-collect-data.sh
/kata-netmon /kata-netmon
/kata-runtime /kata-runtime
/pkg/katautils/config-settings.go
/virtcontainers/hack/virtc/virtc /virtcontainers/hack/virtc/virtc
/virtcontainers/hook/mock/hook /virtcontainers/hook/mock/hook
/virtcontainers/profile.cov /virtcontainers/profile.cov

1
Makefile
View File

@ -537,6 +537,7 @@ endef
GENERATED_FILES += $(CLI_DIR)/config-generated.go GENERATED_FILES += $(CLI_DIR)/config-generated.go
GENERATED_FILES += pkg/katautils/config-settings.go
$(TARGET_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST) | show-summary $(TARGET_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST) | show-summary
$(QUIET_BUILD)(cd $(CLI_DIR) && go build $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ .) $(QUIET_BUILD)(cd $(CLI_DIR) && go build $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ .)

4
pkg/katautils/config-settings.go → pkg/katautils/config-settings.go.in
View File

@ -55,11 +55,11 @@ const defaultTemplatePath string = "/run/vc/vm/template"
const defaultVMCacheEndpoint string = "/var/run/kata-containers/cache.sock" const defaultVMCacheEndpoint string = "/var/run/kata-containers/cache.sock"
// Default config file used by stateless systems. // Default config file used by stateless systems.
var defaultRuntimeConfiguration = "/usr/share/defaults/kata-containers/configuration.toml" var defaultRuntimeConfiguration = "@CONFIG_PATH@"
// Alternate config file that takes precedence over // Alternate config file that takes precedence over
// defaultRuntimeConfiguration. // defaultRuntimeConfiguration.
var defaultSysConfRuntimeConfiguration = "/etc/kata-containers/configuration.toml" var defaultSysConfRuntimeConfiguration = "@SYSCONFIG@"
var name = "kata" var name = "kata"
var defaultProxyPath = "/usr/libexec/kata-containers/kata-proxy" var defaultProxyPath = "/usr/libexec/kata-containers/kata-proxy"