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.

Sign up for GitHub

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

Jump to bottom

Add params to machinepool and support instance configuration upgrade #183

Merged
merged 1 commit into from
Dec 8, 2022
Merged

Add params to machinepool and support instance configuration upgrade #183

merged 1 commit into from
Dec 8, 2022

Conversation

shyamradhakrishnan
Copy link
Member

@shyamradhakrishnan shyamradhakrishnan commented Nov 23, 2022 •
edited
Loading

What this PR does / why we need it:

Add params to machinepool and support instance configuration upgrade, and add supported parameters.

The vendor folder was removed via commit bf3d86c so that the vendor Custom resources are not published via crddev

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 #

@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Nov 23, 2022
@shyamradhakrishnan shyamradhakrishnan marked this pull request as ready for review November 30, 2022 11:01
joekr
joekr requested changes Nov 30, 2022
View reviewed changes
cloud/scope/machine.go Outdated Show resolved Hide resolved
cloud/scope/machine_pool.go Outdated Show resolved Hide resolved
cloud/scope/machine_pool.go Show resolved Hide resolved
cloud/scope/machine_pool.go Outdated Show resolved Hide resolved
cloud/scope/machine_pool.go Outdated Show resolved Hide resolved
cloud/scope/machine_pool.go Outdated Show resolved Hide resolved
cloud/scope/machine_pool.go Show resolved Hide resolved
@shyamradhakrishnan shyamradhakrishnan force-pushed the machinepool_add_params branch 3 times, most recently from c25f849 to 88bac95 Compare December 6, 2022 09:57
@shyamradhakrishnan
Copy link
Member Author

unit tests

