Remove initcontainer and add more logs

openstack-k8s-operators · Jan 26, 2024 · 34032ef · 34032ef
1 parent aa65e13
commit 34032ef
Show file tree

Hide file tree

Showing 13 changed files with 559 additions and 785 deletions.
diff --git a/controllers/placementapi_controller.go b/controllers/placementapi_controller.go
diff --git a/pkg/placement/const.go b/pkg/placement/const.go
@@ -21,6 +21,9 @@ const (
 	// DatabaseName -
 	DatabaseName = "placement"
 
+	//config secret name
+	ConfigSecretName = "placement-config-data"
+
 	// PlacementPublicPort -
 	PlacementPublicPort int32 = 8778
 	// PlacementInternalPort -

diff --git a/pkg/placement/dbsync.go b/pkg/placement/dbsync.go
@@ -78,19 +78,7 @@ func DbSyncJob(
 		},
 	}
 
-	job.Spec.Template.Spec.Volumes = getVolumes(ServiceName)
-
-	initContainerDetails := APIDetails{
-		ContainerImage:       instance.Spec.ContainerImage,
-		DatabaseHost:         instance.Status.DatabaseHostname,
-		DatabaseUser:         instance.Spec.DatabaseUser,
-		DatabaseName:         DatabaseName,
-		OSPSecret:            instance.Spec.Secret,
-		DBPasswordSelector:   instance.Spec.PasswordSelectors.Database,
-		UserPasswordSelector: instance.Spec.PasswordSelectors.Service,
-		VolumeMounts:         getInitVolumeMounts(),
-	}
-	job.Spec.Template.Spec.InitContainers = initContainer(initContainerDetails)
+	job.Spec.Template.Spec.Volumes = getVolumes(instance.Name)
 
 	return job
 }
diff --git a/pkg/placement/deployment.go b/pkg/placement/deployment.go
@@ -158,17 +158,5 @@ func Deployment(
 		deployment.Spec.Template.Spec.NodeSelector = instance.Spec.NodeSelector
 	}
 
-	initContainerDetails := APIDetails{
-		ContainerImage:       instance.Spec.ContainerImage,
-		DatabaseHost:         instance.Status.DatabaseHostname,
-		DatabaseUser:         instance.Spec.DatabaseUser,
-		DatabaseName:         DatabaseName,
-		OSPSecret:            instance.Spec.Secret,
-		DBPasswordSelector:   instance.Spec.PasswordSelectors.Database,
-		UserPasswordSelector: instance.Spec.PasswordSelectors.Service,
-		VolumeMounts:         getInitVolumeMounts(),
-	}
-	deployment.Spec.Template.Spec.InitContainers = initContainer(initContainerDetails)
-
 	return deployment
 }
