From f25754f7b7f4635d1b31846b2cb8accb95f2f93d Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Fri, 28 Jun 2024 12:56:06 +0300 Subject: [PATCH] Set CUE language version Adapt modules to CUE v0.9 breaking changes Signed-off-by: Stefan Prodan --- modules/flux-aio/cue.mod/module.cue | 1 + modules/flux-aio/templates/config.cue | 2 +- modules/flux-git-sync/cue.mod/module.cue | 1 + modules/flux-git-sync/values.cue | 4 +--- modules/flux-helm-release/cue.mod/module.cue | 1 + modules/flux-helm-release/values.cue | 4 +--- modules/flux-oci-sync/cue.mod/module.cue | 1 + modules/flux-oci-sync/values.cue | 4 +--- modules/flux-tenant/cue.mod/module.cue | 1 + modules/flux-tenant/values.cue | 4 +--- 10 files changed, 10 insertions(+), 13 deletions(-) diff --git a/modules/flux-aio/cue.mod/module.cue b/modules/flux-aio/cue.mod/module.cue index 6c0caef..c31a9ef 100644 --- a/modules/flux-aio/cue.mod/module.cue +++ b/modules/flux-aio/cue.mod/module.cue @@ -1 +1,2 @@ module: "timoni.sh/flux-aio" +language: version: "v0.9.0" diff --git a/modules/flux-aio/templates/config.cue b/modules/flux-aio/templates/config.cue index 042102f..b35d9e2 100644 --- a/modules/flux-aio/templates/config.cue +++ b/modules/flux-aio/templates/config.cue @@ -142,7 +142,7 @@ import ( // Instance takes the config values and outputs the Kubernetes objects. #Instance: { - config: #Config + config: #Config containerEnv: #ContainerEnv & {#config: config} containers: [ diff --git a/modules/flux-git-sync/cue.mod/module.cue b/modules/flux-git-sync/cue.mod/module.cue index fe7cff4..9521581 100644 --- a/modules/flux-git-sync/cue.mod/module.cue +++ b/modules/flux-git-sync/cue.mod/module.cue @@ -1 +1,2 @@ module: "timoni.sh/flux-git-sync" +language: version: "v0.9.0" diff --git a/modules/flux-git-sync/values.cue b/modules/flux-git-sync/values.cue index defe136..3e26ede 100644 --- a/modules/flux-git-sync/values.cue +++ b/modules/flux-git-sync/values.cue @@ -6,6 +6,4 @@ package main // Defaults -values: { - -} +values: {} diff --git a/modules/flux-helm-release/cue.mod/module.cue b/modules/flux-helm-release/cue.mod/module.cue index d56c522..83d4285 100644 --- a/modules/flux-helm-release/cue.mod/module.cue +++ b/modules/flux-helm-release/cue.mod/module.cue @@ -1 +1,2 @@ module: "timoni.sh/flux-helm-release" +language: version: "v0.9.0" diff --git a/modules/flux-helm-release/values.cue b/modules/flux-helm-release/values.cue index defe136..3e26ede 100644 --- a/modules/flux-helm-release/values.cue +++ b/modules/flux-helm-release/values.cue @@ -6,6 +6,4 @@ package main // Defaults -values: { - -} +values: {} diff --git a/modules/flux-oci-sync/cue.mod/module.cue b/modules/flux-oci-sync/cue.mod/module.cue index ff9b9c9..3c403e6 100644 --- a/modules/flux-oci-sync/cue.mod/module.cue +++ b/modules/flux-oci-sync/cue.mod/module.cue @@ -1 +1,2 @@ module: "timoni.sh/flux-oci-sync" +language: version: "v0.9.0" diff --git a/modules/flux-oci-sync/values.cue b/modules/flux-oci-sync/values.cue index defe136..3e26ede 100644 --- a/modules/flux-oci-sync/values.cue +++ b/modules/flux-oci-sync/values.cue @@ -6,6 +6,4 @@ package main // Defaults -values: { - -} +values: {} diff --git a/modules/flux-tenant/cue.mod/module.cue b/modules/flux-tenant/cue.mod/module.cue index 3e09c4e..b4ea7a6 100644 --- a/modules/flux-tenant/cue.mod/module.cue +++ b/modules/flux-tenant/cue.mod/module.cue @@ -1 +1,2 @@ module: "timoni.sh/flux-tenant" +language: version: "v0.9.0" diff --git a/modules/flux-tenant/values.cue b/modules/flux-tenant/values.cue index defe136..3e26ede 100644 --- a/modules/flux-tenant/values.cue +++ b/modules/flux-tenant/values.cue @@ -6,6 +6,4 @@ package main // Defaults -values: { - -} +values: {}