Using cached envtest tools from /Users/shyaradh/oke/src/github.com/oracle/cluster-api-provider-oci/testbin
setting up env vars
?   	github.com/oracle/cluster-api-provider-oci	[no test files]
ok  	github.com/oracle/cluster-api-provider-oci/api/v1beta1	1.070s	coverage: 17.9% 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.730s	coverage: 25.0% of statements
ok  	github.com/oracle/cluster-api-provider-oci/cloud/scope	168.397s	coverage: 76.7% of statements
?   	github.com/oracle/cluster-api-provider-oci/cloud/scope/mocks	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/base	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/base/mock_base	[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/computemanagement/mock_computemanagement	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/containerengine	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/containerengine/mock_containerengine	[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.468s	coverage: 69.0% of statements
ok  	github.com/oracle/cluster-api-provider-oci/exp/api/v1beta1	3.403s	coverage: 8.8% of statements
ok  	github.com/oracle/cluster-api-provider-oci/exp/controllers	1.783s	coverage: 55.3% of statements
?   	github.com/oracle/cluster-api-provider-oci/feature	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/version	[no test files]

@shyamradhakrishnan
Copy link
Member Author

machinepool e2e test run

  Timeline >>
  STEP: Creating namespace "capoci-e2e-8zf93w" for hosting the cluster @ 12/06/22 10:33:58.641
  Dec  6 10:33:58.641: INFO: starting to create namespace for hosting the "capoci-e2e-8zf93w" test spec
  INFO: Creating namespace capoci-e2e-8zf93w
  INFO: Creating event watcher for namespace "capoci-e2e-8zf93w"
  INFO: Cluster name is capoci-e2e-8zf93w-machine-pool
  INFO: Creating the workload cluster with name "capoci-e2e-8zf93w-machine-pool" using the "machine-pool" template (Kubernetes v1.24.4, 1 control-plane machines, 1 worker machines)
  INFO: Getting the cluster template yaml
  INFO: clusterctl config cluster capoci-e2e-8zf93w-machine-pool --infrastructure (default) --kubernetes-version v1.24.4 --control-plane-machine-count 1 --worker-machine-count 1 --flavor machine-pool
  INFO: Applying the cluster template yaml to the cluster
  INFO: Waiting for the cluster infrastructure to be provisioned
  STEP: Waiting for cluster to enter the provisioned phase @ 12/06/22 10:34:00.996
  INFO: Waiting for control plane to be initialized
  INFO: Waiting for the first control plane machine managed by capoci-e2e-8zf93w/capoci-e2e-8zf93w-machine-pool-control-plane to be provisioned
  STEP: Waiting for one control plane node to exist @ 12/06/22 10:35:31.056
  INFO: Installing a CNI plugin to the workload cluster
  INFO: Waiting for control plane to be ready
  INFO: Waiting for control plane capoci-e2e-8zf93w/capoci-e2e-8zf93w-machine-pool-control-plane to be ready (implies underlying nodes to be ready as well)
  STEP: Waiting for the control plane to be ready @ 12/06/22 10:48:23.739
  STEP: Checking all the control plane machines are in the expected failure domains @ 12/06/22 10:49:23.77
  INFO: Waiting for the machine deployments to be provisioned
  INFO: Waiting for the machine pools to be provisioned
  STEP: Waiting for the machine pool workload nodes @ 12/06/22 10:49:23.829
  STEP: Scaling the machine pool up @ 12/06/22 10:52:53.918
  INFO: Patching the replica count in Machine Pool capoci-e2e-8zf93w/capoci-e2e-8zf93w-machine-pool-mp-0
  STEP: Waiting for the machine pool workload nodes @ 12/06/22 10:52:53.963
  STEP: Scaling the machine pool down @ 12/06/22 10:57:54.083
  INFO: Patching the replica count in Machine Pool capoci-e2e-8zf93w/capoci-e2e-8zf93w-machine-pool-mp-0
  STEP: Waiting for the machine pool workload nodes @ 12/06/22 10:57:54.147
  STEP: Dumping logs from the "capoci-e2e-8zf93w-machine-pool" workload cluster @ 12/06/22 10:59:44.194
  STEP: Dumping all the Cluster API resources in the "capoci-e2e-8zf93w" namespace @ 12/06/22 10:59:44.194
  STEP: Deleting all clusters in the capoci-e2e-8zf93w namespace @ 12/06/22 10:59:44.453
  STEP: Deleting cluster capoci-e2e-8zf93w-machine-pool @ 12/06/22 10:59:44.484
  INFO: Waiting for the Cluster capoci-e2e-8zf93w/capoci-e2e-8zf93w-machine-pool to be deleted
  STEP: Waiting for cluster capoci-e2e-8zf93w-machine-pool to be deleted @ 12/06/22 10:59:44.496
  STEP: Deleting namespace used for hosting the "create-workload-cluster" test spec @ 12/06/22 11:04:34.607
  INFO: Deleting namespace capoci-e2e-8zf93w
  << Timeline
------------------------------
[SynchronizedAfterSuite] PASSED [0.838 seconds]
[SynchronizedAfterSuite]

@shyamradhakrishnan
Copy link
Member Author

PR blocking tests run

[SynchronizedAfterSuite] PASSED [0.000 seconds]
[SynchronizedAfterSuite]
/home/ubuntu/go/src/github.com/oracle/cluster-api-provider-oci/test/e2e/e2e_suite_test.go:250
------------------------------
[SynchronizedAfterSuite] PASSED [216.984 seconds]
[SynchronizedAfterSuite]
/home/ubuntu/go/src/github.com/oracle/cluster-api-provider-oci/test/e2e/e2e_suite_test.go:250

  Timeline >>
  STEP: Tearing down the management cluster @ 12/06/22 09:46:26.074
  << Timeline
------------------------------

Ran 5 of 21 Specs in 1856.919 seconds
SUCCESS! -- 5 Passed | 0 Failed | 0 Pending | 16 Skipped

@joekr joekr mentioned this pull request Dec 6, 2022
Closed
joekr
joekr approved these changes Dec 7, 2022
View reviewed changes
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.

lgtm

cloud/scope/machine_pool.go Show resolved Hide resolved
@shyamradhakrishnan shyamradhakrishnan merged commit e31d67a into oracle:main Dec 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joekr joekr joekr approved these changes

Assignees
No one assigned
Labels
OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@shyamradhakrishnan @joekr