resolving merge conflicts

This commit is contained in:
withchao
2025-03-07 14:48:44 +08:00
parent 1e54235263
commit aeee3f33b1
30 changed files with 503 additions and 35 deletions
+1 -1
View File
@@ -43,7 +43,7 @@ const (
)
func readConfig[T any](dir string, name string) (*T, error) {
if runtimeenv.PrintRuntimeEnvironment() == config.KUBERNETES {
if runtimeenv.RuntimeEnvironment() == config.KUBERNETES {
dir = os.Getenv(config.MountConfigFilePath)
}
v := viper.New()