summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2020-11-19Merge "Wait for service to be listening before running tests"Ritu Sood2-0/+12
2020-11-19Merge "Properly escape query string to jq"Ritu Sood1-2/+2
2020-11-19Merge "Move test inside if block to prevent premature exit"Ritu Sood1-3/+2
2020-11-19Merge "Fix typo in deployments/helm/v2/emco/Chart.yaml"Ritu Sood1-1/+1
2020-11-18Improve early-detection of empty templateKonrad Bańka7-13/+104
Previous empty template detection pattern matched only against templates resolved to empty-or-whitespace-only files. This change makes it handle other case of empty yaml correctly, namely, yaml containing comments only. Issue-ID: MULTICLOUD-1252 Signed-off-by: Konrad Bańka <k.banka@samsung.com> Change-Id: I9132e167ec607c8a4a4ca5584141ed043c6ddd4f
2020-10-30Wait for service to be listening before running testsTodd Malsbary2-0/+12
Issue-ID: MULTICLOUD-1242 Signed-off-by: Todd Malsbary <todd.malsbary@intel.com> Change-Id: I5aa45daf92ebfbee32d154dc17f7d2afd72bf255
2020-10-30Properly escape query string to jqTodd Malsbary1-2/+2
Without this change, the '.request.release-name' query causes jq to get confused by the '-' and fail the test script: jq: error: name/0 is not defined at <top-level>, line 1: .request.release-name jq: 1 compile error Issue-ID: MULTICLOUD-1241 Signed-off-by: Todd Malsbary <todd.malsbary@intel.com> Change-Id: I386cd46db8e44c92bc24d8eb8a9e3964d9b87d39
2020-10-30Move test inside if block to prevent premature exitTodd Malsbary1-3/+2
grep returns a non-zero error code if the pattern is not found. This would cause the topology-manager.sh test to exit prematurely instead of capturing and logging the error and returning zero as intended. Issue-ID: MULTICLOUD-1240 Signed-off-by: Todd Malsbary <todd.malsbary@intel.com> Change-Id: I29c4d30630c0f803325c2ed024d4c0b9e8a0e911
2020-10-30Fix typo in deployments/helm/v2/emco/Chart.yamlTodd Malsbary1-1/+1
Issue-ID: MULTICLOUD-1239 Signed-off-by: Todd Malsbary <todd.malsbary@intel.com> Change-Id: Ibf7c7d2a64889b72cdc67a587548fb6a0dac6ba0
2020-10-16Merge "Update EMCO OpenAPI spec with DCM APIs"Eric Multanen1-0/+909
2020-10-16Merge "Restore commented unit test TestDeleteLogicalCloud"Eric Multanen5-39/+48
2020-10-16Merge "delete should return 404 error for invalid name"Eric Multanen1-1/+6
2020-10-10Restore commented unit test TestDeleteLogicalCloudIgor D.C5-39/+48
Restore the previously commented-out unit test TestDeleteLogicalCloud. That test was disabled due to a failure introduced by interacting with AppContext for the first time in module/logicalcloud.go and it not being ready to do so. This commit restores it and modifies code so dependent mocks can plug in correctly. This was done in order to keep testing the code that was previously being tested, not so much to add additional coverage. Although it would be a significant undertaking, the different types and interfaces in pkg/module should be redesigned to achieve better decoupling and thus make unit testing more straightforward. Issue-ID: MULTICLOUD-1143 Change-Id: I1e6b7bb9111fc6883f0c9cee887329a9e0b27fbd Signed-off-by: Igor D.C <igor.duarte.cardoso@intel.com>
2020-10-09Update EMCO OpenAPI spec with DCM APIsIgor D.C1-0/+909
Update emco_apis.yaml with all new API paths provided by DCM and its /logical-clouds URL prefix. Update schemas and parameters too. Issue-ID: MULTICLOUD-1143 Change-Id: I9d94cb2954c2f0131ffb8c3061a87a6b6a235cba Signed-off-by: Igor D.C <igor.duarte.cardoso@intel.com>
2020-10-08Fix mispelled key name in kubeconfigIgor D.C1-1/+1
Fixes the mispelled "currentcontext" with the right key name "current-context" which was introduced as a regression with or before the latest version of the kubeconfig code (probably a bad search/replace). This 1-character long bug was preventing the generated kubeconfigs from being correctly interpreted by kubectl. Thus, kubectl couldn't set any context of the kubeconfig as the current context. Observable output before this fix: $ kubectl get pods The connection to the server localhost:8080 was refused - did you specify the right host or port? Issue-ID: MULTICLOUD-1143 Change-Id: I617d1e20b7be2567729b84d3746b22e4ceaf8b9d Signed-off-by: Igor D.C <igor.duarte.cardoso@intel.com>
2020-10-08Updating the API definitionRitu Sood1-184/+203
API definition updated to add generic placemnent intent under deployment group Issue-ID: MULTICLOUD-1096 Signed-off-by: Ritu Sood <ritu.sood@intel.com> Change-Id: Ida830de0f17038925651bc604440b11547b7320d
2020-10-08Merge "Add k8splugin releases file for 0.7.0"Ritu Sood1-0/+8
2020-10-08Add k8splugin releases file for 0.7.0Eric Multanen1-0/+8
Add k8splugin file for 0.7.0 Issue-ID: MULTICLOUD-1213 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com> Change-Id: I54d7610f39be4d05e176ff7e2f67bd7594e50677
2020-10-08Merge "Reduce duplication around DeleteCompositeApp calls"Ritu Sood1-124/+36
2020-10-08Update k8splugin for G release0.7.0Eric Multanen1-1/+1
Update image version of k8splugin to 0.7.0-SNAPSHOT This will be then be used to create the release image Issue-ID: MULTICLOUD-1213 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com> Change-Id: Ice57a61bc98397a2bbb5c313452459b02ec86139
2020-10-08Reduce duplication around DeleteCompositeApp callsIgor D.C1-124/+36
DCM's apply function had a lot of error handling code that cleans up the AppContext if something goes wrong while adding to AppContext. Most of that handling was using multiline duplicate code with the only change being in the log/error strings. This commit attempts to reuse all that error handling code and make it easier to follow main code. Issue-ID: MULTICLOUD-1143 Change-Id: I3a35387b1ed46279c1b973dbd852352276ff5cc8 Signed-off-by: Igor D.C <igor.duarte.cardoso@intel.com>
2020-10-06Merge "Apply corrections to EMCO v2 helm README"Ritu Sood1-12/+11
2020-10-06Apply corrections to EMCO v2 helm READMEIgor D.C1-12/+11
Mostly just make the identifiers consistent with each other so copy-paste works without surprises. No more rel- prefix, just emco-. Additionally suggest a 2nd workaround to the persistentvolumes issue. Issue-ID: MULTICLOUD-1143 Change-Id: I7ad1d3a4b20f7563226a9d487c388275e56429b5 Signed-off-by: Igor D.C <igor.duarte.cardoso@intel.com>
2020-10-06Add DCM to Helm deployment folderIgor D.C9-0/+194
Also add DCM to cleanup-emco.sh. Issue-ID: MULTICLOUD-1143 Change-Id: I2496c1fef2e2588c1c8e750105568afc210d54c3 Signed-off-by: Igor D.C <igor.duarte.cardoso@intel.com>
2020-10-05Merge "Remove unused mongo db methods from emco code"Ritu Sood4-634/+0
2020-10-05Merge "Ovnaction and vfw updates for deploy api change"Ritu Sood21-575/+442
2020-10-05Merge "Modify GenericPlacement APIs to include DepIntGrp"Ritu Sood13-102/+216
2020-10-02Ovnaction and vfw updates for deploy api changeEric Multanen21-575/+442
Update the ovnaction controller APIs to support the api change of including the deployment intent group in the URL. Also fixup: - vfw and other test cases to support the change - updates to emcoctl tool and examples Issue-ID: MULTICLOUD-1218 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com> Change-Id: Icadacb5ec6d7c238bb3bf8a44a39c30692ecebee
2020-10-02Modify GenericPlacement APIs to include DepIntGrpRajamohan Raj13-102/+216
Modify the genericPlacementIntent API such that deploymentIntentGroup becomes a mandatory parameter. Issue-ID: MULTICLOUD-1218 Signed-off-by: Rajamohan Raj <rajamohan.raj@intel.com> Change-Id: I33d2eeac5b60228e9c08921c9347b1b6aa3f8d28
2020-10-02DCM E2E testing fixesIgor D.C3-5/+8
A set of small fixes after discovery during DCM's end-to-end testing: - properly detect that a cert hasn't been issued yet (don't crash) - in Monitor, don't pass namespace when querying for CSRs - fixed incorrect /kubeconfig file encoding from yaml to json Issue-ID: MULTICLOUD-1143 Change-Id: Ie813e377070b0751f0bfdabac8da50e3288090de Signed-off-by: Igor D.C <igor.duarte.cardoso@intel.com>
2020-10-02Merge "Set name of resources correctly in appcontext"Ritu Sood1-36/+38
2020-10-02Merge "Reimplement Terminate to be compatible with Status"Ritu Sood4-63/+133
2020-10-02Remove unused mongo db methods from emco codeEric Multanen4-634/+0
Remove the set of unused (legacy from v1) mongo db methods so that they are not used in the emco code base. Issue-ID: MULTICLOUD-1227 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com> Change-Id: Ibe94892e5b1d0f33192be7ea3db5c55b3f8cbf60
2020-10-02Set name of resources correctly in appcontextIgor D.C1-36/+38
Previously the DCM K8s resources in appcontext were in the format: <logical cloud name>+<resource type> Now they are in the correct format: <resource name>+<ResourceType> Issue-ID: MULTICLOUD-1143 Change-Id: I271c70587244921cc2ffb7ad571ad8eb162cb10f Signed-off-by: Igor D.C <igor.duarte.cardoso@intel.com>
2020-10-02Reimplement Terminate to be compatible with StatusIgor D.C4-63/+133
This also includes modifying Apply and Delete, since there are strict conditions that need to be met in each, to prevent Logical Clouds (LCs) from entering a bad state. Summary of what's being done here: - When applying: - set tag 'lccontext' in the LC to the context ID (was already done) - and let rsync know about the appcontext (grpc) (was already done) - if tag was already set, check current context /status - if context /status is actually Terminated, 'lccontext' is set to new context ID and previous AppContext deleted - When terminating: - lets rsync know about the termination request (grpc) - When deleting: - checks whether the current context /status is Terminated - if it is, then it will remove the latest LC context This particular commit disables the TestDeleteLogicalCloud test until a known issue behind the test is resolved. This commit does not leverage the full capacity of the Status framework, but is sufficient to support all operations. A future patch will entirely migrate DCM to the Status framework. Until then, a known issue exists where DCM will forget about context IDs previously associated to a particular Logical Cloud (only keeps last). Issue-ID: MULTICLOUD-1143 Change-Id: I7a6034eba543c2a27daa41b7fe6298cb2a85f9ce Signed-off-by: Igor D.C <igor.duarte.cardoso@intel.com>
2020-10-02Adding CSR Approval functionalityRitu Sood5-8/+220
Update rsync to be able to approve CSR Issue-ID: MULTICLOUD-1143 Signed-off-by: Ritu Sood <ritu.sood@intel.com> Change-Id: I0b2bec3475a3453a2d8fc9c2e87cfc4531b0e2f3
2020-10-02Improve DCM test script: apply, term, kubeconfigIgor D.C1-30/+39
Adds apply and terminate operations, while decoupling them in two different script branches. Add kubeconfig test into a third script branch. Also, $cluster_2_name wasn't defined, so this fixes that. Issue-ID: MULTICLOUD-1143 Change-Id: I574934078644ec83224bcac74b5b17783330aaaa Signed-off-by: Igor D.C <igor.duarte.cardoso@intel.com>
2020-10-02Merge "Fix rsync retry logic for unreachable cluster"Ritu Sood1-1/+1
2020-10-01Fix rsync retry logic for unreachable clusterEric Multanen1-1/+1
Fix rsync to only retry reaching clusters until the timeout occurs. Issue-ID: MULTICLOUD-1226 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com> Change-Id: I5e8202358cfd8cdd15c9feb4fcbefe2683b7139a
2020-10-01Subtle refactoring in a few functionsIgor D.C7-99/+186
In DCM. Essentially refactored two different areas: - rename apply/terminate functions in module to clarify what they do - split gets from getAlls in API code of the 5 DCM resource types And cleaned up here and there. Issue-ID: MULTICLOUD-1143 Change-Id: I9b72c77ba34a1febd5df4a339e87968ddc4a7891 Signed-off-by: Igor D.C <igor.duarte.cardoso@intel.com>
2020-10-01Fix arg mismatch in GetLogicalCloudContextIgor D.C1-1/+1
The previous commits were merged in the wrong order, which caused a bad 3-way merge resulting in the arg mismatch as witnessed below: k8s/src/dcm/pkg/modulepkg/module/cluster.go:263:57: not enough arguments in call to lcClient.GetLogicalCloudContext have (string) want (string, string) Makefile:13: recipe for target 'all' failed make: *** [all] Error 2 The CI merge job doesn't run tests before merging, so this slipped in. Issue-ID: MULTICLOUD-1143 Change-Id: I0168345af6bac7886cba32d958f241687ab24a81 Signed-off-by: Igor D.C <igor.duarte.cardoso@intel.com>
2020-09-30Merge "Implement Kubeconfig endpoint in DCM"Ritu Sood6-14/+267
2020-09-30Merge "Update ResourceBundleState CRD and monitor-deploy"Eric Multanen2-0/+16
2020-09-30Merge "Fix Status API to actually provide instance status"Eric Multanen7-313/+194
2020-09-30Update ResourceBundleState CRD and monitor-deployIgor D.C2-0/+16
Update ResourceBundleState CRD and monitor-deploy.yaml with csrStatuses. This was missing from the previous patch implementing CSR support in Monitor. Depending on how the environment was brought up, attempting to read the CSR would result in forbidden access. Issue-ID: MULTICLOUD-1143 Change-Id: I86ffb8df8faa045e57fd553e5784d308e1900ee4 Signed-off-by: Igor D.C <igor.duarte.cardoso@intel.com>
2020-09-30Merge "Add DCM to K8s deployment file"Ritu Sood2-10/+74
2020-09-30delete should return 404 error for invalid nameAditya Sharoff1-1/+6
Issue-ID: MULTICLOUD-1150 Change-Id: I04c9584e35672b6b40047a67be4d2026002204e1 Signed-off-by: Aditya Sharoff <aditya.sharoff@intel.com>
2020-09-30Add DCM to K8s deployment fileIgor D.C2-10/+74
Issue-ID: MULTICLOUD-1143 Change-Id: Iaca9bd6cb3614e0ae825d9231476524ce09db550 Signed-off-by: Igor D.C <igor.duarte.cardoso@intel.com>
2020-09-30Fix Status API to actually provide instance statusKonrad Bańka7-313/+194
Provide information about instance resources and Pods inside status response. Issue-ID: MULTICLOUD-1177 Signed-off-by: Konrad Bańka <k.banka@samsung.com> Change-Id: Iee6fd56120d091dddfa6b6d0e4aa7eb36d40e888
2020-09-29Use project name provided by API in DCMIgor D.C4-12/+21
DCM apply/terminate code was still using a hardcoded "test-project" string for the project name that logical clouds should associate to. This simple patch makes DCM use the project name provided by the API. It also checks that the project exists before creating a Logical Cloud. Issue-ID: MULTICLOUD-1143 Change-Id: I05c8a2309ed07a7c96da30bf2461c43abaccc9d5 Signed-off-by: Igor D.C <igor.duarte.cardoso@intel.com>