Merge pull request #237 from gthiemonge/custom_flavors

Add support for Octavia flavors/flavorprofiles and user-defined nova …
openstack-k8s-operators · Feb 28, 2024 · 2acf2ad · 2acf2ad
2 parents 9e1c9e2 + f229d68
commit 2acf2ad
Show file tree

Hide file tree

Showing 10 changed files with 505 additions and 42 deletions.
diff --git a/api/bases/octavia.openstack.org_octaviaamphoracontrollers.yaml b/api/bases/octavia.openstack.org_octaviaamphoracontrollers.yaml
@@ -50,6 +50,30 @@ spec:
             description: OctaviaAmphoraControllerSpec defines common state for all
               Octavia Amphora Controllers
             properties:
+              amphoraCustomFlavors:
+                description: AmphoraCustomFlavors - User-defined flavors for Octavia
+                items:
+                  description: OctaviaAmphoraFlavor Settings for custom Amphora flavors
+                  properties:
+                    RAM:
+                      type: integer
+                    RxTxFactor:
+                      type: string
+                    VCPUs:
+                      type: integer
+                    description:
+                      type: string
+                    disk:
+                      type: integer
+                    name:
+                      type: string
+                  required:
+                  - RAM
+                  - VCPUs
+                  - disk
+                  - name
+                  type: object
+                type: array
               certsPassphraseSecret:
                 default: octavia-ca-passphrase
                 description: Name of secret containing passphrase for the CA private

diff --git a/api/bases/octavia.openstack.org_octavias.yaml b/api/bases/octavia.openstack.org_octavias.yaml
@@ -44,6 +44,30 @@ spec:
           spec:
             description: OctaviaSpec defines the desired state of Octavia
             properties:
+              amphoraCustomFlavors:
+                description: AmphoraCustomFlavors - User-defined flavors for Octavia
+                items:
+                  description: OctaviaAmphoraFlavor Settings for custom Amphora flavors
+                  properties:
+                    RAM:
+                      type: integer
+                    RxTxFactor:
+                      type: string
+                    VCPUs:
+                      type: integer
+                    description:
+                      type: string
+                    disk:
+                      type: integer
+                    name:
+                      type: string
+                  required:
+                  - RAM
+                  - VCPUs
+                  - disk
+                  - name
+                  type: object
+                type: array
               certsSecret:
                 default: octavia-certs-secret
                 description: LoadBalancerCerts - Secret containing certs for securing
@@ -434,6 +458,31 @@ spec:
                 description: OctaviaHousekeeping - Spec definition for the Octavia
                   Housekeeping agent for the Octavia deployment
                 properties:
+                  amphoraCustomFlavors:
+                    description: AmphoraCustomFlavors - User-defined flavors for Octavia
+                    items:
+                      description: OctaviaAmphoraFlavor Settings for custom Amphora
+                        flavors
+                      properties:
+                        RAM:
+                          type: integer
+                        RxTxFactor:
+                          type: string
+                        VCPUs:
+                          type: integer
+                        description:
+                          type: string
+                        disk:
+                          type: integer
+                        name:
+                          type: string
+                      required:
+                      - RAM
+                      - VCPUs
+                      - disk
+                      - name
+                      type: object
+                    type: array
                   certsPassphraseSecret:
                     default: octavia-ca-passphrase
                     description: Name of secret containing passphrase for the CA private
@@ -619,6 +668,31 @@ spec:
                 description: OctaviaHousekeeping - Spec definition for the Octavia
                   Housekeeping agent for the Octavia deployment
                 properties:
+                  amphoraCustomFlavors:
+                    description: AmphoraCustomFlavors - User-defined flavors for Octavia
+                    items:
+                      description: OctaviaAmphoraFlavor Settings for custom Amphora
+                        flavors
+                      properties:
+                        RAM:
+                          type: integer
+                        RxTxFactor:
+                          type: string
+                        VCPUs:
+                          type: integer
+                        description:
+                          type: string
+                        disk:
+                          type: integer
+                        name:
+                          type: string
+                      required:
+                      - RAM
+                      - VCPUs
+                      - disk
+                      - name
+                      type: object
+                    type: array
                   certsPassphraseSecret:
                     default: octavia-ca-passphrase
                     description: Name of secret containing passphrase for the CA private
