Katenary/katenary
2
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects 4 Releases 18 Wiki Activity

chore(packages) Use compose-go v2
All checks were successful
Go-Tests / sonar (push) Successful in 54s
Details
Go-Tests / tests (push) Successful in 2m7s
Details

Browse Source 
This prepares the next release. We need to support the compose v2 syntax
as soon as possible to avoid accumulating technical debt.
This commit is contained in:
Patrice Ferlet
2025-10-18 14:43:16 +02:00
parent 9bd1ebb59a
commit 569ca195df
22 changed files with 133 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/generator/chart.go
View File

@@ -14,7 +14,7 @@ import (
"katenary.io/internal/logger"
"katenary.io/internal/utils"
"github.com/compose-spec/compose-go/types"
"github.com/compose-spec/compose-go/v2/types"
corev1 "k8s.io/api/core/v1"
)

2
internal/generator/configMap.go
View File

@@ -14,7 +14,7 @@ import (
"katenary.io/internal/logger"
"katenary.io/internal/utils"
"github.com/compose-spec/compose-go/types"
"github.com/compose-spec/compose-go/v2/types"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

2
internal/generator/configMap_test.go
View File

@@ -9,7 +9,7 @@ import (
"katenary.io/internal/generator/labels"
"github.com/compose-spec/compose-go/types"
"github.com/compose-spec/compose-go/v2/types"
appv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
"sigs.k8s.io/yaml"

2
internal/generator/converter.go
View File

@@ -20,7 +20,7 @@ import (
"katenary.io/internal/parser"
"katenary.io/internal/utils"
"github.com/compose-spec/compose-go/types"
"github.com/compose-spec/compose-go/v2/types"
)
const ingressClassHelp = `# Default value for ingress.class annotation

2
internal/generator/cronJob.go
View File

@@ -8,7 +8,7 @@ import (
"katenary.io/internal/generator/labels/labelstructs"
"katenary.io/internal/utils"
"github.com/compose-spec/compose-go/types"
"github.com/compose-spec/compose-go/v2/types"
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
internal/generator/deployment.go
View File

@@ -14,7 +14,7 @@ import (
"katenary.io/internal/logger"
"katenary.io/internal/utils"
"github.com/compose-spec/compose-go/types"
"github.com/compose-spec/compose-go/v2/types"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

6
internal/generator/generator.go
View File

@@ -12,7 +12,7 @@ import (
"katenary.io/internal/logger"
"katenary.io/internal/utils"
"github.com/compose-spec/compose-go/types"
"github.com/compose-spec/compose-go/v2/types"
corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/yaml"
)
@@ -216,9 +216,9 @@ func Generate(project *types.Project) (*HelmChart, error) {
// dropIngoredServices removes all services with the "ignore" label set to true (or yes).
func dropIngoredServices(project *types.Project) {
for i, service := range project.Services {
for name, service := range project.Services {
if isIgnored(service) {
project.Services = append(project.Services[:i], project.Services[i+1:]...)
delete(project.Services, name)
}
}
}

2
internal/generator/ingress.go
View File

@@ -8,7 +8,7 @@ import (
"katenary.io/internal/generator/labels/labelstructs"
"katenary.io/internal/utils"
"github.com/compose-spec/compose-go/types"
"github.com/compose-spec/compose-go/v2/types"
networkv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

51
internal/generator/katenaryfile/main.go
View File

@@ -12,7 +12,7 @@ import (
"katenary.io/internal/generator/labels/labelstructs"
"katenary.io/internal/logger"
"github.com/compose-spec/compose-go/types"
"github.com/compose-spec/compose-go/v2/types"
"github.com/invopop/jsonschema"
"gopkg.in/yaml.v3"
)
@@ -70,35 +70,37 @@ func OverrideWithConfig(project *types.Project) {
log.Fatal(err)
return
}
for i, p := range project.Services {
for _, p := range project.Services {
name := p.Name
if project.Services[i].Labels == nil {
project.Services[i].Labels = make(map[string]string)
}
mustGetLabelContent := func(o any, s *types.ServiceConfig, labelName string) {
err := getLabelContent(o, s, labelName)
mustGetLabelContent := func(o any, labelName string) {
s, ok := project.Services[name]
if !ok {
return
}
err := getLabelContent(o, &s, labelName)
if err != nil {
log.Fatal(err)
}
project.Services[name] = s
}
if s, ok := services[name]; ok {
mustGetLabelContent(s.MainApp, &project.Services[i], labels.LabelMainApp)
mustGetLabelContent(s.Values, &project.Services[i], labels.LabelValues)
mustGetLabelContent(s.Secrets, &project.Services[i], labels.LabelSecrets)
mustGetLabelContent(s.Ports, &project.Services[i], labels.LabelPorts)
mustGetLabelContent(s.Ingress, &project.Services[i], labels.LabelIngress)
mustGetLabelContent(s.HealthCheck, &project.Services[i], labels.LabelHealthCheck)
mustGetLabelContent(s.SamePod, &project.Services[i], labels.LabelSamePod)
mustGetLabelContent(s.Description, &project.Services[i], labels.LabelDescription)
mustGetLabelContent(s.Ignore, &project.Services[i], labels.LabelIgnore)
mustGetLabelContent(s.Dependencies, &project.Services[i], labels.LabelDependencies)
mustGetLabelContent(s.ConfigMapFiles, &project.Services[i], labels.LabelConfigMapFiles)
mustGetLabelContent(s.MapEnv, &project.Services[i], labels.LabelMapEnv)
mustGetLabelContent(s.CronJob, &project.Services[i], labels.LabelCronJob)
mustGetLabelContent(s.EnvFrom, &project.Services[i], labels.LabelEnvFrom)
mustGetLabelContent(s.ExchangeVolumes, &project.Services[i], labels.LabelExchangeVolume)
mustGetLabelContent(s.ValuesFrom, &project.Services[i], labels.LabelValuesFrom)
mustGetLabelContent(s.MainApp, labels.LabelMainApp)
mustGetLabelContent(s.Values, labels.LabelValues)
mustGetLabelContent(s.Secrets, labels.LabelSecrets)
mustGetLabelContent(s.Ports, labels.LabelPorts)
mustGetLabelContent(s.Ingress, labels.LabelIngress)
mustGetLabelContent(s.HealthCheck, labels.LabelHealthCheck)
mustGetLabelContent(s.SamePod, labels.LabelSamePod)
mustGetLabelContent(s.Description, labels.LabelDescription)
mustGetLabelContent(s.Ignore, labels.LabelIgnore)
mustGetLabelContent(s.Dependencies, labels.LabelDependencies)
mustGetLabelContent(s.ConfigMapFiles, labels.LabelConfigMapFiles)
mustGetLabelContent(s.MapEnv, labels.LabelMapEnv)
mustGetLabelContent(s.CronJob, labels.LabelCronJob)
mustGetLabelContent(s.EnvFrom, labels.LabelEnvFrom)
mustGetLabelContent(s.ExchangeVolumes, labels.LabelExchangeVolume)
mustGetLabelContent(s.ValuesFrom, labels.LabelValuesFrom)
}
}
logger.Info("Katenary file loaded successfully, the services are now configured.")
@@ -129,6 +131,9 @@ func getLabelContent(o any, service *types.ServiceConfig, labelName string) erro
val = strings.TrimSpace(string(c))
}
if service.Labels == nil {
service.Labels = types.Labels{}
}
service.Labels[labelName] = val
return nil
}

15
internal/generator/katenaryfile/main_test.go
View File

@@ -1,13 +1,14 @@
package katenaryfile
import (
"context"
"os"
"path/filepath"
"testing"
"katenary.io/internal/generator/labels"
"github.com/compose-spec/compose-go/cli"
"github.com/compose-spec/compose-go/v2/cli"
)
func TestBuildSchema(t *testing.T) {
@@ -53,13 +54,13 @@ webapp:
cli.WithWorkingDirectory(tmpDir),
cli.WithDefaultConfigPath,
)
project, err := cli.ProjectFromOptions(options)
project, err := cli.ProjectFromOptions(context.TODO(), options)
if err != nil {
t.Fatalf("Failed to create project from options: %s", err.Error())
}
OverrideWithConfig(project)
w := project.Services[0].Labels
w := project.Services["webapp"].Labels
if v, ok := w[labels.LabelPorts]; !ok {
t.Fatal("Expected ports to be defined", v)
}
@@ -103,13 +104,13 @@ webapp:
cli.WithWorkingDirectory(tmpDir),
cli.WithDefaultConfigPath,
)
project, err := cli.ProjectFromOptions(options)
project, err := cli.ProjectFromOptions(context.TODO(), options)
if err != nil {
t.Fatalf("Failed to create project from options: %s", err.Error())
}
OverrideWithConfig(project)
w := project.Services[0].Labels
w := project.Services["webapp"].Labels
if v, ok := w[labels.LabelPorts]; !ok {
t.Fatal("Expected ports to be defined", v)
}
@@ -158,13 +159,13 @@ webapp:
cli.WithWorkingDirectory(tmpDir),
cli.WithDefaultConfigPath,
)
project, err := cli.ProjectFromOptions(options)
project, err := cli.ProjectFromOptions(context.TODO(), options)
if err != nil {
t.Fatalf("Failed to create project from options: %s", err.Error())
}
OverrideWithConfig(project)
w := project.Services[0].Labels
w := project.Services["webapp"].Labels
if v, ok := w[labels.LabelConfigMapFiles]; !ok {
t.Fatal("Expected configmap-files to be defined", v)
}

2
internal/generator/rbac.go
View File

@@ -3,7 +3,7 @@ package generator
import (
"katenary.io/internal/utils"
"github.com/compose-spec/compose-go/types"
"github.com/compose-spec/compose-go/v2/types"
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
internal/generator/secret.go
View File

@@ -7,7 +7,7 @@ import (
"katenary.io/internal/generator/labels"
"katenary.io/internal/utils"
"github.com/compose-spec/compose-go/types"
"github.com/compose-spec/compose-go/v2/types"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

2
internal/generator/service.go
View File

@@ -7,7 +7,7 @@ import (
"katenary.io/internal/utils"
"github.com/compose-spec/compose-go/types"
"github.com/compose-spec/compose-go/v2/types"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"

2
internal/generator/utils.go
View File

@@ -9,7 +9,7 @@ import (
"katenary.io/internal/generator/labels/labelstructs"
"katenary.io/internal/utils"
"github.com/compose-spec/compose-go/types"
"github.com/compose-spec/compose-go/v2/types"
corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/yaml"
)

23
internal/generator/utils_test.go
View File

@@ -1,6 +1,7 @@
package generator
import (
"context"
"fmt"
"os"
"path/filepath"
@@ -9,7 +10,7 @@ import (
"katenary.io/internal/generator/labels"
"katenary.io/internal/utils"
"github.com/compose-spec/compose-go/cli"
"github.com/compose-spec/compose-go/v2/cli"
)
func TestSplitPorts(t *testing.T) {
@@ -28,7 +29,7 @@ services:
composeFile := filepath.Join(tmpDir, "compose.yaml")
os.MkdirAll(tmpDir, utils.DirectoryPermission)
if err := os.WriteFile(composeFile, []byte(composeFileContent), 0644); err != nil {
if err := os.WriteFile(composeFile, []byte(composeFileContent), 0o644); err != nil {
t.Log(err)
}
defer os.RemoveAll(tmpDir)
@@ -39,15 +40,17 @@ services:
cli.WithWorkingDirectory(tmpDir),
cli.WithDefaultConfigPath,
)
project, err := cli.ProjectFromOptions(options)
project, err := cli.ProjectFromOptions(context.TODO(), options)
if err != nil {
t.Fatal(err)
}
if err := fixPorts(&project.Services[0]); err != nil {
s := project.Services["foo"]
if err := fixPorts(&s); err != nil {
t.Errorf("Expected no error, got %s", err)
}
project.Services["foo"] = s
found := 0
for _, p := range project.Services[0].Ports {
for _, p := range project.Services["foo"].Ports {
switch p.Target {
case 80, 443:
found++
@@ -76,7 +79,7 @@ services:
composeFile := filepath.Join(tmpDir, "compose.yaml")
os.MkdirAll(tmpDir, utils.DirectoryPermission)
if err := os.WriteFile(composeFile, []byte(composeFileContent), 0644); err != nil {
if err := os.WriteFile(composeFile, []byte(composeFileContent), 0o644); err != nil {
t.Log(err)
}
defer os.RemoveAll(tmpDir)
@@ -87,15 +90,17 @@ services:
cli.WithWorkingDirectory(tmpDir),
cli.WithDefaultConfigPath,
)
project, err := cli.ProjectFromOptions(options)
project, err := cli.ProjectFromOptions(context.TODO(), options)
if err != nil {
t.Fatal(err)
}
if err := fixPorts(&project.Services[0]); err != nil {
s := project.Services["foo"]
if err := fixPorts(&s); err != nil {
t.Errorf("Expected no error, got %s", err)
}
project.Services["foo"] = s
found := 0
for _, p := range project.Services[0].Ports {
for _, p := range project.Services["foo"].Ports {
switch p.Target {
case 80, 443, 8080:
found++

2
internal/generator/values.go
View File

@@ -3,7 +3,7 @@ package generator
import (
"strings"
"github.com/compose-spec/compose-go/types"
"github.com/compose-spec/compose-go/v2/types"
)
// RepositoryValue is a docker repository image and tag that will be saved in values.yaml.

2
internal/generator/volume.go
View File

@@ -5,7 +5,7 @@ import (
"katenary.io/internal/utils"
"github.com/compose-spec/compose-go/types"
"github.com/compose-spec/compose-go/v2/types"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"