wip

openstack-k8s-operators · Mar 5, 2024 · 3a6fa0c · 3a6fa0c
1 parent 66c7fba
commit 3a6fa0c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -157,12 +157,6 @@ rules:
   - mariadbaccounts/finalizers
   verbs:
   - update
-- apiGroups:
-  - mariadb.openstack.org
-  resources:
-  - mariadbaccounts/finalizers
-  verbs:
-  - update
 - apiGroups:
   - mariadb.openstack.org
   resources:

diff --git a/pkg/octavia/initcontainer.go b/pkg/octavia/initcontainer.go
@@ -50,7 +50,7 @@ func InitContainer(init APIDetails) []corev1.Container {
 
 	envVars := map[string]env.Setter{}
 	envVars["DatabaseHost"] = env.SetValue(init.DatabaseHost)
-	envVars["DatabaseUser"] = env.SetValue(init.DatabaseAccount)
+	envVars["DatabaseAccount"] = env.SetValue(init.DatabaseAccount)
 	envVars["DatabaseName"] = env.SetValue(init.DatabaseName)
 
 	envs := []corev1.EnvVar{

diff --git a/templates/octavia/bin/init.sh b/templates/octavia/bin/init.sh
@@ -21,7 +21,7 @@ set -ex
 # Secrets are obtained from ENV variables.
 export PASSWORD=${AdminPassword:?"Please specify a AdminPassword variable."}
 export DBHOST=${DatabaseHost:?"Please specify a DatabaseHost variable."}
-export DBUSER=${DatabaseUser:?"Please specify a DatabaseUser variable."}
+export DBUSER=${DatabaseAccount:?"Please specify a DatabaseAccount variable."}
 export DBPASSWORD=${DatabasePassword:?"Please specify a DatabasePassword variable."}
 export DB=${DatabaseName:-"octavia"}
 export TRANSPORTURL=${TransportURL:-""}

diff --git a/templates/octaviaamphoracontroller/bin/init.sh b/templates/octaviaamphoracontroller/bin/init.sh
@@ -21,7 +21,7 @@ set -ex
 # Secrets are obtained from ENV variables.
 export PASSWORD=${AdminPassword:?"Please specify a AdminPassword variable."}
 export DBHOST=${DatabaseHost:?"Please specify a DatabaseHost variable."}
-export DBUSER=${DatabaseUser:?"Please specify a DatabaseUser variable."}
+export DBUSER=${DatabaseAccount:?"Please specify a DatabaseAccount variable."}
 export DBPASSWORD=${DatabasePassword:?"Please specify a DatabasePassword variable."}
 export DB=${DatabaseName:-"octavia"}
 export TRANSPORTURL=${TransportURL:-""}