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

Added CNI Addressing options and vappProperty cluster variables #45

Merged
merged 6 commits into from
Jan 17, 2025

Conversation

pknomad
Copy link
Contributor

@pknomad pknomad commented Jan 7, 2025

  1. Added cluster-cidr and service-cidr into cluster.yaml to set CNI address
  2. Added vappProperty settings
  3. Added pool and network back into vsphere values (commented out)

Updated cluster.yaml to include settings for cluster and service CIDR for pod communication via CNI.
Update values.yaml to ingest cluster and service cidr settings into cluster.yaml. The default values are using rancher defaults: https://ranchermanager.docs.rancher.com/reference-guides/cluster-configuration/rancher-server-configuration/gke-cluster-configuration#container-address-range
Re-added network and pool settings for vsphere nodes and added vapp settings (vappIpallocationpolicy, vappIpprotocol, vappTransport, and vappProperty).

vappProperty settings in comments sets ip, gateway, dns if all 3 options are needed
@pknomad
Copy link
Contributor Author

pknomad commented Jan 7, 2025

Addresses closed out github issues from my corporate github account:
#44
#43
#42

@zackbradys
Copy link
Member

zackbradys commented Jan 14, 2025

Hey @pknomad

Thanks for putting this together and pinging us in Issue #46! I saw this last over the weekend, but didn’t get a chance to look at it. Could you update your PR with the below minor updates/changes?

In the values.yaml and other example values…

cluster-cidr: 10.42.0.0/16 # https://docs.rke2.io/networking/basic_network_options
service-cidr: 10.43.0.0/16 # https://docs.rke2.io/networking/basic_network_options

Updated cluster-cidr and service-cidr to include rancher documentation link
@pknomad
Copy link
Contributor Author

pknomad commented Jan 14, 2025

Hey @zackbradys,

Done! Let me know if any other revisions are needed. I'm also happy to validate IPv6 setting for VAPP property options when it's fully supported by Rancher. Thanks for the review!

Cheers,
Jason

@zackbradys
Copy link
Member

Hey @pknomad... I updated the rest of the values with the new options of service-cidr and cluster-cidr. I'm waiting for one of our engineers to validate this PR and then good to merge for the next release!

@zackbradys zackbradys merged commit edeb0f8 into rancherfederal:main Jan 17, 2025
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.

2 participants