Update services routes

openstack-k8s-operators/openstack-operator#457 Signed-off-by: Fabricio Aguiar <[email protected]>
openstack-k8s-operators · Oct 2, 2023 · f480c3f · f480c3f
1 parent adf1b3f
commit f480c3f
Show file tree

Hide file tree

Showing 16 changed files with 232 additions and 119 deletions.
diff --git a/docs/openstack/backend_services_deployment.md b/docs/openstack/backend_services_deployment.md
@@ -125,12 +125,16 @@ podified OpenStack control plane services.
         cinderVolumes: {}
 
     dns:
-      enabled: true
       template:
-        externalEndpoints:
-        - ipAddressPool: ctlplane
-          loadBalancerIPs:
-          - 192.168.122.80
+        override:
+          service:
+            metadata:
+              annotations:
+                metallb.universe.tf/address-pool: ctlplane
+                metallb.universe.tf/allow-shared-ip: ctlplane
+                metallb.universe.tf/loadBalancerIPs: 192.168.122.80
+            spec:
+              type: LoadBalancer
         options:
         - key: server
           values:
@@ -200,19 +204,23 @@ podified OpenStack control plane services.
     rabbitmq:
       templates:
         rabbitmq:
-          externalEndpoint:
-            loadBalancerIPs:
-            - 172.17.0.85
-            ipAddressPool: internalapi
-            sharedIP: false
-          replicas: 1
+          override:
+            service:
+              metadata:
+                annotations:
+                  metallb.universe.tf/address-pool: internalapi
+                  metallb.universe.tf/loadBalancerIPs: 172.17.0.85
+              spec:
+                type: LoadBalancer
         rabbitmq-cell1:
-          externalEndpoint:
-            loadBalancerIPs:
-            - 172.17.0.86
-            ipAddressPool: internalapi
-            sharedIP: false
-          replicas: 1
+          override:
+            service:
+              metadata:
+                annotations:
+                  metallb.universe.tf/address-pool: internalapi
+                  metallb.universe.tf/loadBalancerIPs: 172.17.0.86
+              spec:
+                type: LoadBalancer
 
     telemetry:
       enabled: false

diff --git a/docs/openstack/cinder_adoption.md b/docs/openstack/cinder_adoption.md
@@ -704,16 +704,23 @@ spec:
               name: ceph-conf-files
   cinder:
     enabled: true
+    apiOverride:
+      route: {}
     template:
       databaseInstance: openstack
       secret: osp-secret
       cinderAPI:
+        override:
+          service:
+            internal:
+              metadata:
+                annotations:
+                  metallb.universe.tf/address-pool: internalapi
+                  metallb.universe.tf/allow-shared-ip: internalapi
+                  metallb.universe.tf/loadBalancerIPs: 172.17.0.80
+              spec:
+                type: LoadBalancer
         replicas: 1
-        externalEndpoints:
-        - endpoint: internal
-          ipAddressPool: internalapi
-          loadBalancerIPs:
-          - 172.17.0.80
         customServiceConfig: |
           [DEFAULT]
           default_volume_type=tripleo

diff --git a/docs/openstack/glance_adoption.md b/docs/openstack/glance_adoption.md
@@ -36,16 +36,22 @@ oc patch openstackcontrolplane openstack --type=merge --patch '
 spec:
   glance:
     enabled: true
+    apiOverride:
+      route: {}
     template:
       databaseInstance: openstack
       storageClass: "local-storage"
       storageRequest: 10G
       glanceAPIInternal:
-        externalEndpoints:
-        - endpoint: internal
-          ipAddressPool: internalapi
-          loadBalancerIPs:
-          - 172.17.0.80
+        override:
+          service:
+            metadata:
+              annotations:
+                metallb.universe.tf/address-pool: internalapi
+                metallb.universe.tf/allow-shared-ip: internalapi
+                metallb.universe.tf/loadBalancerIPs: 172.17.0.80
+            spec:
+              type: LoadBalancer
         networkAttachments:
         - storage
       glanceAPIExternal:
@@ -88,11 +94,15 @@ spec:
       storageClass: "local-storage"
       storageRequest: 10G
       glanceAPIInternal:
