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.

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

[Release 2.5.x] Various fixes #6040

Merged
merged 3 commits into from
Jan 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions pkg/controller/integrationplatform/create_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"os"
"strings"
"testing"
"time"

v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/platform"
Expand All @@ -35,6 +36,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
k8stesting "k8s.io/client-go/testing"
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -124,6 +126,9 @@ func TestCreateNewCatalog(t *testing.T) {
Build: v1.IntegrationPlatformBuildSpec{
RuntimeProvider: v1.RuntimeProviderQuarkus,
RuntimeVersion: defaults.DefaultRuntimeVersion,
Timeout: &metav1.Duration{
Duration: 1 * time.Minute,
},
},
},
}
Expand Down Expand Up @@ -187,6 +192,9 @@ func TestCreateNewCatalog(t *testing.T) {
Build: v1.IntegrationPlatformBuildSpec{
RuntimeProvider: v1.RuntimeProviderQuarkus,
RuntimeVersion: defaults.DefaultRuntimeVersion,
Timeout: &metav1.Duration{
Duration: 1 * time.Minute,
},
},
},
}
Expand Down
47 changes: 42 additions & 5 deletions pkg/controller/integrationplatform/kamelets.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ import (
"github.com/apache/camel-k/v2/pkg/client"
"github.com/apache/camel-k/v2/pkg/util"
"github.com/apache/camel-k/v2/pkg/util/defaults"
"github.com/apache/camel-k/v2/pkg/util/jvm"
"github.com/apache/camel-k/v2/pkg/util/kubernetes"
"github.com/apache/camel-k/v2/pkg/util/log"
"github.com/apache/camel-k/v2/pkg/util/maven"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -61,7 +63,7 @@ func installKameletCatalog(ctx context.Context, c client.Client, platform *v1.In
return -1, -1, err
}
// Download Kamelet dependency
if err := downloadKameletDependency(ctx, version, kameletDir); err != nil {
if err := downloadKameletDependency(ctx, c, platform, version, kameletDir); err != nil {
return -1, -1, err
}
// Extract Kamelets files
Expand Down Expand Up @@ -100,9 +102,7 @@ func prepareKameletDirectory() (string, error) {
return kameletDir, nil
}

func downloadKameletDependency(ctx context.Context, version, kameletsDir string) error {
// TODO: we may want to add the maven settings coming from the platform
// in order to cover any user security setting in place
func downloadKameletDependency(ctx context.Context, c client.Client, platform *v1.IntegrationPlatform, version, kameletsDir string) error {
p := maven.NewProjectWithGAV("org.apache.camel.k.kamelets", "kamelets-catalog", defaults.Version)
mc := maven.NewContext(kameletsDir)
mc.AddArgument("-q")
Expand All @@ -111,7 +111,44 @@ func downloadKameletDependency(ctx context.Context, version, kameletsDir string)
mc.AddArgument("-Dmdep.useBaseVersion=true")
mc.AddArgument(fmt.Sprintf("-DoutputDirectory=%s", kameletsDir))

return p.Command(mc).Do(ctx)
if settings, err := kubernetes.ResolveValueSource(ctx, c, platform.Namespace, &platform.Status.Build.Maven.Settings); err != nil {
return err
} else if settings != "" {
mc.UserSettings = []byte(settings)
}

settings, err := maven.NewSettings(maven.DefaultRepositories, maven.ProxyFromEnvironment)
if err != nil {
return err
}
data, err := settings.MarshalBytes()
if err != nil {
return err
}
mc.GlobalSettings = data
secrets := platform.Status.Build.Maven.CASecrets

if secrets != nil {
certsData, err := kubernetes.GetSecretsRefData(ctx, c, platform.Namespace, secrets)
if err != nil {
return err
}
trustStoreName := "trust.jks"
trustStorePass := jvm.NewKeystorePassword()
err = jvm.GenerateKeystore(ctx, kameletsDir, trustStoreName, trustStorePass, certsData)
if err != nil {
return err
}
mc.ExtraMavenOpts = append(mc.ExtraMavenOpts,
"-Djavax.net.ssl.trustStore="+trustStoreName,
"-Djavax.net.ssl.trustStorePassword="+trustStorePass,
)
}

timeoutCtx, cancel := context.WithTimeout(ctx, platform.Status.Build.GetTimeout().Duration)
defer cancel()

return p.Command(mc).Do(timeoutCtx)
}

func extractKameletsFromDependency(ctx context.Context, version, kameletsDir string) error {
Expand Down
19 changes: 18 additions & 1 deletion pkg/controller/integrationplatform/kamelets_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,16 @@ import (
"path/filepath"
"strings"
"testing"
"time"

v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/util/boolean"
"github.com/apache/camel-k/v2/pkg/util/camel"
"github.com/apache/camel-k/v2/pkg/util/defaults"
"github.com/apache/camel-k/v2/pkg/util/test"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

func TestLoadKamelet(t *testing.T) {
Expand Down Expand Up @@ -112,6 +115,20 @@ func TestPrepareKameletsDirectory(t *testing.T) {
}

func TestDownloadKameletDependencyAndExtract(t *testing.T) {
cli, err := test.NewFakeClient()
assert.NoError(t, err)
itp := v1.NewIntegrationPlatform("itp-ns", "my-itp")
itp.Status = v1.IntegrationPlatformStatus{
IntegrationPlatformSpec: v1.IntegrationPlatformSpec{
Build: v1.IntegrationPlatformBuildSpec{
RuntimeProvider: v1.RuntimeProviderQuarkus,
RuntimeVersion: defaults.DefaultRuntimeVersion,
Timeout: &metav1.Duration{
Duration: 1 * time.Minute,
},
},
},
}
// use local Maven executable in tests
t.Setenv("MAVEN_WRAPPER", boolean.FalseString)
_, ok := os.LookupEnv("MAVEN_CMD")
Expand All @@ -126,7 +143,7 @@ func TestDownloadKameletDependencyAndExtract(t *testing.T) {
assert.NoError(t, err)
camelVersion := c.Runtime.Metadata["camel.version"]
assert.NotEqual(t, "", camelVersion)
err = downloadKameletDependency(context.TODO(), camelVersion, tmpDir)
err = downloadKameletDependency(context.TODO(), cli, &itp, camelVersion, tmpDir)
assert.NoError(t, err)
downloadedDependency, err := os.Stat(path.Join(tmpDir, fmt.Sprintf("camel-kamelets-%s.jar", camelVersion)))
assert.NoError(t, err)
Expand Down
9 changes: 7 additions & 2 deletions pkg/trait/mount.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,15 +180,17 @@ func (t *mountTrait) configureVolumesAndMounts(e *Environment, vols *[]corev1.Vo
// configureCamelVolumesAndMounts is in charge to mount volumes and mounts coming from Camel configuration
// (ie, sources, properties, kamelets, etcetera).
func (t *mountTrait) configureCamelVolumesAndMounts(e *Environment, vols *[]corev1.Volume, mnts *[]corev1.VolumeMount) {
// Sources
// Sources index
idx := 0
// Configmap index (may differ as generated sources can have a different name)
cmx := 0
for _, s := range e.Integration.AllSources() {
// We don't process routes embedded (native) or Kamelets
if e.isEmbedded(s) || s.IsGeneratedFromKamelet() {
continue
}
// Routes are copied under /etc/camel/sources and discovered by the runtime accordingly
cmName := fmt.Sprintf("%s-source-%03d", e.Integration.Name, idx)
cmName := fmt.Sprintf("%s-source-%03d", e.Integration.Name, cmx)
if s.ContentRef != "" {
cmName = s.ContentRef
}
Expand All @@ -205,6 +207,9 @@ func (t *mountTrait) configureCamelVolumesAndMounts(e *Environment, vols *[]core
*vols = append(*vols, *vol)
*mnts = append(*mnts, *mnt)
idx++
if s.ContentRef == "" {
cmx++
}
}
// Resources (likely application properties or kamelets)
if e.Resources != nil {
Expand Down
11 changes: 10 additions & 1 deletion pkg/trait/prometheus.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func (t *prometheusTrait) Apply(e *Environment) error {

// Add the PodMonitor resource
if ptr.Deref(t.PodMonitor, true) {
portName := containerPort.Name
portName := getPortName(containerPort.Name)
podMonitor, err := t.getPodMonitorFor(e, portName)
if err != nil {
return err
Expand All @@ -103,6 +103,15 @@ func (t *prometheusTrait) Apply(e *Environment) error {
return nil
}

func getPortName(portName string) string {
// This is a workaround to fix Knative behavior
// as described in https://github.com/apache/camel-k/issues/6014
if portName == defaultKnativeContainerPortName {
return "user-port"
}
return portName
}

func (t *prometheusTrait) getPodMonitorFor(e *Environment, portName string) (*monitoringv1.PodMonitor, error) {
labels, err := keyValuePairArrayAsStringMap(t.PodMonitorLabels)
if err != nil {
Expand Down
Loading