Commit Graph

248 Commits

Author SHA1 Message Date
xingming01 3afed4a627
Fix: reconcile after configuration's hcl changed (#360)
Co-authored-by: caoxingming <caoxingming@jd.com>
2023-06-08 10:23:34 +08:00
吴就业 d2e6f21b29
fix: The execution of the terraformDestroy method fails and the appli… (#366)
Co-authored-by: 吴就业 <wujiuye@lizhi.fm>
2023-06-01 14:00:59 +08:00
吴就业 a8a6504ded
fix: Check whether the namespace of Secret and ConfigMap is the same … (#365)
Co-authored-by: 吴就业 <wujiuye@lizhi.fm>
2023-05-30 10:00:59 +08:00
吴就业 6e51e97210
feat: Supports marking a job as failed after specifying a few retries… (#362)
* feat: Supports marking a job as failed after specifying a few retries #361

Signed-off-by: 吴就业 <wujiuye@lizhi.fm>

* Values.jobBackoffLimit defaults to ""

Signed-off-by: 吴就业 <wujiuye@lizhi.fm>

---------

Signed-off-by: 吴就业 <wujiuye@lizhi.fm>
Co-authored-by: 吴就业 <wujiuye@lizhi.fm>
2023-05-19 17:50:07 +08:00
qiaozp e2f31a4b6b
Feat: allow delete the provisioning resources (#354)
* Feat: allow delete configuration halfway the apply

* Modify chart

* Add test

Fix test script

* smaller quota

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>

---------

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
2023-02-09 14:03:50 +08:00
Ramesh Krishna c6d69a8828
Feat: support private terraform registry (#352)
Co-authored-by: qiaozp <47812250+chivalryq@users.noreply.github.com>
2023-01-19 11:36:33 +08:00
Joshua Agboola 841b0d17d9
Feat: Support retrieving modules in private git repo through SSH (#349) 2022-12-09 10:31:30 +08:00
leason 34d5b1b4aa
Fix: delete Job cascading delete Pod fail (#343)
Co-authored-by: lisen <lisen@youzan.com>
2022-08-17 10:31:18 +08:00
Qiaozp 3a96f687c1 Fix: async delete cause duplicated destroy
Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
2022-08-16 18:04:00 +08:00
Qiaozp 1f49401f92 fix test
Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
2022-08-16 15:06:16 +08:00
Qiaozp d9e9d6be4f Fix: rollback delete resource logic
Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
2022-08-16 14:55:09 +08:00
leason 989407ed13
Support for specifying job environment variables (#337)
Co-authored-by: lisen <lisen@youzan.com>
2022-08-15 12:04:09 +08:00
qiaozp cb66ba89fd
Fix: legacy backend state reading and GC (#338) 2022-08-12 11:53:45 +08:00
Qiaozp 9e37965ba9 fix nil pointer
Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
2022-08-08 20:19:35 +08:00
Qiaozp 03d056595e fix
Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
2022-08-08 18:10:19 +08:00
Qiaozp d64230ae7e fix
Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
2022-08-08 17:41:09 +08:00
Qiaozp abe42943b2 Fix: apply job recreation
Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
2022-08-08 17:29:33 +08:00
lisen 689a4db96c bugfix ucloud region
Signed-off-by: lisen <lisen@youzan.com>
2022-08-05 17:30:03 +08:00
qiaozp 43c73a54b2
Fix: compatible to gc legacy resources when switch to controller-namespace (#332)
* Fix: compatible to gc legacy resources when switch to controller-namespace

Signed-off-by: qiaozp <qiaozhongpei.qzp@alibaba-inc.com>

* use forloop to gc sub-resources

Signed-off-by: qiaozp <qiaozhongpei.qzp@alibaba-inc.com>

* fix lint

Signed-off-by: qiaozp <qiaozhongpei.qzp@alibaba-inc.com>

* fix

Signed-off-by: qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
2022-08-03 17:15:44 +08:00
Rohith Jayawardene 4b5a5ebe47
[FEATURE] - Run Jobs in central namespace (#295)
* - updating the chart to support job namespaces

Signed-off-by: Rohith Jayawardene <gambol99@gmail.com>

* - updating the controllers to support the ability to run the jobs in a central namespace and avoiding the need to copy global secrets around

Signed-off-by: Rohith Jayawardene <gambol99@gmail.com>

* - updating the cmd to support passing the job namespace and support localizing to a single namespace if required

Signed-off-by: Rohith Jayawardene <gambol99@gmail.com>

* adding the resource limits

Signed-off-by: Rohith Jayawardene <gambol99@gmail.com>

* - trying to fix the linting and unit tests

Signed-off-by: Rohith Jayawardene <gambol99@gmail.com>

* - improving the test coverage

Signed-off-by: Rohith Jayawardene <gambol99@gmail.com>

* - changing the job-namespace command line flag to --controller-namespace
- changing the variable name in controller and meta to reflect changes i.e JobNamespace -> ControllerNamespace
- updated the helm chart to reflect the changes

Signed-off-by: Rohith Jayawardene <gambol99@gmail.com>

* - uncommenting the tests

Signed-off-by: Rohith Jayawardene <gambol99@gmail.com>

* - commenting out the test for a moment

Signed-off-by: Rohith Jayawardene <gambol99@gmail.com>

* - fixing up the issue highlighted in the review

Signed-off-by: Rohith Jayawardene <gambol99@gmail.com>

* - rebasing master onto the branch and fixing the units tests / ensuring it works

Signed-off-by: Rohith Jayawardene <gambol99@gmail.com>
2022-07-25 08:48:30 +08:00
Zheng Xi Zhou 1478cddfb2
Fix: Terraform state is being overwritten each time (#326)
* Fix: Terraform state is being overwritten each time

When using Terraform component to create applications in different
namespaces, Terraform state is being overwritten each time

Fix https://github.com/kubevela/kubevela/issues/4215

Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com>

* fix UT

Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com>
2022-06-27 11:33:16 +08:00
Nan Li 5d0ff0ba67
Enhance S3Backend (#323)
* make `configuration.spec.backend.s3.region` optional

Signed-off-by: loheagn <loheagn@icloud.com>

* check if the bucket exists when build s3 backend

Signed-off-by: loheagn <loheagn@icloud.com>

* fix typo

Signed-off-by: loheagn <loheagn@icloud.com>
2022-06-27 11:11:01 +08:00
Nan Li 487809a0fe
Add support for custom s3 backend (#316)
* Add support for custom s3 backend

Signed-off-by: loheagn <loheagn@icloud.com>

* Rename some examples

Signed-off-by: loheagn <loheagn@icloud.com>

* Rename `S3Backend.Token` to `S3Backend.SessionToken`

Signed-off-by: loheagn <loheagn@icloud.com>

* Fix go.mod

Signed-off-by: loheagn <loheagn@icloud.com>

* Refactor the `backend.Backend` initialization logic

Signed-off-by: loheagn <loheagn@icloud.com>

* lint code

Signed-off-by: loheagn <loheagn@icloud.com>

* lint code

Signed-off-by: loheagn <loheagn@icloud.com>

* lint code

Signed-off-by: loheagn <loheagn@icloud.com>

* lint code

Signed-off-by: loheagn <loheagn@icloud.com>

* e2e test

Signed-off-by: loheagn <loheagn@icloud.com>

* e2e test retry

Signed-off-by: loheagn <loheagn@icloud.com>

* e2e test

Signed-off-by: loheagn <loheagn@icloud.com>

* e2e test retry

Signed-off-by: loheagn <loheagn@icloud.com>

* e2e test try again

Signed-off-by: loheagn <loheagn@icloud.com>

* e2e test try again

Signed-off-by: loheagn <loheagn@icloud.com>

* e2e test try again

Signed-off-by: loheagn <loheagn@icloud.com>

* e2e test try again

Signed-off-by: loheagn <loheagn@icloud.com>

* e2e test try again

Signed-off-by: loheagn <loheagn@icloud.com>

* e2e test

Signed-off-by: loheagn <loheagn@icloud.com>

* Reuse the meta.Credentials to build `backend.Backend`

Signed-off-by: loheagn <loheagn@icloud.com>

* make "kubernetes" and "s3" constants

Signed-off-by: loheagn <loheagn@icloud.com>
2022-06-09 10:08:19 +08:00
leason 6a3bc1a525
bugfix delete fail when deleteConfigurationDirectly (#320)
Signed-off-by: lisen <lisen@youzan.com>

Co-authored-by: lisen <lisen@youzan.com>
2022-06-08 15:58:53 +08:00
Zheng Xi Zhou b3e099a211
Remove color codes from Configuration status (#322)
Removed color codes from Configuration status, while keep the color
in the Terraform log for a better visualbility.

Signed-off-by: Zheng Xi Zhou <zhengxi.zzx@alibaba-inc.com>

Co-authored-by: Zheng Xi Zhou <zhengxi.zzx@alibaba-inc.com>
2022-06-08 10:06:04 +08:00
Zheng Xi Zhou cef58c7e58
Feat: expose region in status (#318)
Region is the region for the cloud resources created by this Configuration.
If spec.region is not empty, it's the value of it. Otherwise, it's the value
of spec.providerReference.region.

Signed-off-by: Zheng Xi Zhou <zhengxi.zzx@alibaba-inc.com>

Co-authored-by: Zheng Xi Zhou <zhengxi.zzx@alibaba-inc.com>
2022-05-31 15:22:23 +08:00
Nan Li 971d169b2b
Support custom Terraform backends (#291)
* Update the specification of the `spec.backend` to enable the end-users to custom the Terraform backend configuration

Signed-off-by: loheagn <loheagn@icloud.com>
2022-05-25 10:51:29 +08:00
loheagn db94a329fe Remove `spec.BaseConfigurationSpec` from configuration_controller_test.go
Signed-off-by: loheagn <loheagn@icloud.com>
2022-05-24 22:21:27 +08:00
Zheng Xi Zhou 16bd07ec8e
Merge pull request #307 from leason00/bugfix_bool
The type of DeleteResource is changed to pointer
2022-05-24 16:09:33 +08:00
Zheng Xi Zhou 90b168fa55 Remove the inlined BaseConfiguration
Removed the inlined BaseConfiguration to make it more straightforward.

Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com>
2022-05-20 15:44:38 +08:00
Zheng Xi Zhou 37a25a1dd6
Merge pull request #305 from zzxwill/force-deletion
Support force deletion of Configuration
2022-05-18 15:14:36 +08:00
Zheng Xi Zhou bc053fb0d6 Support force deletion of Configuration
Force delete Configuration no matter which state it is or whether it has
provisioned some resources. This feature will help delete Configuration
in unexpected cases.

Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com>
2022-05-18 14:43:40 +08:00
kang.feng 99eb18e5a8
add huaweicloud support (#308)
* feat: add HuaweiCloud provider support

Signed-off-by: fengkang <fengkangb@digitalchina.com>

* feat: add HuaweiCloud provider support

Signed-off-by: fengkang <fengkangb@digitalchina.com>

* feat: add HuaweiCloud provider support

Signed-off-by: fengkang <fengkangb@digitalchina.com>
2022-05-18 14:02:51 +08:00
lisen ff799ec0b6 The type of The type of DeleteResource is changed to pointer
Signed-off-by: lisen <lisen@youzan.com>
2022-05-16 20:03:59 +08:00
Zheng Xi Zhou 92a47d7345 Add e2e test
- Added e2e test workflow
- Added e2e tests for Configuration which doesn't have a provider

Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com>
2022-05-13 16:45:54 +08:00
Zheng Xi Zhou d40417a478 fix UT
Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com>
2022-05-10 09:41:04 +08:00
Zheng Xi Zhou 7635134cd8 add e2e
Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com>
2022-05-10 09:41:04 +08:00
Zheng Xi Zhou 6bc093f5b2 Support inline credentials besides provider
Fix https://github.com/oam-dev/terraform-controller/issues/290

Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com>
2022-05-10 09:40:54 +08:00
leason 80fa089da7
Assign nodeselector to job. (#300)
Signed-off-by: lisen <lisen@youzan.com>

Co-authored-by: lisen <lisen@youzan.com>
2022-05-09 17:24:29 +08:00
Yan Du 6fd6744a81 resolve conflict
Signed-off-by: Yan Du <yan.du@kyndryl.com>
2022-03-24 17:40:05 +08:00
Yan Du 1b2ed84d2a Merge branch 'master' into fix-244
Signed-off-by: Yan Du <red.snapper@qq.com>
2022-03-24 17:18:03 +08:00
Zheng Xi Zhou 75ae1d409f fix CI issues
Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com>
2022-03-23 20:51:43 +08:00
Zheng Xi Zhou 5bb2ef99a0 fix format issues
Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com>
2022-03-23 20:49:55 +08:00
Zheng Xi Zhou 7879374150 revise ut
Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com>
2022-03-23 20:49:55 +08:00
Zheng Xi Zhou d837a0ffc3 add unit tests
Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com>
2022-03-23 20:49:55 +08:00
Zheng Xi Zhou ede04da45e Check whether there is error in Terraform init stage
- check logs when `terraform init`
- allow a Configuration to delete when hiting init issues

Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com>
2022-03-23 20:49:54 +08:00
loheagn e8458e6e38 Update the error string reported when different configurations try to update the same secret
Signed-off-by: loheagn <loheagn@icloud.com>
2022-03-23 20:36:01 +08:00
Zheng Xi Zhou d1a5282610 Add unit testcases
Added more uts

Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com>
2022-03-20 16:50:32 +08:00
Zheng Xi Zhou 7e7efc28ba Remove Terraform JSON support
JSON typed configuration is deprecated in v0.3.1, now removed it.

Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com>
2022-03-19 14:43:51 +08:00
loheagn f6ac372438 Fix compile errors
Signed-off-by: loheagn <loheagn@icloud.com>
2022-03-17 15:54:13 +08:00