-        externalEndpoints:
-        - endpoint: internal
-          ipAddressPool: internalapi
-          loadBalancerIPs:
-          - 172.17.0.80
+        override:
+          service:
+            metadata:
+              annotations:
+                metallb.universe.tf/address-pool: internalapi
+                metallb.universe.tf/allow-shared-ip: internalapi
+                metallb.universe.tf/loadBalancerIPs: 172.17.0.80
+            spec:
+              type: LoadBalancer
         networkAttachments:
         - storage
       glanceAPIExternal:

diff --git a/docs/openstack/helpers/cinder-cfg.py b/docs/openstack/helpers/cinder-cfg.py
@@ -24,16 +24,23 @@
 spec:
   cinder:
     enabled: true
+    apiOverride:
+      route: {}
     template:
       databaseInstance: openstack
       secret: osp-secret
       cinderAPI:
         replicas: 3
-        externalEndpoints:
-        - endpoint: internal
-          ipAddressPool: internalapi
-          loadBalancerIPs:
-          - 172.17.0.80
+        override:
+          service:
+            internal:
+              metadata:
+                annotations:
+                  metallb.universe.tf/address-pool: internalapi
+                  metallb.universe.tf/allow-shared-ip: internalapi
+                  metallb.universe.tf/loadBalancerIPs: 172.17.0.80
+              spec:
+                type: LoadBalancer
       cinderScheduler:
         replicas: 1
       cinderBackup:

diff --git a/docs/openstack/horizon_adoption.md b/docs/openstack/horizon_adoption.md
@@ -2,7 +2,7 @@
 
 ## Prerequisites
 
-* Previous Adoption steps completed. Notably, Memcached and 
+* Previous Adoption steps completed. Notably, Memcached and
   keystone should be already adopted.
 
 ## Variables
@@ -18,6 +18,8 @@
   spec:
     horizon:
       enabled: true
+      apiOverride:
+        route: {}
       template:
         memcachedInstance: memcached
         secret: osp-secret
@@ -37,4 +39,4 @@ oc get horizon
 ```
 PUBLIC_URL=$(oc get horizon horizon -o jsonpath='{.status.endpoint}')
 curl --silent --output /dev/stderr --head --write-out "%{http_code}" "$PUBLIC_URL/dashboard/auth/login/?next=/dashboard/" | grep 200
-```
+```
diff --git a/docs/openstack/keystone_adoption.md b/docs/openstack/keystone_adoption.md
@@ -18,14 +18,21 @@
   spec:
     keystone:
       enabled: true
+      apiOverride:
+        route: {}
       template:
+        override:
+          service:
+            internal:
+              metadata:
+                annotations:
+                  metallb.universe.tf/address-pool: internalapi
+                  metallb.universe.tf/allow-shared-ip: internalapi
+                  metallb.universe.tf/loadBalancerIPs: 172.17.0.80
+              spec:
+                type: LoadBalancer
         databaseInstance: openstack
         secret: osp-secret
-        externalEndpoints:
-        - endpoint: internal
-          ipAddressPool: internalapi
-          loadBalancerIPs:
-          - 172.17.0.80
   '
   ```
 

diff --git a/docs/openstack/neutron_adoption.md b/docs/openstack/neutron_adoption.md
@@ -30,14 +30,21 @@ oc patch openstackcontrolplane openstack --type=merge --patch '
 spec:
   neutron:
     enabled: true
+    apiOverride:
+      route: {}
     template:
+      override:
+        service:
+          internal:
+            metadata:
+              annotations:
+                metallb.universe.tf/address-pool: internalapi
+                metallb.universe.tf/allow-shared-ip: internalapi
+                metallb.universe.tf/loadBalancerIPs: 172.17.0.80
+            spec:
+              type: LoadBalancer
       databaseInstance: openstack
       secret: osp-secret
-      externalEndpoints:
-      - endpoint: internal
-        ipAddressPool: internalapi
-        loadBalancerIPs:
-        - 172.17.0.80
       networkAttachments:
       - internalapi
 '

diff --git a/docs/openstack/placement_adoption.md b/docs/openstack/placement_adoption.md
@@ -18,14 +18,21 @@
   spec:
     placement:
       enabled: true
