Skip to content

Commit

Permalink
Merge pull request #264 from beagles/octavia-provider-network
Browse files Browse the repository at this point in the history 
Octavia provider network
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Mar 20, 2024
2 parents 5ad406c + 586e4bb commit 69b737c
Show file tree
Hide file tree
Showing 19 changed files with 855 additions and 433 deletions.
18 changes: 3 additions & 15 deletions api/bases/octavia.openstack.org_octaviaamphoracontrollers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,21 +106,9 @@ spec:
to add additional files. Those get added to the service config dir
in /etc/<service> . TODO: -> implement'
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
description: OctaviaLbMgmtNetworks Settings for Octavia management
networks
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
description: IP Version of the managed subnets
type: integer
type: object
lbMgmtNetworkID:
default: ""
type: string
networkAttachments:
description: NetworkAttachments is a list of NetworkAttachment resource
names to expose the services to the given network
Expand Down
57 changes: 10 additions & 47 deletions api/bases/octavia.openstack.org_octavias.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,21 +519,9 @@ spec:
also be used to add additional files. Those get added to the
service config dir in /etc/<service> . TODO: -> implement'
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
description: OctaviaLbMgmtNetworks Settings for Octavia management
networks
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
description: IP Version of the managed subnets
type: integer
type: object
lbMgmtNetworkID:
default: ""
type: string
networkAttachments:
description: NetworkAttachments is a list of NetworkAttachment
resource names to expose the services to the given network
Expand Down Expand Up @@ -717,21 +705,9 @@ spec:
also be used to add additional files. Those get added to the
service config dir in /etc/<service> . TODO: -> implement'
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
description: OctaviaLbMgmtNetworks Settings for Octavia management
networks
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
description: IP Version of the managed subnets
type: integer
type: object
lbMgmtNetworkID:
default: ""
type: string
networkAttachments:
description: NetworkAttachments is a list of NetworkAttachment
resource names to expose the services to the given network
Expand Down Expand Up @@ -915,21 +891,9 @@ spec:
also be used to add additional files. Those get added to the
service config dir in /etc/<service> . TODO: -> implement'
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
description: OctaviaLbMgmtNetworks Settings for Octavia management
networks
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
description: IP Version of the managed subnets
type: integer
type: object
lbMgmtNetworkID:
default: ""
type: string
networkAttachments:
description: NetworkAttachments is a list of NetworkAttachment
resource names to expose the services to the given network
Expand Down Expand Up @@ -1159,7 +1123,7 @@ spec:
tenantName:
default: service
description: TenantName - the name of the OpenStack tenant that controls
the Octavia resources
the Octavia resources TODO(gthiemonge) same as ServiceAccount?
type: string
required:
- apacheContainerImage
Expand All @@ -1168,7 +1132,6 @@ spec:
- rabbitMqClusterName
- secret
- serviceAccount
- tenantName
type: object
status:
description: OctaviaStatus defines the observed state of Octavia
Expand Down
4 changes: 2 additions & 2 deletions api/v1beta1/amphoracontroller_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ type OctaviaAmphoraControllerSpecCore struct {
TenantName string `json:"tenantName"`

// +kubebuilder:validation:Optional
// +kubebuilder:default={manageLbMgmtNetworks: true, subnetIpVersion: 4}
LbMgmtNetworks OctaviaLbMgmtNetworks `json:"lbMgmtNetwork"`
// +kubebuilder:default=""
LbMgmtNetworkID string `json:"lbMgmtNetworkID"`

// +kubebuilder:validation:Optional
// +kubebuilder:default={}
Expand Down
11 changes: 6 additions & 5 deletions api/v1beta1/octavia_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,12 @@ type OctaviaSpecBase struct {
// TODO: -> implement
DefaultConfigOverwrite map[string]string `json:"defaultConfigOverwrite,omitempty"`

// +kubebuilder:validation:Optional
// +kubebuilder:default=service
// TenantName - the name of the OpenStack tenant that controls the Octavia resources
// TODO(gthiemonge) same as ServiceAccount?
TenantName string `json:"tenantName"`

// +kubebuilder:validation:Optional
// +kubebuilder:default={manageLbMgmtNetworks: true, subnetIpVersion: 4}
LbMgmtNetworks OctaviaLbMgmtNetworks `json:"lbMgmtNetwork"`
Expand Down Expand Up @@ -192,11 +198,6 @@ type OctaviaSpecBase struct {
// +kubebuilder:validation:Required
// Apache Container Image URL
ApacheContainerImage string `json:"apacheContainerImage"`

// +kubebuilder:validation:Required
// +kubebuilder:default=service
// TenantName - the name of the OpenStack tenant that controls the Octavia resources
TenantName string `json:"tenantName"`
}

// PasswordSelector to identify the DB and AdminUser password from the Secret
Expand Down
1 change: 0 additions & 1 deletion api/v1beta1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 3 additions & 15 deletions config/crd/bases/octavia.openstack.org_octaviaamphoracontrollers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,21 +106,9 @@ spec:
to add additional files. Those get added to the service config dir
in /etc/<service> . TODO: -> implement'
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
description: OctaviaLbMgmtNetworks Settings for Octavia management
networks
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
description: IP Version of the managed subnets
type: integer
type: object
lbMgmtNetworkID:
default: ""
type: string
networkAttachments:
description: NetworkAttachments is a list of NetworkAttachment resource
names to expose the services to the given network
Expand Down
57 changes: 10 additions & 47 deletions config/crd/bases/octavia.openstack.org_octavias.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,21 +519,9 @@ spec:
also be used to add additional files. Those get added to the
service config dir in /etc/<service> . TODO: -> implement'
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
description: OctaviaLbMgmtNetworks Settings for Octavia management
networks
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
description: IP Version of the managed subnets
type: integer
type: object
lbMgmtNetworkID:
default: ""
type: string
networkAttachments:
description: NetworkAttachments is a list of NetworkAttachment
resource names to expose the services to the given network
Expand Down Expand Up @@ -717,21 +705,9 @@ spec:
also be used to add additional files. Those get added to the
service config dir in /etc/<service> . TODO: -> implement'
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
description: OctaviaLbMgmtNetworks Settings for Octavia management
networks
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
description: IP Version of the managed subnets
type: integer
type: object
lbMgmtNetworkID:
default: ""
type: string
networkAttachments:
description: NetworkAttachments is a list of NetworkAttachment
resource names to expose the services to the given network
Expand Down Expand Up @@ -915,21 +891,9 @@ spec:
also be used to add additional files. Those get added to the
service config dir in /etc/<service> . TODO: -> implement'
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
description: OctaviaLbMgmtNetworks Settings for Octavia management
networks
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
description: IP Version of the managed subnets
type: integer
type: object
lbMgmtNetworkID:
default: ""
type: string
networkAttachments:
description: NetworkAttachments is a list of NetworkAttachment
resource names to expose the services to the given network
Expand Down Expand Up @@ -1159,7 +1123,7 @@ spec:
tenantName:
default: service
description: TenantName - the name of the OpenStack tenant that controls
the Octavia resources
the Octavia resources TODO(gthiemonge) same as ServiceAccount?
type: string
required:
- apacheContainerImage
Expand All @@ -1168,7 +1132,6 @@ spec:
- rabbitMqClusterName
- secret
- serviceAccount
- tenantName
type: object
status:
description: OctaviaStatus defines the observed state of Octavia
Expand Down
7 changes: 7 additions & 0 deletions config/samples/octavia_v1beta1_octavia.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ spec:
customServiceConfig: |
[DEFAULT]
debug = true
networkAttachments:
- octavia

octaviaHealthManager:
databaseInstance: openstack
databaseAccount: octavia
Expand All @@ -41,6 +44,8 @@ spec:
customServiceConfig: |
[DEFAULT]
debug = true
networkAttachments:
- octavia
octaviaWorker:
databaseInstance: openstack
databaseAccount: octavia
Expand All @@ -55,6 +60,8 @@ spec:
customServiceConfig: |
[DEFAULT]
debug = true
networkAttachments:
- octavia
octaviaAPI:
databaseInstance: openstack
databaseAccount: octavia
Expand Down
Loading

0 comments on commit 69b737c

Please sign in to comment.