diff --git a/pkg/placement/initcontainer.go b/pkg/placement/initcontainer.go
diff --git a/pkg/placement/volumes.go b/pkg/placement/volumes.go
@@ -22,7 +22,7 @@ import (
 // getVolumes - service volumes
 func getVolumes(name string) []corev1.Volume {
 	var scriptsVolumeDefaultMode int32 = 0755
-	var config0640AccessMode int32 = 0640
+	var configMode int32 = 0640
 
 	return []corev1.Volume{
 		{
@@ -39,20 +39,12 @@ func getVolumes(name string) []corev1.Volume {
 		{
 			Name: "config-data",
 			VolumeSource: corev1.VolumeSource{
-				ConfigMap: &corev1.ConfigMapVolumeSource{
-					DefaultMode: &config0640AccessMode,
-					LocalObjectReference: corev1.LocalObjectReference{
-						Name: name + "-config-data",
-					},
+				Secret: &corev1.SecretVolumeSource{
+					DefaultMode: &configMode,
+					SecretName:  name + "-config-data",
 				},
 			},
 		},
-		{
-			Name: "config-data-merged",
-			VolumeSource: corev1.VolumeSource{
-				EmptyDir: &corev1.EmptyDirVolumeSource{Medium: ""},
-			},
-		},
 		{
 			Name: "logs",
 			VolumeSource: corev1.VolumeSource{
@@ -63,55 +55,29 @@ func getVolumes(name string) []corev1.Volume {
 
 }
 
-// getInitVolumeMounts - general init task VolumeMounts
-func getInitVolumeMounts() []corev1.VolumeMount {
+// getVolumeMounts - general VolumeMounts
+func getVolumeMounts(serviceName string) []corev1.VolumeMount {
 	return []corev1.VolumeMount{
 		{
 			Name:      "scripts",
 			MountPath: "/usr/local/bin/container-scripts",
 			ReadOnly:  true,
 		},
-		{
-			Name:      "config-data",
-			MountPath: "/var/lib/config-data/default",
-			ReadOnly:  true,
-		},
-		{
-			Name:      "config-data-merged",
-			MountPath: "/var/lib/config-data/merged",
-			ReadOnly:  false,
-		},
 		{
 			Name:      "logs",
 			MountPath: "/var/log/placement",
 			ReadOnly:  false,
 		},
-	}
-}
-
-// getVolumeMounts - general VolumeMounts
-func getVolumeMounts(serviceName string) []corev1.VolumeMount {
-	return []corev1.VolumeMount{
 		{
-			Name:      "scripts",
-			MountPath: "/usr/local/bin/container-scripts",
-			ReadOnly:  true,
-		},
-		{
-			Name:      "config-data-merged",
-			MountPath: "/var/lib/config-data/merged",
+			Name:      "config-data",
+			MountPath: "/var/lib/config-data/",
 			ReadOnly:  false,
 		},
 		{
-			Name:      "config-data-merged",
+			Name:      "config-data",
 			MountPath: "/var/lib/kolla/config_files/config.json",
 			SubPath:   "placement-" + serviceName + "-config.json",
 			ReadOnly:  true,
 		},
-		{
-			Name:      "logs",
-			MountPath: "/var/log/placement",
-			ReadOnly:  false,
-		},
 	}
 }
diff --git a/templates/common/common.sh b/templates/common/common.sh
diff --git a/templates/placementapi/bin/init.sh b/templates/placementapi/bin/init.sh
diff --git a/templates/placementapi/config/placement-api-config.json b/templates/placementapi/config/placement-api-config.json
@@ -2,23 +2,23 @@
     "command": "/usr/sbin/httpd -DFOREGROUND",
     "config_files": [
         {
-            "source": "/var/lib/config-data/merged/placement.conf",
+            "source": "/var/lib/config-data/placement.conf",
             "dest": "/etc/placement/placement.conf",
             "owner": "placement",
             "perm": "0600"
         },
         {
-            "source": "/var/lib/config-data/merged/custom.conf",
+            "source": "/var/lib/config-data/httpd.conf",
+            "dest": "/etc/httpd/conf/httpd.conf",
+            "owner": "apache",
+            "perm": "0644"
+        },
+        {
+            "source": "/var/lib/config-data/custom.conf",
             "dest": "/etc/placement/placement.conf.d/custom.conf",
             "owner": "placement",
             "perm": "0600"
         },
-        {
-            "source": "/var/lib/config-data/merged/httpd.conf",
-            "dest": "/etc/httpd/conf/httpd.conf",
-            "owner": "apache",
-            "perm": "0644"
-        }
     ],
     "permissions": [
         {

diff --git a/templates/placementapi/config/placement-dbsync-config.json b/templates/placementapi/config/placement-dbsync-config.json
@@ -2,13 +2,13 @@
     "command": "placement-manage db sync",
     "config_files": [
         {
-            "source": "/var/lib/config-data/merged/placement.conf",
+            "source": "/var/lib/config-data/placement.conf",
             "dest": "/etc/placement/placement.conf",
             "owner": "placement",
             "perm": "0600"
         },
         {
-            "source": "/var/lib/config-data/merged/custom.conf",
+            "source": "/var/lib/config-data/custom.conf",
             "dest": "/etc/placement/placement.conf.d/custom.conf",
             "owner": "placement",
             "perm": "0600"

diff --git a/templates/placementapi/config/placement.conf b/templates/placementapi/config/placement.conf
@@ -8,6 +8,9 @@ log_file = {{ .log_file }}
 {{end}}
 debug = true
 
+[placement_database]
+connection = mysql+pymysql://{{ .DBUser }}:{{ .DBPassword}}@{{ .DBAddress }}/{{ .DBName }}
+
 [api]
 auth_strategy = keystone
 
@@ -16,9 +19,8 @@ project_domain_name = Default
 user_domain_name = Default
 project_name = service
 username = {{ .ServiceUser }}
+password = {{ .PlacementPassword }}
 www_authenticate_uri = {{ .KeystonePublicURL }}
 auth_url = {{ .KeystoneInternalURL }}
 auth_type = password
 interface = internal
-
-[placement_database]