Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stop using KOLLA_CONFIG_FILE environment #53

Merged
merged 1 commit into from
Aug 15, 2023
Merged

Stop using KOLLA_CONFIG_FILE environment #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions pkg/placement/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,4 @@ const (
PlacementPublicPort int32 = 8778
// PlacementInternalPort -
PlacementInternalPort int32 = 8778

// KollaConfig -
KollaConfig = "/var/lib/config-data/merged/placement-api-config.json"
)
1 change: 0 additions & 1 deletion pkg/placement/dbsync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ func DbSyncJob(
}

envVars := map[string]env.Setter{}
envVars["KOLLA_CONFIG_FILE"] = env.SetValue(KollaConfig)
SeanMooney marked this conversation as resolved.
Show resolved Hide resolved
envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS")
envVars["KOLLA_BOOTSTRAP"] = env.SetValue("true")

Expand Down
1 change: 0 additions & 1 deletion pkg/placement/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ func Deployment(
}

envVars := map[string]env.Setter{}
envVars["KOLLA_CONFIG_FILE"] = env.SetValue(KollaConfig)
envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS")
envVars["CONFIG_HASH"] = env.SetValue(configHash)

Expand Down
6 changes: 6 additions & 0 deletions pkg/placement/volumes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,11 @@ func getVolumeMounts() []corev1.VolumeMount {
MountPath: "/var/lib/config-data/merged",
ReadOnly: false,
},
{
Name: "config-data-merged",
MountPath: "/var/lib/kolla/config_files/config.json",
SubPath: "placement-api-config.json",
ReadOnly: true,
},
}
}