@@ -804,6 +878,31 @@ spec:
                 description: OctaviaHousekeeping - Spec definition for the Octavia
                   Housekeeping agent for the Octavia deployment
                 properties:
+                  amphoraCustomFlavors:
+                    description: AmphoraCustomFlavors - User-defined flavors for Octavia
+                    items:
+                      description: OctaviaAmphoraFlavor Settings for custom Amphora
+                        flavors
+                      properties:
+                        RAM:
+                          type: integer
+                        RxTxFactor:
+                          type: string
+                        VCPUs:
+                          type: integer
+                        description:
+                          type: string
+                        disk:
+                          type: integer
+                        name:
+                          type: string
+                      required:
+                      - RAM
+                      - VCPUs
+                      - disk
+                      - name
+                      type: object
+                    type: array
                   certsPassphraseSecret:
                     default: octavia-ca-passphrase
                     description: Name of secret containing passphrase for the CA private

diff --git a/api/v1beta1/amphoracontroller_types.go b/api/v1beta1/amphoracontroller_types.go
@@ -134,6 +134,11 @@ type OctaviaAmphoraControllerSpec struct {
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default={manageLbMgmtNetworks: true, subnetIpVersion: 4}
 	LbMgmtNetworks OctaviaLbMgmtNetworks `json:"lbMgmtNetwork"`
+
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default={}
+	// AmphoraCustomFlavors - User-defined flavors for Octavia
+	AmphoraCustomFlavors []OctaviaAmphoraFlavor `json:"amphoraCustomFlavors,omitempty"`
 }
 
 // OctaviaAmphoraControllerStatus defines the observed state of the Octavia Amphora Controller

diff --git a/api/v1beta1/octavia_types.go b/api/v1beta1/octavia_types.go
@@ -133,6 +133,11 @@ type OctaviaSpec struct {
 	// LoadBalancerSSHPrivKey - The name of the secret that will be used to
 	// store the private key for connecting to amphorae via SSH
 	LoadBalancerSSHPrivKey string `json:"sshPrivkeySecret,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default={}
+	// AmphoraCustomFlavors - User-defined flavors for Octavia
+	AmphoraCustomFlavors []OctaviaAmphoraFlavor `json:"amphoraCustomFlavors,omitempty"`
 }
 
 // PasswordSelector to identify the DB and AdminUser password from the Secret
@@ -160,6 +165,27 @@ type OctaviaLbMgmtNetworks struct {
 	SubnetIPVersion int `json:"subnetIpVersion,omitempty"`
 }
 
+// OctaviaAmphoraFlavor Settings for custom Amphora flavors
+type OctaviaAmphoraFlavor struct {
+	// +kubebuilder:validation:Required
+	Name string `json:"name"`
+
+	// +kubebuilder:validation:Optional
+	Description string `json:"description"`
+
+	// +kubebuilder:validation:Required
+	VCPUs int `json:"VCPUs"`
+
+	// +kubebuilder:validation:Required
+	RAM int `json:"RAM"`
+
+	// +kubebuilder:validation:Required
+	Disk int `json:"disk"`
+
+	// +kubebuilder:validation:Optional
+	RxTxFactor string `json:"RxTxFactor"`
+}
+
 // OctaviaStatus defines the observed state of Octavia
 type OctaviaStatus struct {
 

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/octavia.openstack.org_octaviaamphoracontrollers.yaml b/config/crd/bases/octavia.openstack.org_octaviaamphoracontrollers.yaml
@@ -50,6 +50,30 @@ spec:
             description: OctaviaAmphoraControllerSpec defines common state for all
               Octavia Amphora Controllers
             properties:
+              amphoraCustomFlavors:
+                description: AmphoraCustomFlavors - User-defined flavors for Octavia
+                items:
+                  description: OctaviaAmphoraFlavor Settings for custom Amphora flavors
+                  properties:
+                    RAM:
+                      type: integer
+                    RxTxFactor:
+                      type: string
+                    VCPUs:
+                      type: integer
+                    description:
+                      type: string
+                    disk:
+                      type: integer
+                    name:
+                      type: string
+                  required:
+                  - RAM
+                  - VCPUs
+                  - disk
+                  - name
+                  type: object
+                type: array
               certsPassphraseSecret:
                 default: octavia-ca-passphrase
                 description: Name of secret containing passphrase for the CA private