Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ClusterClass template for OCICluster #61

Merged

Conversation

shyamradhakrishnan
Copy link
Contributor

What this PR does / why we need it:
This PR create an OCICluster template to be used in ClusterClass and creates e2e test for the same. The PR also fixes a bug in machine reconciler which was assuming ocicluster name was same as cluster name.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #59

@shyamradhakrishnan
Copy link
Contributor Author

Unit test output

setting up env vars
?   	github.com/oracle/cluster-api-provider-oci	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/api/v1beta1	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/config	[no test files]
ok  	github.com/oracle/cluster-api-provider-oci/cloud/ociutil	0.676s	coverage: 30.3% of statements
ok  	github.com/oracle/cluster-api-provider-oci/cloud/scope	76.702s	coverage: 83.5% of statements
?   	github.com/oracle/cluster-api-provider-oci/cloud/scope/mocks	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/compute	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/compute/mock_compute	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/identity	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/identity/mock_identity	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/networkloadbalancer	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/networkloadbalancer/mock_nlb	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/vcn	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/vcn/mock_vcn	[no test files]
ok  	github.com/oracle/cluster-api-provider-oci/controllers	27.915s	coverage: 68.3% of statements

@shyamradhakrishnan
Copy link
Contributor Author

ClusterClass e2e test run

• [SLOW TEST:583.598 seconds]
Workload cluster creation
/home/ubuntu/go/src/github.com/oracle/cluster-api-provider-oci/test/e2e/cluster_test.go:49
  ClusterClass - with 1 control-plane nodes and 1 worker nodes
  /home/ubuntu/go/src/github.com/oracle/cluster-api-provider-oci/test/e2e/cluster_test.go:424

The ccm e2e test failed because of using wrong image, other tests passed

STEP: Tearing down the management cluster


Ran 1 of 18 Specs in 572.329 seconds
FAIL! -- 1 Passed | 0 Failed | 0 Pending | 17 Skipped

Ran the ccm e2e again with correct image

• [SLOW TEST:995.806 seconds]
Workload cluster creation
/home/ubuntu/go/src/github.com/oracle/cluster-api-provider-oci/test/e2e/cluster_test.go:49
  Cloud Provider OCI testing
  /home/ubuntu/go/src/github.com/oracle/cluster-api-provider-oci/test/e2e/cluster_test.go:201
------------------------------
STEP: Tearing down the management cluster


Ran 1 of 18 Specs in 1097.883 seconds
SUCCESS! -- 1 Passed | 0 Failed | 0 Pending | 17 Skipped

joekr
joekr previously approved these changes Apr 12, 2022
Copy link
Member

@joekr joekr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is just the one small copyright change but LGTM

api/v1beta1/ociclustertemplate_types.go Outdated Show resolved Hide resolved
@joekr joekr added the enhancement New feature or request label Apr 13, 2022
@joekr joekr self-requested a review April 13, 2022 13:10
@shyamradhakrishnan shyamradhakrishnan merged commit f69734d into oracle:main Apr 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add OracleClusterTemplate resource
2 participants