Feat: Support VCN Native CNI/Native Pod Networking changes #399

sindhusri16 · 2025-02-24T17:25:31Z

Feat: Support VCN Native CNI/Native Pod Networking changes

What this PR does / why we need it:
This includes new fields to support vcn native cni using native pod networking. Fields are introduced at the machine and machinetemplate level to include the cniType param. OKE on PCA needs this feature and could be supported when NPN is open as well.

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

…ges from open source

…luster-api-provider-oci into vcn-native-changes

sindhusri16 · 2025-02-28T19:21:50Z

Unittest output:
GOBIN=/home/opc/cluster-api-provider-oci/hack/tools/bin ./scripts/go_install.sh sigs.k8s.io/controller-runtime/tools/setup-envtest setup-envtest v0.0.0-20230131074648-f5014c077fc3
kube-builder assets: /home/opc/.local/share/kubebuilder-envtest/k8s/1.24.2-linux-amd64
KUBEBUILDER_ASSETS="/home/opc/.local/share/kubebuilder-envtest/k8s/1.24.2-linux-amd64" go test -coverprofile=coverage.out ./...
? github.com/oracle/cluster-api-provider-oci [no test files]
? github.com/oracle/cluster-api-provider-oci/cloud/config [no test files]
? github.com/oracle/cluster-api-provider-oci/cloud/metrics [no test files]
? 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/loadbalancer [no test files]
? github.com/oracle/cluster-api-provider-oci/cloud/services/loadbalancer/mock_lb [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]
? github.com/oracle/cluster-api-provider-oci/cloud/services/workrequests [no test files]
? github.com/oracle/cluster-api-provider-oci/cloud/services/workrequests/mock_workrequests [no test files]
? github.com/oracle/cluster-api-provider-oci/feature [no test files]
? github.com/oracle/cluster-api-provider-oci/version [no test files]
ok github.com/oracle/cluster-api-provider-oci/api/v1beta1 89.740s coverage: 23.6% of statements
ok github.com/oracle/cluster-api-provider-oci/api/v1beta2 0.052s coverage: 14.6% of statements
ok github.com/oracle/cluster-api-provider-oci/cloud/ociutil 0.012s coverage: 15.9% of statements
ok github.com/oracle/cluster-api-provider-oci/cloud/scope 20.148s coverage: 74.7% of statements
ok github.com/oracle/cluster-api-provider-oci/cloud/util 0.623s coverage: 61.1% of statements
ok github.com/oracle/cluster-api-provider-oci/controllers 2.077s coverage: 58.4% of statements
ok github.com/oracle/cluster-api-provider-oci/exp/api/v1beta1 31.177s coverage: 15.3% of statements
ok github.com/oracle/cluster-api-provider-oci/exp/api/v1beta2 0.028s coverage: 4.8% of statements
ok github.com/oracle/cluster-api-provider-oci/exp/controllers 0.374s coverage: 56.3% of statements
go tool cover -func=coverage.out -o coverage.txt
go tool cover -html=coverage.out -o coverage.html

joekr · 2025-03-03T17:17:54Z

e2e tests

Ran 7 of 28 Specs in 2637.402 seconds
SUCCESS! -- 7 Passed | 0 Failed | 0 Pending | 21 Skipped

joekr · 2025-03-03T20:18:30Z

cloud/util/util.go

+	npnVersion                      = "oci.oraclecloud.com/v1beta1"
+	npnKind                         = "NativePodNetwork"
+	apiExtensionVersion             = "apiextensions.k8s.io/v1"
+	npnCrdName                      = "nativepodnetworks.oci.oraclecloud.com"


Are these needed here now?

sindhusri16 · 2025-03-05T15:45:41Z

Unittests after the latest commit

