Merge pull request #1838 from microsec-ambrose/upgrade-compose-go

chore(deps): bump Go version and github.com/compose-spec/compose-go
This commit is contained in:
Kubernetes Prow Robot
2024-04-18 05:58:12 -07:00
committed by GitHub
11 changed files with 98 additions and 29 deletions
+1 -1
View File
@@ -31,7 +31,7 @@ import (
"text/template"
"time"
"github.com/compose-spec/compose-go/types"
"github.com/compose-spec/compose-go/v2/types"
"github.com/joho/godotenv"
"github.com/kubernetes/kompose/pkg/kobject"
"github.com/kubernetes/kompose/pkg/loader/compose"
+2 -2
View File
@@ -29,7 +29,7 @@ import (
"strconv"
"strings"
"github.com/compose-spec/compose-go/types"
"github.com/compose-spec/compose-go/v2/types"
"github.com/fatih/structs"
"github.com/kubernetes/kompose/pkg/kobject"
"github.com/kubernetes/kompose/pkg/loader/compose"
@@ -1314,7 +1314,7 @@ func (k *Kubernetes) createConfigMapFromComposeConfig(name string, service kobje
for _, config := range service.Configs {
currentConfigName := config.Source
currentConfigObj := service.ConfigsMetaData[currentConfigName]
if currentConfigObj.External.External {
if currentConfigObj.External {
continue
}
currentFileName := currentConfigObj.File
@@ -23,7 +23,7 @@ import (
"strings"
"testing"
"github.com/compose-spec/compose-go/types"
"github.com/compose-spec/compose-go/v2/types"
"github.com/kubernetes/kompose/pkg/kobject"
"github.com/kubernetes/kompose/pkg/loader/compose"