Merge pull request #285 from gthiemonge/fix-serviceaccount

Remove serviceAccount from Octavia
openstack-k8s-operators · Mar 28, 2024 · 676e711 · 676e711
2 parents 105adb5 + a58ce50
commit 676e711
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/api/bases/octavia.openstack.org_octavias.yaml b/api/bases/octavia.openstack.org_octavias.yaml
@@ -1164,10 +1164,6 @@ spec:
                 description: Secret containing OpenStack password information for
                   octavia's keystone password; no longer used for database password
                 type: string
-              serviceAccount:
-                description: ServiceAccount - service account name used internally
-                  to provide Octavia services the default SA name
-                type: string
               serviceUser:
                 default: octavia
                 description: ServiceUser - service user name
@@ -1186,15 +1182,14 @@ spec:
               tenantName:
                 default: service
                 description: TenantName - the name of the OpenStack tenant that controls
-                  the Octavia resources TODO(gthiemonge) same as ServiceAccount?
+                  the Octavia resources
                 type: string
             required:
             - apacheContainerImage
             - databaseInstance
             - octaviaAPI
             - rabbitMqClusterName
             - secret
-            - serviceAccount
             type: object
           status:
             description: OctaviaStatus defines the observed state of Octavia

diff --git a/api/v1beta1/octavia_types.go b/api/v1beta1/octavia_types.go
@@ -158,7 +158,6 @@ type OctaviaSpecBase struct {
 	// +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
@@ -182,10 +181,6 @@ type OctaviaSpecBase struct {
 	// AmphoraCustomFlavors - User-defined flavors for Octavia
 	AmphoraCustomFlavors []OctaviaAmphoraFlavor `json:"amphoraCustomFlavors,omitempty"`
 
-	// +kubebuilder:validation:Required
-	// ServiceAccount - service account name used internally to provide Octavia services the default SA name
-	ServiceAccount string `json:"serviceAccount"`
-
 	// +kubebuilder:validation:Optional
 	// Resources - Compute Resources required by this service (Limits/Requests).
 	// https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/

diff --git a/config/crd/bases/octavia.openstack.org_octavias.yaml b/config/crd/bases/octavia.openstack.org_octavias.yaml
@@ -1164,10 +1164,6 @@ spec:
                 description: Secret containing OpenStack password information for
                   octavia's keystone password; no longer used for database password
                 type: string
-              serviceAccount:
-                description: ServiceAccount - service account name used internally
-                  to provide Octavia services the default SA name
-                type: string
               serviceUser:
                 default: octavia
                 description: ServiceUser - service user name
@@ -1186,15 +1182,14 @@ spec:
               tenantName:
                 default: service
                 description: TenantName - the name of the OpenStack tenant that controls
-                  the Octavia resources TODO(gthiemonge) same as ServiceAccount?
+                  the Octavia resources
                 type: string
             required:
             - apacheContainerImage
             - databaseInstance
             - octaviaAPI
             - rabbitMqClusterName
             - secret
-            - serviceAccount
             type: object
           status:
             description: OctaviaStatus defines the observed state of Octavia