Merge pull request #359 from gthiemonge/fix-mycnf-mount

Avoid unneeded reconciles
openstack-k8s-operators · Aug 5, 2024 · ff203bf · ff203bf
2 parents 3235000 + 24d5658
commit ff203bf
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 10 deletions.
diff --git a/controllers/amphoracontroller_controller.go b/controllers/amphoracontroller_controller.go
@@ -19,6 +19,7 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"sort"
 	"strings"
 	"time"
 
@@ -596,6 +597,8 @@ func (r *OctaviaAmphoraControllerReconciler) generateServiceConfigMaps(
 			rsyslogIPAddresses = append(rsyslogIPAddresses, fmt.Sprintf("%s:514", val))
 		}
 	}
+	sort.Strings(ipAddresses)
+	sort.Strings(rsyslogIPAddresses)
 	ipAddressString := strings.Join(ipAddresses, ",")
 	templateParameters["ControllerIPList"] = ipAddressString
 	templateParameters["AdminLogTargetList"] = strings.Join(rsyslogIPAddresses, ",")

diff --git a/pkg/octavia/volumes.go b/pkg/octavia/volumes.go
@@ -92,11 +92,5 @@ func GetVolumeMounts(serviceName string) []corev1.VolumeMount {
 			SubPath:   serviceName + "-config.json",
 			ReadOnly:  true,
 		},
-		{
-			Name:      "config-data",
-			MountPath: "/etc/my.cnf",
-			SubPath:   "my.cnf",
-			ReadOnly:  true,
-		},
 	}
 }
diff --git a/templates/octavia/config/db-sync-config.json b/templates/octavia/config/db-sync-config.json
@@ -6,6 +6,12 @@
             "dest": "/etc/octavia/octavia.conf",
             "owner": "octavia",
             "perm": "0600"
+        },
+        {
+            "source": "/var/lib/config-data/merged/my.cnf",
+            "dest": "/etc/my.cnf",
+            "owner": "octavia",
+            "perm": "0644"
         }
     ],
     "permissions": [

diff --git a/templates/octaviaamphoracontroller/config/octavia-healthmanager-config.json b/templates/octaviaamphoracontroller/config/octavia-healthmanager-config.json
@@ -12,6 +12,12 @@
             "dest": "/etc/octavia/octavia.conf.d/custom.conf",
             "owner": "octavia",
             "perm": "0600"
+        },
+        {
+            "source": "/var/lib/config-data/merged/my.cnf",
+            "dest": "/etc/my.cnf",
+            "owner": "octavia",
+            "perm": "0644"
         }
     ]
 }
diff --git a/templates/octaviaamphoracontroller/config/octavia-housekeeping-config.json b/templates/octaviaamphoracontroller/config/octavia-housekeeping-config.json
@@ -12,6 +12,12 @@
             "dest": "/etc/octavia/octavia.conf.d/custom.conf",
             "owner": "octavia",
             "perm": "0600"
+        },
+        {
+            "source": "/var/lib/config-data/merged/my.cnf",
+            "dest": "/etc/my.cnf",
+            "owner": "octavia",
+            "perm": "0644"
         }
     ]
 }
diff --git a/templates/octaviaamphoracontroller/config/octavia-worker-config.json b/templates/octaviaamphoracontroller/config/octavia-worker-config.json
@@ -12,6 +12,12 @@
             "dest": "/etc/octavia/octavia.conf.d/custom.conf",
             "owner": "octavia",
             "perm": "0600"
+        },
+        {
+            "source": "/var/lib/config-data/merged/my.cnf",
+            "dest": "/etc/my.cnf",
+            "owner": "octavia",
+            "perm": "0644"
         }
     ]
 }
diff --git a/templates/octaviaapi/config/octavia-api-config.json b/templates/octaviaapi/config/octavia-api-config.json
@@ -47,6 +47,12 @@
             "owner": "octavia",
             "perm": "0600",
             "optional": true
+          },
+          {
+            "source": "/var/lib/config-data/merged/my.cnf",
+            "dest": "/etc/my.cnf",
+            "owner": "octavia",
+            "perm": "0644"
           }
     ],
     "permissions": [

diff --git a/templates/octaviaapi/config/octavia-driver-agent-config.json b/templates/octaviaapi/config/octavia-driver-agent-config.json
@@ -28,6 +28,12 @@
             "perm": "0400",
             "optional": true,
             "merge": true
+        },
+        {
+            "source": "/var/lib/config-data/merged/my.cnf",
+            "dest": "/etc/my.cnf",
+            "owner": "octavia",
+            "perm": "0644"
         }
     ],
     "permissions": [

diff --git a/tests/kuttl/tests/octavia_tls/02-assert.yaml b/tests/kuttl/tests/octavia_tls/02-assert.yaml
@@ -135,8 +135,6 @@ spec:
           name: config-data-merged
           readOnly: true
           subPath: octavia-api-config.json
-        - mountPath: /etc/my.cnf
-          name: config-data
         - mountPath: /run/octavia
           name: octavia-run
         - mountPath: /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
@@ -194,8 +192,6 @@ spec:
           name: config-data-merged
           readOnly: true
           subPath: octavia-driver-agent-config.json
-        - mountPath: /etc/my.cnf
-          name: config-data
         - mountPath: /run/octavia
           name: octavia-run
         - mountPath: /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem