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

Update CAPI dependencies to 1.2.0, add json logging, Kubernetes 1.24 change #118

Merged

Conversation

shyamradhakrishnan
Copy link
Member

What this PR does / why we need it:

This change uptakes the newer version of CAPI 1.20 release. The changes are as suggested here - https://main.cluster-api.sigs.k8s.io/developer/providers/v1.1-to-v1.2.html#required-api-changes-for-providers

  • Add support for json logging
  • Add the toleration/affinity for Kubernetes 1.24

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 #112

@shyamradhakrishnan
Copy link
Member Author

All e2e tests ran


• [SLOW TEST:822.876 seconds]
Workload cluster creation
/home/ubuntu/go/src/github.com/oracle/cluster-api-provider-oci/test/e2e/cluster_test.go:50
  Machine Pool - Simple
  /home/ubuntu/go/src/github.com/oracle/cluster-api-provider-oci/test/e2e/cluster_test.go:517
------------------------------
STEP: Tearing down the management cluster


Ran 15 of 22 Specs in 4705.857 seconds
SUCCESS! -- 15 Passed | 0 Failed | 0 Pending | 7 Skipped


Ginkgo ran 1 suite in 1h18m29.103645732s
Test Suite Passed
make[1]: Leaving directory '/home/ubuntu/go/src/github.com/

@shyamradhakrishnan
Copy link
Member Author

unit tests ran

setting up env vars
?   	github.com/oracle/cluster-api-provider-oci	[no test files]
ok  	github.com/oracle/cluster-api-provider-oci/api/v1beta1	0.960s	coverage: 18.7% of statements
?   	github.com/oracle/cluster-api-provider-oci/cloud/config	[no test files]
ok  	github.com/oracle/cluster-api-provider-oci/cloud/ociutil	0.563s	coverage: 25.0% of statements
ok  	github.com/oracle/cluster-api-provider-oci/cloud/scope	177.661s	coverage: 73.4% 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/computemanagement	[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	28.401s	coverage: 71.0% of statements
?   	github.com/oracle/cluster-api-provider-oci/exp/api/v1beta1	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/exp/controllers	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/feature	[no test files]

@shyamradhakrishnan shyamradhakrishnan merged commit 3270d9e into oracle:main Jul 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Uptake 1.2 release of CAPI
2 participants