make test
GOBIN=/home/opc/cluster-api-provider-oci/hack/tools/bin ./scripts/go_install.sh sigs.k8s.io/controller-runtime/tools/setup-envtest setup-envtest v0.0.0-20230131074648-f5014c077fc3
kube-builder assets: /home/opc/.local/share/kubebuilder-envtest/k8s/1.24.2-linux-amd64
KUBEBUILDER_ASSETS="/home/opc/.local/share/kubebuilder-envtest/k8s/1.24.2-linux-amd64" go test -coverprofile=coverage.out ./...
? github.com/oracle/cluster-api-provider-oci [no test files]
? github.com/oracle/cluster-api-provider-oci/cloud/config [no test files]
? github.com/oracle/cluster-api-provider-oci/cloud/metrics [no test files]
? 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/loadbalancer [no test files]
? github.com/oracle/cluster-api-provider-oci/cloud/services/loadbalancer/mock_lb [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]
? github.com/oracle/cluster-api-provider-oci/cloud/services/workrequests [no test files]
? github.com/oracle/cluster-api-provider-oci/cloud/services/workrequests/mock_workrequests [no test files]
? github.com/oracle/cluster-api-provider-oci/feature [no test files]
? github.com/oracle/cluster-api-provider-oci/version [no test files]
ok github.com/oracle/cluster-api-provider-oci/api/v1beta1 97.718s coverage: 23.6% of statements
ok github.com/oracle/cluster-api-provider-oci/api/v1beta2 0.053s coverage: 14.6% of statements
ok github.com/oracle/cluster-api-provider-oci/cloud/ociutil 0.005s coverage: 15.9% of statements
ok github.com/oracle/cluster-api-provider-oci/cloud/scope 20.314s coverage: 74.7% of statements
ok github.com/oracle/cluster-api-provider-oci/cloud/util 0.733s coverage: 61.1% of statements
ok github.com/oracle/cluster-api-provider-oci/controllers 2.161s coverage: 58.4% of statements
ok github.com/oracle/cluster-api-provider-oci/exp/api/v1beta1 31.113s coverage: 15.3% of statements
ok github.com/oracle/cluster-api-provider-oci/exp/api/v1beta2 0.059s coverage: 4.8% of statements
ok github.com/oracle/cluster-api-provider-oci/exp/controllers 0.943s coverage: 56.3% of statements
go tool cover -func=coverage.out -o coverage.txt
go tool cover -html=coverage.out -o coverage.html

Peizhao Li added 10 commits February 24, 2025 09:36

Feat: API Spec & CRD & Conversion for VCN Native Params

fd4c2b6

Feat: NPN CR Reconciliation in OCIMachine_controller

a4f44a5

Fix: Add common label for compatibility & remove non-related crd chan…

f816852

…ges from open source

Fix: Improve NPN CR Reconcile

1d28aba

Fix: Kube Client Creation

b7af01c

Fix: Update CNI Type String

6e53cc9

Fix: Return nil upon retry

f090b7a

Fix: unused var

5875d6a

Fix: improve logging and error display

763cd93

Fix: Use different CR for get and create

10b419a

oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Feb 24, 2025

sindhusri16 and others added 4 commits February 24, 2025 22:55

Merge branch 'main' into vcn-native-changes

5e73d5e

Feat: include the NPN Reconcile into client scope package

b49e82a

Merge remote-tracking branch 'origin' into vcn-native-changes

885bdcf

Merge branch 'vcn-native-changes' of https://github.com/sindhusri16/c…

f737228

…luster-api-provider-oci into vcn-native-changes

sindhusri16 changed the title ~~Vcn native changes~~ Feat: Support VCN Native CNI/Native Pod Networking changes Feb 28, 2025

sindhusri16 requested a review from joekr February 28, 2025 19:12

add workrequestclientUrl to crd to remove inconsistency

8a7c9dc

joekr reviewed Mar 3, 2025

View reviewed changes

Style: Remove Redudant Const

5c653d3

Merge branch 'oracle:main' into vcn-native-changes

f12a2cb

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat: Support VCN Native CNI/Native Pod Networking changes #399

Feat: Support VCN Native CNI/Native Pod Networking changes #399

sindhusri16 commented Feb 24, 2025 •

edited

Loading

sindhusri16 commented Feb 28, 2025

joekr commented Mar 3, 2025

joekr Mar 3, 2025

sindhusri16 commented Mar 5, 2025

Feat: Support VCN Native CNI/Native Pod Networking changes #399

Are you sure you want to change the base?

Feat: Support VCN Native CNI/Native Pod Networking changes #399

Conversation

sindhusri16 commented Feb 24, 2025 • edited Loading

sindhusri16 commented Feb 28, 2025

joekr commented Mar 3, 2025

e2e tests

joekr Mar 3, 2025

Choose a reason for hiding this comment

sindhusri16 commented Mar 5, 2025

sindhusri16 commented Feb 24, 2025 •

edited

Loading