From b2169279fa865999ae822f1dce19067b4bacf0ed Mon Sep 17 00:00:00 2001 From: Tsuzu <8574909+tsuzu@users.noreply.github.com> Date: Tue, 14 Mar 2023 00:01:01 +0900 Subject: [PATCH] Add TETRAPOD_CNI_POD_TEMPLATES, TETRAPOD_CNI_ENABLE_EXTRA_CLAIMS --- tetrad/api/v1alpha1/cniconfig_types.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tetrad/api/v1alpha1/cniconfig_types.go b/tetrad/api/v1alpha1/cniconfig_types.go index 4bdc83e7f..61a651c38 100644 --- a/tetrad/api/v1alpha1/cniconfig_types.go +++ b/tetrad/api/v1alpha1/cniconfig_types.go @@ -44,6 +44,16 @@ func loadFromEnv(v *string, key string) { *v = value } +func loadFromEnvBool(v *bool, key string) { + value := os.Getenv(key) + + if value == "" { + return + } + + *v, _ = strconv.ParseBool(key) +} + func loadFromEnvArray(v *[]string, key string) { value := os.Getenv(key) @@ -170,6 +180,9 @@ type CNIDConfig struct { } func (c *CNIDConfig) Load(configPath string) { + loadFromEnvArray(&c.AddressClaimTemplates, "TETRAPOD_CNI_POD_TEMPLATES") + loadFromEnvBool(&c.Extra, "TETRAPOD_CNI_ENABLE_EXTRA_CLAIMS") + if c.SocketPath == "" { c.SocketPath = cniserver.DefaultSocketPath }