From 3a6fa0c9a2cb06e34162fd396e6faaf88116ea7e Mon Sep 17 00:00:00 2001 From: Tom Weininger Date: Tue, 5 Mar 2024 12:05:25 -0500 Subject: [PATCH] wip --- config/rbac/role.yaml | 6 ------ pkg/octavia/initcontainer.go | 2 +- templates/octavia/bin/init.sh | 2 +- templates/octaviaamphoracontroller/bin/init.sh | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 24cfe746..a2d2a851 100644 --- 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 index 17ea7f11..a8a632ed 100644 --- 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 index 1b780314..d70b21c3 100755 --- 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 index 37cd6ac4..f380cfbc 100755 --- 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:-""}