+      apiOverride:
+        route: {}
       template:
         databaseInstance: openstack
         secret: osp-secret
-        externalEndpoints:
-        - endpoint: internal
-          ipAddressPool: internalapi
-          loadBalancerIPs:
-          - 172.17.0.80
+        override:
+          service:
+            internal:
+              metadata:
+                annotations:
+                  metallb.universe.tf/address-pool: internalapi
+                  metallb.universe.tf/allow-shared-ip: internalapi
+                  metallb.universe.tf/loadBalancerIPs: 172.17.0.80
+              spec:
+                type: LoadBalancer
   '
   ```
 

diff --git a/tests/config/base/openstack_control_plane.yaml b/tests/config/base/openstack_control_plane.yaml
@@ -15,12 +15,16 @@ spec:
       cinderVolumes: {}
 
   dns:
-    enabled: true
     template:
-      externalEndpoints:
-      - ipAddressPool: ctlplane
-        loadBalancerIPs:
-        - 192.168.122.80
+      override:
+        service:
+          metadata:
+            annotations:
+              metallb.universe.tf/address-pool: ctlplane
+              metallb.universe.tf/allow-shared-ip: ctlplane
+              metallb.universe.tf/loadBalancerIPs: 192.168.122.80
+          spec:
+            type: LoadBalancer
       options:
       - key: server
         values:
@@ -101,19 +105,23 @@ spec:
   rabbitmq:
     templates:
       rabbitmq:
-        externalEndpoint:
-          loadBalancerIPs:
-          - 172.17.0.85
-          ipAddressPool: internalapi
-          sharedIP: false
-        replicas: 1
+        override:
+          service:
+            metadata:
+              annotations:
+                metallb.universe.tf/address-pool: internalapi
+                metallb.universe.tf/loadBalancerIPs: 172.17.0.85
+            spec:
+              type: LoadBalancer
       rabbitmq-cell1:
-        externalEndpoint:
-          loadBalancerIPs:
-          - 172.17.0.86
-          ipAddressPool: internalapi
-          sharedIP: false
-        replicas: 1
+        override:
+          service:
+            metadata:
+              annotations:
+                metallb.universe.tf/address-pool: internalapi
+                metallb.universe.tf/loadBalancerIPs: 172.17.0.86
+            spec:
+              type: LoadBalancer
 
   telemetry:
     enabled: false

diff --git a/tests/config/periodic_ci/container_image_overrides.yaml b/tests/config/periodic_ci/container_image_overrides.yaml
@@ -14,10 +14,15 @@ spec:
 
   dns:
     template:
-      externalEndpoints:
-      - ipAddressPool: ctlplane
-        loadBalancerIPs:
-        - 192.168.122.80
+      override:
+        service:
+          metadata:
+            annotations:
+              metallb.universe.tf/address-pool: ctlplane
+              metallb.universe.tf/allow-shared-ip: ctlplane
+              metallb.universe.tf/loadBalancerIPs: 192.168.122.80
+          spec:
+            type: LoadBalancer
       options:
       - key: server
         values:
@@ -89,19 +94,23 @@ spec:
   rabbitmq:
     templates:
       rabbitmq:
-        externalEndpoint:
-          loadBalancerIPs:
-          - 172.17.0.85
-          ipAddressPool: internalapi
-          sharedIP: false
-        replicas: 1
+        override:
+          service:
+            metadata:
+              annotations:
+                metallb.universe.tf/address-pool: internalapi
+                metallb.universe.tf/loadBalancerIPs: 172.17.0.85
+            spec:
+              type: LoadBalancer
       rabbitmq-cell1:
-        externalEndpoint:
-          loadBalancerIPs:
-          - 172.17.0.86
-          ipAddressPool: internalapi
-          sharedIP: false
-        replicas: 1
+        override:
+          service:
+            metadata:
+              annotations:
+                metallb.universe.tf/address-pool: internalapi
+                metallb.universe.tf/loadBalancerIPs: 172.17.0.86
+            spec:
+              type: LoadBalancer
 
   telemetry:
     enabled: false