Skip to content

Commit b1db68e

Browse files
committed
Removed ipaddressController and moved the logic into the pool controller
1 parent d986eff commit b1db68e

11 files changed

+209
-272
lines changed

api/v1alpha7/openstackfloatingippool_webhook.go

Lines changed: 0 additions & 73 deletions
This file was deleted.

api/v1alpha7/zz_generated.deepcopy.go

Lines changed: 0 additions & 125 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v1alpha7/openstackfloatingippool_types.go renamed to api/v1alpha8/openstackfloatingippool_types.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package v1alpha7
17+
package v1alpha8
1818

1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -50,6 +50,7 @@ type OpenStackFloatingIPPoolSpec struct {
5050
IdentityRef *OpenStackIdentityReference `json:"identityRef,omitempty"`
5151

5252
// FloatingIPNetwork is the external network to use for floating ips, if there's only one external network it will be used by default
53+
// +optional
5354
FloatingIPNetwork NetworkFilter `json:"floatingIPNetwork"`
5455

5556
// The name of the cloud to use from the clouds secret
@@ -86,6 +87,7 @@ type OpenStackFloatingIPPoolStatus struct {
8687
}
8788

8889
//+kubebuilder:object:root=true
90+
// +kubebuilder:storageversion
8991
//+kubebuilder:subresource:status
9092

9193
// OpenStackFloatingIPPool is the Schema for the openstackfloatingippools API.

api/v1alpha8/zz_generated.deepcopy.go

Lines changed: 125 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackfloatingippools.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
singular: openstackfloatingippool
1515
scope: Namespaced
1616
versions:
17-
- name: v1alpha7
17+
- name: v1alpha8
1818
schema:
1919
openAPIV3Schema:
2020
description: OpenStackFloatingIPPool is the Schema for the openstackfloatingippools
@@ -90,8 +90,6 @@ spec:
9090
- Retain
9191
- Delete
9292
type: string
93-
required:
94-
- floatingIPNetwork
9593
type: object
9694
status:
9795
description: OpenStackFloatingIPPoolStatus defines the observed state

0 commit comments

Comments
 (0)