You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2026/05/14 09:24:45 UTC
(camel-k) branch release-2.9.x updated (bdddd2ad3 -> 1efa3982f)
This is an automated email from the ASF dual-hosted git repository.
squakez pushed a change to branch release-2.9.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from bdddd2ad3 chore(release): Helm chart for 2.9.2
new 5e7009818 feat(api): deprecate builder pod namespace
new 15fa21ebf chore(dependencies): golang security fix
new 01f33eca9 fix(ci): use versioned allowed release actions
new ee3e7bb79 fix(ci): used pinned actions
new 401c93a20 fix(ci): olm pinned docker/login action
new 1efa3982f fix(cmd): proper version deprecation notice
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/actions/infra-setting/action.yml | 2 +-
.github/actions/release-nightly/action.yml | 4 +-
.github/workflows/nightly-install-olm.yml | 2 +-
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 2 +
go.mod | 2 +-
helm/camel-k/crds/camel-k-crds.yaml | 74 +++++++++++++---------
pkg/apis/camel/v1/build_types_support.go | 11 ----
pkg/apis/camel/v1/common_types.go | 4 +-
.../camel/v1/buildconfiguration.go | 30 ++++-----
pkg/controller/build/build_monitor_test.go | 7 +-
pkg/controller/build/build_pod.go | 10 +--
pkg/controller/build/build_pod_test.go | 8 +--
pkg/controller/build/monitor_pod.go | 15 +----
pkg/controller/integration/build.go | 1 -
pkg/controller/integrationkit/build.go | 3 -
pkg/platform/operator.go | 24 -------
.../config/crd/bases/camel.apache.org_builds.yaml | 62 ++++++++++--------
.../camel.apache.org_integrationplatforms.yaml | 12 ++--
18 files changed, 126 insertions(+), 147 deletions(-)
(camel-k) 06/06: fix(cmd): proper version deprecation notice
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
squakez pushed a commit to branch release-2.9.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 1efa3982f4dbce0ae1f896f4003a16cae6d81ba2
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Sat Mar 21 09:35:10 2026 +0100
fix(cmd): proper version deprecation notice
Closes #6536
---
.github/actions/infra-setting/action.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/actions/infra-setting/action.yml b/.github/actions/infra-setting/action.yml
index cd69e2117..abc32b2a9 100644
--- a/.github/actions/infra-setting/action.yml
+++ b/.github/actions/infra-setting/action.yml
@@ -36,7 +36,7 @@ runs:
check-latest: true
- id: setup-kubectl
name: Set up Kubectl
- uses: azure/setup-kubectl@v4
+ uses: azure/setup-kubectl@776406bce94f63e41d621b960d78ee25c8b76ede
- id: minikube-start
name: Start minikube
uses: medyagh/setup-minikube@v0.0.18
(camel-k) 01/06: feat(api): deprecate builder pod namespace
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
squakez pushed a commit to branch release-2.9.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 5e70098186b3352297a8515bf43cd48c09404b9b
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Wed May 13 15:59:06 2026 +0200
feat(api): deprecate builder pod namespace
It is no longer needed as we can infer it from the Build custom resource
---
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 2 +
helm/camel-k/crds/camel-k-crds.yaml | 74 +++++++++++++---------
pkg/apis/camel/v1/build_types_support.go | 11 ----
pkg/apis/camel/v1/common_types.go | 4 +-
.../camel/v1/buildconfiguration.go | 43 ++++++++-----
pkg/controller/build/build_monitor_test.go | 7 +-
pkg/controller/build/build_pod.go | 10 +--
pkg/controller/build/build_pod_test.go | 8 +--
pkg/controller/build/monitor_pod.go | 15 +----
pkg/controller/integration/build.go | 1 -
pkg/controller/integrationkit/build.go | 3 -
pkg/platform/operator.go | 24 -------
.../config/crd/bases/camel.apache.org_builds.yaml | 62 ++++++++++--------
.../camel.apache.org_integrationplatforms.yaml | 12 ++--
14 files changed, 134 insertions(+), 142 deletions(-)
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
index 6a58ee2ad..7845f885f 100644
--- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -602,6 +602,8 @@ string
The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+Deprecated: no longer in use.
+
|`strategy` +
*xref:#_camel_apache_org_v1_BuildStrategy[BuildStrategy]*
|
diff --git a/helm/camel-k/crds/camel-k-crds.yaml b/helm/camel-k/crds/camel-k-crds.yaml
index a600c2e94..e5a5d0d76 100644
--- a/helm/camel-k/crds/camel-k-crds.yaml
+++ b/helm/camel-k/crds/camel-k-crds.yaml
@@ -110,8 +110,10 @@ spec:
for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder Pod (must
- be the same of the operator in charge of this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -194,9 +196,10 @@ spec:
Only used for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder
- Pod (must be the same of the operator in charge of
- this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -304,9 +307,10 @@ spec:
Only used for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder
- Pod (must be the same of the operator in charge of
- this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -926,9 +930,10 @@ spec:
Only used for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder
- Pod (must be the same of the operator in charge of
- this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -1007,9 +1012,10 @@ spec:
Only used for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder
- Pod (must be the same of the operator in charge of
- this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -1117,9 +1123,10 @@ spec:
Only used for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder
- Pod (must be the same of the operator in charge of
- this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -1226,9 +1233,10 @@ spec:
Only used for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder
- Pod (must be the same of the operator in charge of
- this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -1842,9 +1850,10 @@ spec:
Only used for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder
- Pod (must be the same of the operator in charge of
- this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -1945,9 +1954,10 @@ spec:
Only used for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder
- Pod (must be the same of the operator in charge of
- this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -3382,8 +3392,10 @@ spec:
for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder Pod (must
- be the same of the operator in charge of this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -5747,8 +5759,10 @@ spec:
for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder Pod (must
- be the same of the operator in charge of this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
diff --git a/pkg/apis/camel/v1/build_types_support.go b/pkg/apis/camel/v1/build_types_support.go
index aa032d37f..6128b96b1 100644
--- a/pkg/apis/camel/v1/build_types_support.go
+++ b/pkg/apis/camel/v1/build_types_support.go
@@ -38,17 +38,6 @@ func NewBuild(namespace string, name string) *Build {
}
}
-// BuilderPodNamespace returns the namespace of the operator in charge to reconcile this Build.
-func (build *Build) BuilderPodNamespace() string {
- for _, t := range build.Spec.Tasks {
- if t.Builder != nil {
- return t.Builder.Configuration.BuilderPodNamespace
- }
- }
-
- return ""
-}
-
// BuilderConfiguration returns the builder configuration for this Build.
func (build *Build) BuilderConfiguration() *BuildConfiguration {
return build.TaskConfiguration("builder")
diff --git a/pkg/apis/camel/v1/common_types.go b/pkg/apis/camel/v1/common_types.go
index 335435860..5422959d8 100644
--- a/pkg/apis/camel/v1/common_types.go
+++ b/pkg/apis/camel/v1/common_types.go
@@ -46,7 +46,9 @@ type BuildConfiguration struct {
// The container image to be used to run the build.
ToolImage string `json:"toolImage,omitempty"`
// The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
- BuilderPodNamespace string `json:"operatorNamespace,omitempty"`
+ //
+ // Deprecated: no longer in use.
+ DeprecatedBuilderPodNamespace string `json:"operatorNamespace,omitempty"`
// the strategy to adopt
Strategy BuildStrategy `json:"strategy,omitempty" property:"strategy"`
// the build order strategy to adopt
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/buildconfiguration.go b/pkg/client/camel/applyconfiguration/camel/v1/buildconfiguration.go
index 0963a90ff..2c9b48db8 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/buildconfiguration.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/buildconfiguration.go
@@ -26,17 +26,30 @@ import (
// BuildConfigurationApplyConfiguration represents a declarative configuration of the BuildConfiguration type for use
// with apply.
type BuildConfigurationApplyConfiguration struct {
- ToolImage *string `json:"toolImage,omitempty"`
- BuilderPodNamespace *string `json:"operatorNamespace,omitempty"`
- Strategy *camelv1.BuildStrategy `json:"strategy,omitempty"`
- OrderStrategy *camelv1.BuildOrderStrategy `json:"orderStrategy,omitempty"`
- RequestCPU *string `json:"requestCPU,omitempty"`
- RequestMemory *string `json:"requestMemory,omitempty"`
- LimitCPU *string `json:"limitCPU,omitempty"`
- LimitMemory *string `json:"limitMemory,omitempty"`
- NodeSelector map[string]string `json:"nodeSelector,omitempty"`
- Annotations map[string]string `json:"annotations,omitempty"`
- ImagePlatforms []string `json:"platforms,omitempty"`
+ // The container image to be used to run the build.
+ ToolImage *string `json:"toolImage,omitempty"`
+ // The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+ //
+ // Deprecated: no longer in use.
+ DeprecatedBuilderPodNamespace *string `json:"operatorNamespace,omitempty"`
+ // the strategy to adopt
+ Strategy *camelv1.BuildStrategy `json:"strategy,omitempty"`
+ // the build order strategy to adopt
+ OrderStrategy *camelv1.BuildOrderStrategy `json:"orderStrategy,omitempty"`
+ // The minimum amount of CPU required. Only used for `pod` strategy
+ RequestCPU *string `json:"requestCPU,omitempty"`
+ // The minimum amount of memory required. Only used for `pod` strategy
+ RequestMemory *string `json:"requestMemory,omitempty"`
+ // The maximum amount of CPU required. Only used for `pod` strategy
+ LimitCPU *string `json:"limitCPU,omitempty"`
+ // The maximum amount of memory required. Only used for `pod` strategy
+ LimitMemory *string `json:"limitMemory,omitempty"`
+ // The node selector for the builder pod. Only used for `pod` strategy
+ NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+ // Annotation to use for the builder pod. Only used for `pod` strategy
+ Annotations map[string]string `json:"annotations,omitempty"`
+ // The list of platforms used in order to build a container image.
+ ImagePlatforms []string `json:"platforms,omitempty"`
}
// BuildConfigurationApplyConfiguration constructs a declarative configuration of the BuildConfiguration type for use with
@@ -53,11 +66,11 @@ func (b *BuildConfigurationApplyConfiguration) WithToolImage(value string) *Buil
return b
}
-// WithBuilderPodNamespace sets the BuilderPodNamespace field in the declarative configuration to the given value
+// WithDeprecatedBuilderPodNamespace sets the DeprecatedBuilderPodNamespace field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
-// If called multiple times, the BuilderPodNamespace field is set to the value of the last call.
-func (b *BuildConfigurationApplyConfiguration) WithBuilderPodNamespace(value string) *BuildConfigurationApplyConfiguration {
- b.BuilderPodNamespace = &value
+// If called multiple times, the DeprecatedBuilderPodNamespace field is set to the value of the last call.
+func (b *BuildConfigurationApplyConfiguration) WithDeprecatedBuilderPodNamespace(value string) *BuildConfigurationApplyConfiguration {
+ b.DeprecatedBuilderPodNamespace = &value
return b
}
diff --git a/pkg/controller/build/build_monitor_test.go b/pkg/controller/build/build_monitor_test.go
index cb9d66c0d..08955c41f 100644
--- a/pkg/controller/build/build_monitor_test.go
+++ b/pkg/controller/build/build_monitor_test.go
@@ -685,10 +685,9 @@ func newBuildWithLayoutInPhase(namespace string, name string, layout string, pha
Builder: &v1.BuilderTask{
BaseTask: v1.BaseTask{
Configuration: v1.BuildConfiguration{
- Strategy: v1.BuildStrategyRoutine,
- OrderStrategy: v1.BuildOrderStrategySequential,
- ToolImage: "camel:latest",
- BuilderPodNamespace: "ns",
+ Strategy: v1.BuildStrategyRoutine,
+ OrderStrategy: v1.BuildOrderStrategySequential,
+ ToolImage: "camel:latest",
},
},
Dependencies: dependencies,
diff --git a/pkg/controller/build/build_pod.go b/pkg/controller/build/build_pod.go
index 46da6b91f..2bf22ba3f 100644
--- a/pkg/controller/build/build_pod.go
+++ b/pkg/controller/build/build_pod.go
@@ -49,7 +49,7 @@ func newBuildPod(ctx context.Context, client client.Client, build *v1.Build) *co
for _, task := range build.Spec.Tasks {
// get pod security context from security context constraint configuration in namespace
if task.S2i != nil {
- podSecurityContextConstrained, _ := openshift.GetOpenshiftPodSecurityContextRestricted(ctx, client, build.BuilderPodNamespace())
+ podSecurityContextConstrained, _ := openshift.GetOpenshiftPodSecurityContextRestricted(ctx, client, build.Namespace)
if podSecurityContextConstrained != nil {
podSecurityContext = podSecurityContextConstrained
}
@@ -61,7 +61,7 @@ func newBuildPod(ctx context.Context, client client.Client, build *v1.Build) *co
Kind: "Pod",
},
ObjectMeta: metav1.ObjectMeta{
- Namespace: build.BuilderPodNamespace(),
+ Namespace: build.Namespace,
Name: buildPodName(build),
Labels: map[string]string{
"camel.apache.org/build": build.Name,
@@ -149,7 +149,7 @@ func deleteBuilderPod(ctx context.Context, c ctrl.Writer, build *v1.Build) error
Kind: "Pod",
},
ObjectMeta: metav1.ObjectMeta{
- Namespace: build.BuilderPodNamespace(),
+ Namespace: build.Namespace,
Name: buildPodName(build),
},
}
@@ -164,7 +164,7 @@ func deleteBuilderPod(ctx context.Context, c ctrl.Writer, build *v1.Build) error
func getBuilderPod(ctx context.Context, c ctrl.Reader, build *v1.Build) (*corev1.Pod, error) {
pod := corev1.Pod{}
- err := c.Get(ctx, ctrl.ObjectKey{Namespace: build.BuilderPodNamespace(), Name: buildPodName(build)}, &pod)
+ err := c.Get(ctx, ctrl.ObjectKey{Namespace: build.Namespace, Name: buildPodName(build)}, &pod)
if err != nil && k8serrors.IsNotFound(err) {
return nil, nil
}
@@ -220,7 +220,7 @@ func addBuildTaskToPod(ctx context.Context, client client.Client, build *v1.Buil
// get security context from security context constraint configuration in namespace
if taskName == "s2i" {
- securityContextConstrained, _ := openshift.GetOpenshiftSecurityContextRestricted(ctx, client, build.BuilderPodNamespace())
+ securityContextConstrained, _ := openshift.GetOpenshiftSecurityContextRestricted(ctx, client, build.Namespace)
if securityContextConstrained != nil {
container.SecurityContext = securityContextConstrained
}
diff --git a/pkg/controller/build/build_pod_test.go b/pkg/controller/build/build_pod_test.go
index 7a41d3923..3a9eec8fa 100644
--- a/pkg/controller/build/build_pod_test.go
+++ b/pkg/controller/build/build_pod_test.go
@@ -36,7 +36,8 @@ func TestNewBuildPodConfiguration(t *testing.T) {
build := v1.Build{
ObjectMeta: metav1.ObjectMeta{
- Name: "theBuildName",
+ Name: "theBuildName",
+ Namespace: "theNamespace",
},
Spec: v1.BuildSpec{
Tasks: []v1.Task{
@@ -45,9 +46,8 @@ func TestNewBuildPodConfiguration(t *testing.T) {
BaseTask: v1.BaseTask{
Name: "builder",
Configuration: v1.BuildConfiguration{
- BuilderPodNamespace: "theNamespace",
- NodeSelector: map[string]string{"node": "selector"},
- Annotations: map[string]string{"annotation": "value"},
+ NodeSelector: map[string]string{"node": "selector"},
+ Annotations: map[string]string{"annotation": "value"},
},
},
},
diff --git a/pkg/controller/build/monitor_pod.go b/pkg/controller/build/monitor_pod.go
index 3983d80cf..1986f07e8 100644
--- a/pkg/controller/build/monitor_pod.go
+++ b/pkg/controller/build/monitor_pod.go
@@ -33,7 +33,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
- "github.com/apache/camel-k/v2/pkg/platform"
"github.com/apache/camel-k/v2/pkg/util/kubernetes"
"github.com/apache/camel-k/v2/pkg/util/kubernetes/log"
)
@@ -69,25 +68,13 @@ func (action *monitorPodAction) Handle(ctx context.Context, build *v1.Build) (*v
return nil, err
}
- //nolint:nestif
if pod == nil {
switch build.Status.Phase {
case v1.BuildPhasePending:
pod = newBuildPod(ctx, action.client, build)
- // If the Builder Pod is in the Build namespace, we can set the ownership to it. If not (global operator mode)
- // we set the ownership to the Operator Pod instead
- var owner metav1.Object
- owner = build
- if build.Namespace != pod.Namespace {
- operatorPod := platform.GetOperatorPod(ctx, action.client, pod.Namespace)
- if operatorPod != nil {
- owner = operatorPod
- }
- }
- if err = controllerutil.SetControllerReference(owner, pod, action.client.GetScheme()); err != nil {
+ if err = controllerutil.SetControllerReference(build, pod, action.client.GetScheme()); err != nil {
return nil, err
}
-
if err = action.client.Create(ctx, pod); err != nil {
return nil, fmt.Errorf("cannot create build pod: %w", err)
}
diff --git a/pkg/controller/integration/build.go b/pkg/controller/integration/build.go
index 2192e7ca3..eca1d4672 100644
--- a/pkg/controller/integration/build.go
+++ b/pkg/controller/integration/build.go
@@ -125,7 +125,6 @@ func (action *buildAction) createBuild(ctx context.Context, it *v1.Integration)
// The build operation, when executed as a Pod, should be executed by a container image containing the
// `kamel builder` command. Likely the same image running the operator should be fine.
buildConfig.ToolImage = platform.OperatorImage
- buildConfig.BuilderPodNamespace = it.Namespace
v1.SetBuilderConfigurationTasks(env.Pipeline, buildConfig)
// We need to ensure the presence of the camel-k-builder service account
diff --git a/pkg/controller/integrationkit/build.go b/pkg/controller/integrationkit/build.go
index 4bbea60b5..fb7e31c03 100644
--- a/pkg/controller/integrationkit/build.go
+++ b/pkg/controller/integrationkit/build.go
@@ -130,8 +130,6 @@ func (action *buildAction) createBuild(ctx context.Context, kit *v1.IntegrationK
annotations[v1.OperatorIDAnnotation] = operatorID
}
- // We may need to change certain builder configuration values
- operatorNamespace := platform.GetOperatorNamespace()
buildConfig := v1.ConfigurationTasksByName(env.Pipeline, "builder")
if buildConfig.IsEmpty() {
// default to IntegrationPlatform configuration
@@ -151,7 +149,6 @@ func (action *buildAction) createBuild(ctx context.Context, kit *v1.IntegrationK
// The build operation, when executed as a Pod, should be executed by a container image containing the
// `kamel builder` command. Likely the same image running the operator should be fine.
buildConfig.ToolImage = platform.OperatorImage
- buildConfig.BuilderPodNamespace = operatorNamespace
v1.SetBuilderConfigurationTasks(env.Pipeline, buildConfig)
build := &v1.Build{
diff --git a/pkg/platform/operator.go b/pkg/platform/operator.go
index d6482e50a..dcf00ab8a 100644
--- a/pkg/platform/operator.go
+++ b/pkg/platform/operator.go
@@ -25,9 +25,7 @@ import (
camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/util/defaults"
coordination "k8s.io/api/coordination/v1"
- corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/event"
"sigs.k8s.io/controller-runtime/pkg/predicate"
@@ -58,28 +56,6 @@ func IsCurrentOperatorGlobal() bool {
return false
}
-// GetOperatorPod returns the Pod which is running the operator in a given namespace.
-func GetOperatorPod(ctx context.Context, c ctrl.Reader, ns string) *corev1.Pod {
- lst := corev1.PodList{
- TypeMeta: metav1.TypeMeta{
- Kind: "Pod",
- APIVersion: corev1.SchemeGroupVersion.String(),
- },
- }
- if err := c.List(ctx, &lst,
- ctrl.InNamespace(ns),
- ctrl.MatchingLabels{
- "camel.apache.org/component": "operator",
- }); err != nil {
- return nil
- }
- if len(lst.Items) == 0 {
- return nil
- }
-
- return &lst.Items[0]
-}
-
// GetOperatorWatchNamespace returns the namespace the operator watches.
func GetOperatorWatchNamespace() string {
if namespace, envSet := os.LookupEnv(OperatorWatchNamespaceEnvVariable); envSet {
diff --git a/pkg/resources/config/crd/bases/camel.apache.org_builds.yaml b/pkg/resources/config/crd/bases/camel.apache.org_builds.yaml
index 2cd20e16b..cfff79c7f 100644
--- a/pkg/resources/config/crd/bases/camel.apache.org_builds.yaml
+++ b/pkg/resources/config/crd/bases/camel.apache.org_builds.yaml
@@ -110,8 +110,10 @@ spec:
for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder Pod (must
- be the same of the operator in charge of this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -194,9 +196,10 @@ spec:
Only used for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder
- Pod (must be the same of the operator in charge of
- this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -304,9 +307,10 @@ spec:
Only used for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder
- Pod (must be the same of the operator in charge of
- this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -926,9 +930,10 @@ spec:
Only used for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder
- Pod (must be the same of the operator in charge of
- this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -1007,9 +1012,10 @@ spec:
Only used for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder
- Pod (must be the same of the operator in charge of
- this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -1117,9 +1123,10 @@ spec:
Only used for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder
- Pod (must be the same of the operator in charge of
- this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -1226,9 +1233,10 @@ spec:
Only used for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder
- Pod (must be the same of the operator in charge of
- this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -1842,9 +1850,10 @@ spec:
Only used for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder
- Pod (must be the same of the operator in charge of
- this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -1945,9 +1954,10 @@ spec:
Only used for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder
- Pod (must be the same of the operator in charge of
- this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
diff --git a/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml
index d6e1f4231..7b89b0e30 100644
--- a/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml
+++ b/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml
@@ -133,8 +133,10 @@ spec:
for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder Pod (must
- be the same of the operator in charge of this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
@@ -2498,8 +2500,10 @@ spec:
for `pod` strategy
type: object
operatorNamespace:
- description: The namespace where to run the builder Pod (must
- be the same of the operator in charge of this Build reconciliation).
+ description: |-
+ The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
+
+ Deprecated: no longer in use.
type: string
orderStrategy:
description: the build order strategy to adopt
(camel-k) 03/06: fix(ci): use versioned allowed release actions
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
squakez pushed a commit to branch release-2.9.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 01f33eca94ef1b84a1aa7767e54242aa09bf1731
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Mar 23 12:53:30 2026 +0100
fix(ci): use versioned allowed release actions
---
.github/actions/release-nightly/action.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/actions/release-nightly/action.yml b/.github/actions/release-nightly/action.yml
index aa2b1dbd5..0a3f31673 100644
--- a/.github/actions/release-nightly/action.yml
+++ b/.github/actions/release-nightly/action.yml
@@ -58,7 +58,7 @@ runs:
sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
- name: Set up QEMU (required by multi platform build)
- uses: docker/setup-qemu-action@v3
+ uses: docker/setup-qemu-action@v3.6.0
#
# IMPORTANT:
@@ -95,7 +95,7 @@ runs:
echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV
- name: Login to staging container registry
- uses: docker/login-action@v3
+ uses: docker/login-action@v3.7.0
with:
username: ${{ inputs.secretDockerHubUser }}
password: ${{ inputs.secretDockerHubPassword }}
(camel-k) 02/06: chore(dependencies): golang security fix
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
squakez pushed a commit to branch release-2.9.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 15fa21ebfd555c72efa09f37a5ee62f9a7945fac
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Thu May 14 09:20:03 2026 +0200
chore(dependencies): golang security fix
---
go.mod | 2 +-
.../camel/v1/buildconfiguration.go | 35 +++++++---------------
2 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/go.mod b/go.mod
index 2ba3efde1..67c19dc74 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/apache/camel-k/v2
-go 1.25.7
+go 1.25.10
require (
dario.cat/mergo v1.0.2
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/buildconfiguration.go b/pkg/client/camel/applyconfiguration/camel/v1/buildconfiguration.go
index 2c9b48db8..836dbd384 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/buildconfiguration.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/buildconfiguration.go
@@ -26,30 +26,17 @@ import (
// BuildConfigurationApplyConfiguration represents a declarative configuration of the BuildConfiguration type for use
// with apply.
type BuildConfigurationApplyConfiguration struct {
- // The container image to be used to run the build.
- ToolImage *string `json:"toolImage,omitempty"`
- // The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation).
- //
- // Deprecated: no longer in use.
- DeprecatedBuilderPodNamespace *string `json:"operatorNamespace,omitempty"`
- // the strategy to adopt
- Strategy *camelv1.BuildStrategy `json:"strategy,omitempty"`
- // the build order strategy to adopt
- OrderStrategy *camelv1.BuildOrderStrategy `json:"orderStrategy,omitempty"`
- // The minimum amount of CPU required. Only used for `pod` strategy
- RequestCPU *string `json:"requestCPU,omitempty"`
- // The minimum amount of memory required. Only used for `pod` strategy
- RequestMemory *string `json:"requestMemory,omitempty"`
- // The maximum amount of CPU required. Only used for `pod` strategy
- LimitCPU *string `json:"limitCPU,omitempty"`
- // The maximum amount of memory required. Only used for `pod` strategy
- LimitMemory *string `json:"limitMemory,omitempty"`
- // The node selector for the builder pod. Only used for `pod` strategy
- NodeSelector map[string]string `json:"nodeSelector,omitempty"`
- // Annotation to use for the builder pod. Only used for `pod` strategy
- Annotations map[string]string `json:"annotations,omitempty"`
- // The list of platforms used in order to build a container image.
- ImagePlatforms []string `json:"platforms,omitempty"`
+ ToolImage *string `json:"toolImage,omitempty"`
+ DeprecatedBuilderPodNamespace *string `json:"operatorNamespace,omitempty"`
+ Strategy *camelv1.BuildStrategy `json:"strategy,omitempty"`
+ OrderStrategy *camelv1.BuildOrderStrategy `json:"orderStrategy,omitempty"`
+ RequestCPU *string `json:"requestCPU,omitempty"`
+ RequestMemory *string `json:"requestMemory,omitempty"`
+ LimitCPU *string `json:"limitCPU,omitempty"`
+ LimitMemory *string `json:"limitMemory,omitempty"`
+ NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+ Annotations map[string]string `json:"annotations,omitempty"`
+ ImagePlatforms []string `json:"platforms,omitempty"`
}
// BuildConfigurationApplyConfiguration constructs a declarative configuration of the BuildConfiguration type for use with
(camel-k) 04/06: fix(ci): used pinned actions
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
squakez pushed a commit to branch release-2.9.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit ee3e7bb79021a04a598920e3449f0e4972b0eb00
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Mar 23 12:55:28 2026 +0100
fix(ci): used pinned actions
---
.github/actions/release-nightly/action.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/actions/release-nightly/action.yml b/.github/actions/release-nightly/action.yml
index 0a3f31673..5ce90fd6d 100644
--- a/.github/actions/release-nightly/action.yml
+++ b/.github/actions/release-nightly/action.yml
@@ -58,7 +58,7 @@ runs:
sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
- name: Set up QEMU (required by multi platform build)
- uses: docker/setup-qemu-action@v3.6.0
+ uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392
#
# IMPORTANT:
@@ -95,7 +95,7 @@ runs:
echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV
- name: Login to staging container registry
- uses: docker/login-action@v3.7.0
+ uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9
with:
username: ${{ inputs.secretDockerHubUser }}
password: ${{ inputs.secretDockerHubPassword }}
(camel-k) 05/06: fix(ci): olm pinned docker/login action
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
squakez pushed a commit to branch release-2.9.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 401c93a209a1964c4226f1abe4e27ac8b6fe4b03
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Mar 23 12:58:01 2026 +0100
fix(ci): olm pinned docker/login action
---
.github/workflows/nightly-install-olm.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/nightly-install-olm.yml b/.github/workflows/nightly-install-olm.yml
index 953774b95..f91264d27 100644
--- a/.github/workflows/nightly-install-olm.yml
+++ b/.github/workflows/nightly-install-olm.yml
@@ -61,7 +61,7 @@ jobs:
# Building and pushing a bundle to a running container is required due to how
# Operator-SDK works. Once it allows for local bundle testing, this part may be omitted
- name: Login to staging container registry
- uses: docker/login-action@v3
+ uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9
with:
username: ${{ secrets.TEST_DOCKER_HUB_USERNAME }}
password: ${{ secrets.TEST_DOCKER_HUB_PASSWORD }}