From 92870679018371f2e454969b2fae25af6600790f Mon Sep 17 00:00:00 2001 From: lixd Date: Thu, 24 Aug 2023 17:07:06 +0800 Subject: [PATCH 1/3] Bump terraform addon version Signed-off-by: lixd --- addons/terraform/metadata.yaml | 2 +- addons/terraform/readme.md | 3 ++- addons/terraform/resources/terraform-controller.cue | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/terraform/metadata.yaml b/addons/terraform/metadata.yaml index 5da7f8e1..57e3b0c7 100644 --- a/addons/terraform/metadata.yaml +++ b/addons/terraform/metadata.yaml @@ -1,5 +1,5 @@ name: terraform -version: 1.1.2 +version: 1.1.3 description: Terraform Controller is a Kubernetes Controller for Terraform. icon: https://static.kubevela.net/images/logos/terraform.png url: https://github.com/oam-dev/terraform-controller diff --git a/addons/terraform/readme.md b/addons/terraform/readme.md index 93b1fa7b..63646e1c 100644 --- a/addons/terraform/readme.md +++ b/addons/terraform/readme.md @@ -20,4 +20,5 @@ A Kubernetes [Terraform Controller](https://github.com/oam-dev/terraform-control | 1.0.11 | v0.7.5 | 1.0.2 | alicloud 1.140.0; random 3.1.0 | | 1.0.12 | v0.7.6 | 1.0.2 | alicloud 1.140.0; random 3.1.0 | | 1.0.13 | v0.7.7 | 1.0.2 | alicloud 1.140.0; random 3.1.0 | -| 1.1.2 | v0.7.11 | 1.0.2 | alicloud 1.140.0; random 3.1.0 | \ No newline at end of file +| 1.1.2 | v0.7.11 | 1.0.2 | alicloud 1.140.0; random 3.1.0 | +| 1.1.3 | v0.7.12 | 1.0.2 | alicloud 1.140.0; random 3.1.0 | \ No newline at end of file diff --git a/addons/terraform/resources/terraform-controller.cue b/addons/terraform/resources/terraform-controller.cue index b7947ab8..29cf5795 100644 --- a/addons/terraform/resources/terraform-controller.cue +++ b/addons/terraform/resources/terraform-controller.cue @@ -4,7 +4,7 @@ output: { repoType: "helm" url: "https://kubevela.github.io/charts" chart: "terraform-controller" - version: "0.7.11" + version: "0.7.12" upgradeCRD: parameter.upgradeCRD if parameter.values != _|_ { values: parameter.values From ac9e0a2dce33c761e980a1443e36ff3c06b178e8 Mon Sep 17 00:00:00 2001 From: lixd Date: Sun, 8 Oct 2023 15:51:02 +0800 Subject: [PATCH 2/3] fix: move helm repository ca filed from data to stringData Signed-off-by: lixd --- addons/fluxcd/config-templates/helm-repository.cue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/addons/fluxcd/config-templates/helm-repository.cue b/addons/fluxcd/config-templates/helm-repository.cue index 591f506a..ec9758a8 100644 --- a/addons/fluxcd/config-templates/helm-repository.cue +++ b/addons/fluxcd/config-templates/helm-repository.cue @@ -33,9 +33,6 @@ template: { if parameter.password != _|_ { password: parameter.password } - - } - data: { if parameter.caFile != _|_ { caFile: parameter.caFile } @@ -53,7 +50,7 @@ template: { username?: string // +usage=The password of basic auth repo. password?: string - // +usage=The ca certificate of helm repository. Please encode this data with base64. + // +usage=The ca certificate of helm repository. don't need base64 encode. caFile?: string } } From e371671bd06335fbc03abc707e56e3a6c301ed13 Mon Sep 17 00:00:00 2001 From: lixd Date: Tue, 17 Oct 2023 16:19:09 +0800 Subject: [PATCH 3/3] upgrade fluxcd addon version to 2.3.8 Signed-off-by: lixd --- addons/fluxcd/metadata.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/fluxcd/metadata.yaml b/addons/fluxcd/metadata.yaml index dbffc3d5..bd714c05 100644 --- a/addons/fluxcd/metadata.yaml +++ b/addons/fluxcd/metadata.yaml @@ -1,5 +1,5 @@ name: fluxcd -version: 2.3.7 +version: 2.3.8 description: Extended workload to do continuous and progressive delivery icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/flux/horizontal/color/flux-horizontal-color.png url: https://fluxcd.io