-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #123 from adobley/remove-old-pool-fields
Remove subnet, first and last from the pool spec and create v1alpha2 Pool
- Loading branch information
Showing
39 changed files
with
1,803 additions
and
581 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| Copyright 2023 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package v1alpha1 | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net/netip" | ||
|
|
||
| "go4.org/netipx" | ||
| "k8s.io/apimachinery/pkg/conversion" | ||
| "k8s.io/apimachinery/pkg/util/validation/field" | ||
|
|
||
| v1alpha2 "sigs.k8s.io/cluster-api-ipam-provider-in-cluster/api/v1alpha2" | ||
| ) | ||
|
|
||
| func Convert_v1alpha1_InClusterIPPoolSpec_To_v1alpha2_InClusterIPPoolSpec(in *InClusterIPPoolSpec, out *v1alpha2.InClusterIPPoolSpec, scope conversion.Scope) error { | ||
| out.Gateway = in.Gateway | ||
| out.Prefix = in.Prefix | ||
| out.Addresses = in.Addresses | ||
|
|
||
| if in.Subnet != "" { | ||
| prefix, err := netip.ParsePrefix(in.Subnet) | ||
| if err != nil { | ||
| return field.Invalid(field.NewPath("spec", "subnet"), in.Subnet, err.Error()) | ||
| } | ||
|
|
||
| prefixRange := netipx.RangeOfPrefix(prefix) | ||
| if in.First == "" { | ||
| in.First = prefixRange.From().Next().String() // omits the first address, the assumed network address | ||
| } | ||
| if in.Last == "" { | ||
| in.Last = prefixRange.To().Prev().String() // omits the last address, the assumed broadcast | ||
| } | ||
| if in.Prefix == 0 { | ||
| in.Prefix = prefix.Bits() | ||
| out.Prefix = prefix.Bits() | ||
| } | ||
| } | ||
|
|
||
| if in.First != "" && in.Last != "" { | ||
| out.Addresses = append(out.Addresses, fmt.Sprintf("%s-%s", in.First, in.Last)) | ||
| } | ||
|
|
||
| return nil | ||
| } |
Oops, something went wrong.