This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 520e91a188b3dbd43c95ef05494fbf42b2f28336
Author: Pasquale Congiusti <pasquale.congiu...@gmail.com>
AuthorDate: Tue Jul 30 15:47:59 2024 +0200
chore(ci): move to ptr package
---
addons/keda/keda.go | 6 ++--
addons/keda/keda_test.go | 26 ++++++++--------
addons/master/master.go | 14 ++++-----
addons/resume/resume.go | 6 ++--
addons/telemetry/telemetry.go | 13 ++++----
addons/telemetry/telemetry_test.go | 14 ++++-----
addons/threescale/3scale.go | 6 ++--
addons/threescale/3scale_test.go | 8 ++---
addons/tracing/tracing.go | 7 ++---
addons/tracing/tracing_test.go | 4 +--
addons/vault/aws/aws_secrets_manager.go | 10 +++---
addons/vault/aws/aws_secrets_manager_test.go | 12 ++++----
addons/vault/azure/azure_key_vault.go | 10 +++---
addons/vault/azure/azure_key_vault_test.go | 18 +++++------
addons/vault/gcp/gcp_secret_manager.go | 10 +++---
addons/vault/gcp/gcp_secret_manager_test.go | 10 +++---
addons/vault/hashicorp/hashicorp_vault.go | 4 +--
addons/vault/hashicorp/hashicorp_vault_test.go | 8 ++---
e2e/common/traits/toleration_test.go | 6 ++--
e2e/support/test_support.go | 10 +++---
pkg/apis/camel/v1/common_types_support_test.go | 12 ++++----
pkg/cmd/debug.go | 6 ++--
pkg/cmd/debug_test.go | 4 +--
pkg/cmd/run_test.go | 8 ++---
.../integration/integration_controller.go | 4 +--
pkg/controller/integration/monitor.go | 4 +--
pkg/controller/integration/monitor_test.go | 6 ++--
pkg/controller/pipe/initialize_test.go | 8 ++---
pkg/controller/pipe/integration_test.go | 6 ++--
pkg/controller/pipe/monitor_test.go | 30 +++++++++---------
pkg/trait/affinity.go | 18 +++++------
pkg/trait/affinity_test.go | 14 ++++-----
pkg/trait/container.go | 10 +++---
pkg/trait/container_probes_test.go | 24 +++++++--------
pkg/trait/container_test.go | 26 ++++++++--------
pkg/trait/cron.go | 18 +++++------
pkg/trait/cron_test.go | 8 ++---
pkg/trait/deployer.go | 4 +--
pkg/trait/environment.go | 8 ++---
pkg/trait/environment_test.go | 6 ++--
pkg/trait/gc.go | 4 +--
pkg/trait/gc_test.go | 6 ++--
pkg/trait/health.go | 14 ++++-----
pkg/trait/health_test.go | 14 ++++-----
pkg/trait/ingress.go | 6 ++--
pkg/trait/ingress_test.go | 8 ++---
pkg/trait/init.go | 5 ++-
pkg/trait/istio.go | 4 +--
pkg/trait/istio_test.go | 12 ++++----
pkg/trait/jolokia.go | 4 +--
pkg/trait/jolokia_test.go | 8 ++---
pkg/trait/jvm.go | 8 ++---
pkg/trait/jvm_test.go | 10 +++---
pkg/trait/kamelets.go | 6 ++--
pkg/trait/kamelets_test.go | 4 +--
pkg/trait/knative.go | 18 +++++------
pkg/trait/knative_service.go | 8 ++---
pkg/trait/knative_service_test.go | 8 ++---
pkg/trait/knative_test.go | 36 +++++++++++-----------
pkg/trait/logging.go | 17 +++++-----
pkg/trait/logging_test.go | 8 ++---
pkg/trait/mount.go | 4 +--
pkg/trait/owner.go | 4 +--
pkg/trait/pdb.go | 4 +--
pkg/trait/pdb_test.go | 4 +--
pkg/trait/platform.go | 12 ++++----
pkg/trait/platform_test.go | 8 ++---
pkg/trait/pod.go | 4 +--
pkg/trait/pod_test.go | 4 +--
pkg/trait/prometheus.go | 8 ++---
pkg/trait/pull_secret.go | 10 +++---
pkg/trait/pull_secret_test.go | 8 ++---
pkg/trait/quarkus.go | 4 +--
pkg/trait/registry.go | 4 +--
pkg/trait/route.go | 4 +--
pkg/trait/route_test.go | 4 +--
pkg/trait/security_context.go | 4 +--
pkg/trait/security_context_test.go | 14 ++++-----
pkg/trait/service.go | 10 +++---
pkg/trait/service_binding.go | 4 +--
pkg/trait/service_test.go | 28 ++++++++---------
pkg/trait/toleration.go | 4 +--
pkg/trait/toleration_test.go | 4 +--
pkg/trait/trait_configure_test.go | 18 +++++------
pkg/trait/trait_test.go | 18 +++++------
pkg/trait/trait_types_test.go | 6 ++--
pkg/trait/util_test.go | 16 +++++-----
pkg/util/bindings/bindings_test.go | 12 ++++----
pkg/util/bindings/catalog.go | 4 +--
pkg/util/bindings/knative_ref_test.go | 14 ++++-----
pkg/util/bindings/knative_uri.go | 7 ++---
pkg/util/digest/digest_test.go | 6 ++--
pkg/util/kubernetes/security.go | 6 ++--
pkg/util/openshift/openshift.go | 6 ++--
pkg/util/openshift/openshift_test.go | 4 +--
95 files changed, 450 insertions(+), 455 deletions(-)
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index 550fc045f..08b2fa832 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -42,7 +42,7 @@ import (
autoscalingv1 "k8s.io/api/autoscaling/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
)
@@ -117,7 +117,7 @@ func NewKedaTrait() trait.Trait {
}
func (t *kedaTrait) Configure(e *trait.Environment) (bool,
*trait.TraitCondition, error) {
- if e.Integration == nil || !pointer.BoolDeref(t.Enabled, false) {
+ if e.Integration == nil || !ptr.Deref(t.Enabled, false) {
return false, nil, nil
}
if e.CamelCatalog == nil {
@@ -137,7 +137,7 @@ func (t *kedaTrait) Configure(e *trait.Environment) (bool,
*trait.TraitCondition
func (t *kedaTrait) Apply(e *trait.Environment) error {
if e.IntegrationInPhase(camelv1.IntegrationPhaseInitialization) {
- if !pointer.BoolDeref(t.HackControllerReplicas, false) {
+ if !ptr.Deref(t.HackControllerReplicas, false) {
return nil
}
if err := t.hackControllerReplicas(e); err != nil {
diff --git a/addons/keda/keda_test.go b/addons/keda/keda_test.go
index cc2bc95c0..b017df262 100644
--- a/addons/keda/keda_test.go
+++ b/addons/keda/keda_test.go
@@ -36,13 +36,13 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
func TestManualConfig(t *testing.T) {
keda, _ := NewKedaTrait().(*kedaTrait)
- keda.Enabled = pointer.Bool(true)
- keda.Auto = pointer.Bool(false)
+ keda.Enabled = ptr.To(true)
+ keda.Auto = ptr.To(false)
meta := map[string]string{
"prop": "val",
"camelCase": "VAL",
@@ -70,8 +70,8 @@ func TestManualConfig(t *testing.T) {
func TestConfigFromSecret(t *testing.T) {
keda, _ := NewKedaTrait().(*kedaTrait)
- keda.Enabled = pointer.Bool(true)
- keda.Auto = pointer.Bool(false)
+ keda.Enabled = ptr.To(true)
+ keda.Auto = ptr.To(false)
meta := map[string]string{
"prop": "val",
"camelCase": "VAL",
@@ -118,7 +118,7 @@ func TestConfigFromSecret(t *testing.T) {
func TestKameletAutoDetection(t *testing.T) {
keda, _ := NewKedaTrait().(*kedaTrait)
- keda.Enabled = pointer.Bool(true)
+ keda.Enabled = ptr.To(true)
env := createBasicTestEnvironment(
&camelv1.Kamelet{
ObjectMeta: metav1.ObjectMeta{
@@ -209,7 +209,7 @@ func TestKameletAutoDetection(t *testing.T) {
func TestPipeAutoDetection(t *testing.T) {
keda, _ := NewKedaTrait().(*kedaTrait)
- keda.Enabled = pointer.Bool(true)
+ keda.Enabled = ptr.To(true)
logEndpoint := "log:info"
klb := camelv1.Pipe{
ObjectMeta: metav1.ObjectMeta{
@@ -324,15 +324,15 @@ func TestPipeAutoDetection(t *testing.T) {
func TestHackReplicas(t *testing.T) {
keda, _ := NewKedaTrait().(*kedaTrait)
- keda.Enabled = pointer.Bool(true)
- keda.Auto = pointer.Bool(false)
+ keda.Enabled = ptr.To(true)
+ keda.Auto = ptr.To(false)
keda.Triggers = append(keda.Triggers, kedaTrigger{
Type: "custom",
Metadata: map[string]string{
"a": "b",
},
})
- keda.HackControllerReplicas = pointer.Bool(true)
+ keda.HackControllerReplicas = ptr.To(true)
env := createBasicTestEnvironment(
&camelv1.Integration{
ObjectMeta: metav1.ObjectMeta{
@@ -359,15 +359,15 @@ func TestHackReplicas(t *testing.T) {
func TestHackKLBReplicas(t *testing.T) {
keda, _ := NewKedaTrait().(*kedaTrait)
- keda.Enabled = pointer.Bool(true)
- keda.Auto = pointer.Bool(false)
+ keda.Enabled = ptr.To(true)
+ keda.Auto = ptr.To(false)
keda.Triggers = append(keda.Triggers, kedaTrigger{
Type: "custom",
Metadata: map[string]string{
"a": "b",
},
})
- keda.HackControllerReplicas = pointer.Bool(true)
+ keda.HackControllerReplicas = ptr.To(true)
env := createBasicTestEnvironment(
&camelv1.Pipe{
ObjectMeta: metav1.ObjectMeta{
diff --git a/addons/master/master.go b/addons/master/master.go
index 845b8bd15..7e3fbda0f 100644
--- a/addons/master/master.go
+++ b/addons/master/master.go
@@ -21,7 +21,7 @@ import (
"fmt"
"strings"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
@@ -85,7 +85,7 @@ func (t *masterTrait) Configure(e *trait.Environment) (bool,
*trait.TraitConditi
if e.Integration == nil {
return false, nil, nil
}
- if !pointer.BoolDeref(t.Enabled, true) {
+ if !ptr.Deref(t.Enabled, true) {
return false,
trait.NewIntegrationConditionUserDisabled(masterComponent), nil
}
if e.CamelCatalog == nil {
@@ -95,8 +95,8 @@ func (t *masterTrait) Configure(e *trait.Environment) (bool,
*trait.TraitConditi
return false, nil, nil
}
- if !pointer.BoolDeref(t.Auto, true) {
- return pointer.BoolDeref(t.Enabled, false), nil, nil
+ if !ptr.Deref(t.Auto, true) {
+ return ptr.Deref(t.Enabled, false), nil, nil
}
// Check if the master component has been used
@@ -118,7 +118,7 @@ func (t *masterTrait) Configure(e *trait.Environment)
(bool, *trait.TraitConditi
}
}
// No master component, can skip the trait execution
- if !pointer.BoolDeref(t.Enabled, false) {
+ if !ptr.Deref(t.Enabled, false) {
return false, nil, nil
}
}
@@ -132,7 +132,7 @@ func (t *masterTrait) Configure(e *trait.Environment)
(bool, *trait.TraitConditi
}
if t.ResourceType == nil {
- t.ResourceType = pointer.String(leaseResourceType)
+ t.ResourceType = ptr.To(leaseResourceType)
}
if t.LabelKey == nil {
@@ -144,7 +144,7 @@ func (t *masterTrait) Configure(e *trait.Environment)
(bool, *trait.TraitConditi
t.LabelValue = &e.Integration.Name
}
- return pointer.BoolDeref(t.Enabled, false), nil, nil
+ return ptr.Deref(t.Enabled, false), nil, nil
}
func (t *masterTrait) Apply(e *trait.Environment) error {
diff --git a/addons/resume/resume.go b/addons/resume/resume.go
index 2f44d1701..1dd92f050 100644
--- a/addons/resume/resume.go
+++ b/addons/resume/resume.go
@@ -25,7 +25,7 @@ import (
"github.com/apache/camel-k/v2/pkg/util"
"github.com/apache/camel-k/v2/pkg/util/kubernetes"
"github.com/apache/camel-k/v2/pkg/util/log"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
// The Resume trait can be used to manage and configure resume strategies.
@@ -76,7 +76,7 @@ func NewResumeTrait() trait.Trait {
}
func (r *resumeTrait) Configure(environment *trait.Environment) (bool,
*trait.TraitCondition, error) {
- if !pointer.BoolDeref(r.Enabled, false) {
+ if !ptr.Deref(r.Enabled, false) {
return false, nil, nil
}
if environment.CamelCatalog == nil {
@@ -86,7 +86,7 @@ func (r *resumeTrait) Configure(environment
*trait.Environment) (bool, *trait.Tr
return false, nil, nil
}
- if pointer.BoolDeref(r.Auto, true) {
+ if ptr.Deref(r.Auto, true) {
// Check which components have been used
sources, err :=
kubernetes.ResolveIntegrationSources(environment.Ctx, r.Client,
environment.Integration, environment.Resources)
if err != nil {
diff --git a/addons/telemetry/telemetry.go b/addons/telemetry/telemetry.go
index 81654830c..806bbd1b9 100644
--- a/addons/telemetry/telemetry.go
+++ b/addons/telemetry/telemetry.go
@@ -22,9 +22,8 @@ import (
"github.com/apache/camel-k/v2/pkg/util/boolean"
- "k8s.io/utils/pointer"
-
corev1 "k8s.io/api/core/v1"
+ "k8s.io/utils/ptr"
"github.com/apache/camel-k/v2/addons/telemetry/discovery"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
@@ -92,18 +91,18 @@ func NewTelemetryTrait() trait.Trait {
}
func (t *telemetryTrait) isForcefullyEnabled() bool {
- return pointer.BoolDeref(t.Enabled, false) &&
!pointer.BoolDeref(t.Auto, true)
+ return ptr.Deref(t.Enabled, false) && !ptr.Deref(t.Auto, true)
}
func (t *telemetryTrait) Configure(e *trait.Environment) (bool,
*trait.TraitCondition, error) {
- if e.Integration == nil || !pointer.BoolDeref(t.Enabled, false) {
+ if e.Integration == nil || !ptr.Deref(t.Enabled, false) {
return false, nil, nil
}
if e.CamelCatalog == nil && !t.isForcefullyEnabled() {
return false,
trait.NewIntegrationConditionPlatformDisabledCatalogMissing(), nil
}
- if !pointer.BoolDeref(t.Auto, true) {
+ if !ptr.Deref(t.Auto, true) {
return true, nil, nil
}
@@ -170,7 +169,7 @@ func (t *telemetryTrait) setCatalogConfiguration(e
*trait.Environment) {
if t.SamplerRatio != "" {
e.ApplicationProperties["camel.k.telemetry.samplerRatio"] =
t.SamplerRatio
}
- if pointer.BoolDeref(t.SamplerParentBased, true) {
+ if ptr.Deref(t.SamplerParentBased, true) {
e.ApplicationProperties["camel.k.telemetry.samplerParentBased"]
= boolean.TrueString
} else {
e.ApplicationProperties["camel.k.telemetry.samplerParentBased"]
= boolean.FalseString
@@ -207,7 +206,7 @@ func (t *telemetryTrait) setRuntimeProviderProperties(e
*trait.Environment) {
e.ApplicationProperties[appPropSamplerRatio] = t.SamplerRatio
}
if appPropSamplerParentBased := properties[propSamplerParentBased];
appPropSamplerParentBased != "" {
- if pointer.BoolDeref(t.SamplerParentBased, true) {
+ if ptr.Deref(t.SamplerParentBased, true) {
e.ApplicationProperties[appPropSamplerParentBased] =
"true"
} else {
e.ApplicationProperties[appPropSamplerParentBased] =
boolean.FalseString
diff --git a/addons/telemetry/telemetry_test.go
b/addons/telemetry/telemetry_test.go
index 1543780c7..d85431270 100644
--- a/addons/telemetry/telemetry_test.go
+++ b/addons/telemetry/telemetry_test.go
@@ -23,7 +23,7 @@ import (
"github.com/apache/camel-k/v2/pkg/util/boolean"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/trait"
@@ -37,7 +37,7 @@ func TestTelemetryTraitOnDefaultQuarkus(t *testing.T) {
e := createEnvironment(t, camel.QuarkusCatalog)
telemetry := NewTelemetryTrait()
tt, _ := telemetry.(*telemetryTrait)
- tt.Enabled = pointer.Bool(true)
+ tt.Enabled = ptr.To(true)
tt.Endpoint = "http://endpoint3";
ok, condition, err := telemetry.Configure(e)
require.NoError(t, err)
@@ -64,12 +64,12 @@ func TestTelemetryTraitWithValues(t *testing.T) {
e := createEnvironment(t, camel.QuarkusCatalog)
telemetry := NewTelemetryTrait()
tt, _ := telemetry.(*telemetryTrait)
- tt.Enabled = pointer.Bool(true)
+ tt.Enabled = ptr.To(true)
tt.Endpoint = "http://endpoint3";
tt.ServiceName = "Test"
tt.Sampler = "ratio"
tt.SamplerRatio = "0.001"
- tt.SamplerParentBased = pointer.Bool(false)
+ tt.SamplerParentBased = ptr.To(false)
ok, condition, err := telemetry.Configure(e)
require.NoError(t, err)
assert.True(t, ok)
@@ -97,13 +97,13 @@ func TestTelemetryForSourceless(t *testing.T) {
e.CamelCatalog = nil
telemetry := NewTelemetryTrait()
tt, _ := telemetry.(*telemetryTrait)
- tt.Enabled = pointer.Bool(true)
- tt.Auto = pointer.Bool(false)
+ tt.Enabled = ptr.To(true)
+ tt.Auto = ptr.To(false)
tt.Endpoint = "http://endpoint3";
tt.ServiceName = "Test"
tt.Sampler = "ratio"
tt.SamplerRatio = "0.001"
- tt.SamplerParentBased = pointer.Bool(false)
+ tt.SamplerParentBased = ptr.To(false)
assert.True(t, tt.isForcefullyEnabled())
ok, condition, err := telemetry.Configure(e)
diff --git a/addons/threescale/3scale.go b/addons/threescale/3scale.go
index 2bab8ea21..54750c337 100644
--- a/addons/threescale/3scale.go
+++ b/addons/threescale/3scale.go
@@ -21,7 +21,7 @@ import (
"strconv"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -88,14 +88,14 @@ func NewThreeScaleTrait() trait.Trait {
}
func (t *threeScaleTrait) Configure(e *trait.Environment) (bool,
*trait.TraitCondition, error) {
- if e.Integration == nil || !pointer.BoolDeref(t.Enabled, false) {
+ if e.Integration == nil || !ptr.Deref(t.Enabled, false) {
return false, nil, nil
}
if !e.IntegrationInRunningPhases() {
return false, nil, nil
}
- if pointer.BoolDeref(t.Auto, true) {
+ if ptr.Deref(t.Auto, true) {
if t.Scheme == "" {
t.Scheme = ThreeScaleSchemeDefaultValue
}
diff --git a/addons/threescale/3scale_test.go b/addons/threescale/3scale_test.go
index 65a934bd3..4aba8fdce 100644
--- a/addons/threescale/3scale_test.go
+++ b/addons/threescale/3scale_test.go
@@ -28,7 +28,7 @@ import (
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
func TestThreeScaleDisabled(t *testing.T) {
@@ -50,7 +50,7 @@ func TestThreeScaleInjection(t *testing.T) {
svc, e := createEnvironment(t)
threeScale := NewThreeScaleTrait()
tst, _ := threeScale.(*threeScaleTrait)
- tst.Enabled = pointer.Bool(true)
+ tst.Enabled = ptr.To(true)
ok, condition, err := threeScale.Configure(e)
require.NoError(t, err)
assert.True(t, ok)
@@ -70,8 +70,8 @@ func TestThreeScaleInjectionNoAPIPath(t *testing.T) {
svc, e := createEnvironment(t)
threeScale := NewThreeScaleTrait()
tst, _ := threeScale.(*threeScaleTrait)
- tst.Enabled = pointer.Bool(true)
- tst.DescriptionPath = pointer.String("")
+ tst.Enabled = ptr.To(true)
+ tst.DescriptionPath = ptr.To("")
ok, condition, err := threeScale.Configure(e)
require.NoError(t, err)
assert.True(t, ok)
diff --git a/addons/tracing/tracing.go b/addons/tracing/tracing.go
index 7acbd7d47..80a302be4 100644
--- a/addons/tracing/tracing.go
+++ b/addons/tracing/tracing.go
@@ -18,13 +18,12 @@ limitations under the License.
package tracing
import (
- "k8s.io/utils/pointer"
-
"github.com/apache/camel-k/v2/addons/tracing/discovery"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
"github.com/apache/camel-k/v2/pkg/trait"
"github.com/apache/camel-k/v2/pkg/util"
+ "k8s.io/utils/ptr"
)
// WARNING: The Tracing trait has been **deprecated** in favor of the
xref:traits:telemetry.adoc[Telemetry] trait.
@@ -88,14 +87,14 @@ func NewTracingTrait() trait.Trait {
}
func (t *tracingTrait) Configure(e *trait.Environment) (bool,
*trait.TraitCondition, error) {
- if e.Integration == nil || !pointer.BoolDeref(t.Enabled, false) {
+ if e.Integration == nil || !ptr.Deref(t.Enabled, false) {
return false, nil, nil
}
if e.CamelCatalog == nil {
return false,
trait.NewIntegrationConditionPlatformDisabledCatalogMissing(), nil
}
- if !pointer.BoolDeref(t.Auto, true) {
+ if !ptr.Deref(t.Auto, true) {
return true, nil, nil
}
diff --git a/addons/tracing/tracing_test.go b/addons/tracing/tracing_test.go
index f441a9d46..f5bc525ce 100644
--- a/addons/tracing/tracing_test.go
+++ b/addons/tracing/tracing_test.go
@@ -21,7 +21,7 @@ import (
"testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/trait"
@@ -35,7 +35,7 @@ func TestTracingTraitOnQuarkus(t *testing.T) {
e := createEnvironment(t, camel.QuarkusCatalog)
tracing := NewTracingTrait()
tt, _ := tracing.(*tracingTrait)
- tt.Enabled = pointer.Bool(true)
+ tt.Enabled = ptr.To(true)
tt.Endpoint = "http://endpoint3";
ok, condition, err := tracing.Configure(e)
require.NoError(t, err)
diff --git a/addons/vault/aws/aws_secrets_manager.go
b/addons/vault/aws/aws_secrets_manager.go
index a89ec8cdf..6e57e4a8c 100644
--- a/addons/vault/aws/aws_secrets_manager.go
+++ b/addons/vault/aws/aws_secrets_manager.go
@@ -27,7 +27,7 @@ import (
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
"github.com/apache/camel-k/v2/pkg/trait"
"github.com/apache/camel-k/v2/pkg/util"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
// The Secrets Manager trait can be used to use secrets from AWS Secrets
Manager
@@ -83,7 +83,7 @@ func NewAwsSecretsManagerTrait() trait.Trait {
}
func (t *awsSecretsManagerTrait) Configure(environment *trait.Environment)
(bool, *trait.TraitCondition, error) {
- if environment.Integration == nil || !pointer.BoolDeref(t.Enabled,
false) {
+ if environment.Integration == nil || !ptr.Deref(t.Enabled, false) {
return false, nil, nil
}
@@ -92,13 +92,13 @@ func (t *awsSecretsManagerTrait) Configure(environment
*trait.Environment) (bool
}
if t.UseDefaultCredentialsProvider == nil {
- t.UseDefaultCredentialsProvider = pointer.Bool(false)
+ t.UseDefaultCredentialsProvider = ptr.To(false)
}
if t.ContextReloadEnabled == nil {
- t.ContextReloadEnabled = pointer.Bool(false)
+ t.ContextReloadEnabled = ptr.To(false)
}
if t.RefreshEnabled == nil {
- t.RefreshEnabled = pointer.Bool(false)
+ t.RefreshEnabled = ptr.To(false)
}
return true, nil, nil
diff --git a/addons/vault/aws/aws_secrets_manager_test.go
b/addons/vault/aws/aws_secrets_manager_test.go
index 8027ff40f..8c9ab48ba 100644
--- a/addons/vault/aws/aws_secrets_manager_test.go
+++ b/addons/vault/aws/aws_secrets_manager_test.go
@@ -26,7 +26,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/trait"
@@ -41,8 +41,8 @@ func TestAwsSecretsManagerTraitApply(t *testing.T) {
e := createEnvironment(t, camel.QuarkusCatalog)
aws := NewAwsSecretsManagerTrait()
secrets, _ := aws.(*awsSecretsManagerTrait)
- secrets.Enabled = pointer.Bool(true)
- secrets.UseDefaultCredentialsProvider = pointer.Bool(false)
+ secrets.Enabled = ptr.To(true)
+ secrets.UseDefaultCredentialsProvider = ptr.To(false)
secrets.Region = "eu-west-1"
secrets.AccessKey = "access-key"
secrets.SecretKey = "secret-key"
@@ -65,7 +65,7 @@ func TestAwsSecretsManagerTraitNoDefaultCreds(t *testing.T) {
e := createEnvironment(t, camel.QuarkusCatalog)
aws := NewAwsSecretsManagerTrait()
secrets, _ := aws.(*awsSecretsManagerTrait)
- secrets.Enabled = pointer.Bool(true)
+ secrets.Enabled = ptr.To(true)
secrets.Region = "eu-west-1"
secrets.AccessKey = "access-key"
secrets.SecretKey = "secret-key"
@@ -105,7 +105,7 @@ func TestAwsSecretsManagerTraitWithSecrets(t *testing.T) {
aws := NewAwsSecretsManagerTrait()
secrets, _ := aws.(*awsSecretsManagerTrait)
- secrets.Enabled = pointer.Bool(true)
+ secrets.Enabled = ptr.To(true)
secrets.Region = "eu-west-1"
secrets.AccessKey = "secret:my-secret2/aws-access-key"
secrets.SecretKey = "secret:my-secret1/aws-secret-key"
@@ -145,7 +145,7 @@ func TestAwsSecretsManagerTraitWithConfigMap(t *testing.T) {
aws := NewAwsSecretsManagerTrait()
secrets, _ := aws.(*awsSecretsManagerTrait)
- secrets.Enabled = pointer.Bool(true)
+ secrets.Enabled = ptr.To(true)
secrets.Region = "eu-west-1"
secrets.AccessKey = "configmap:my-configmap2/aws-access-key"
secrets.SecretKey = "configmap:my-configmap1/aws-secret-key"
diff --git a/addons/vault/azure/azure_key_vault.go
b/addons/vault/azure/azure_key_vault.go
index e1a534415..0dcdfc5b8 100644
--- a/addons/vault/azure/azure_key_vault.go
+++ b/addons/vault/azure/azure_key_vault.go
@@ -27,7 +27,7 @@ import (
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
"github.com/apache/camel-k/v2/pkg/trait"
"github.com/apache/camel-k/v2/pkg/util"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
// The Azure Key Vault trait can be used to use secrets from Azure Key Vault
service
@@ -97,7 +97,7 @@ func NewAzureKeyVaultTrait() trait.Trait {
}
func (t *azureKeyVaultTrait) Configure(environment *trait.Environment) (bool,
*trait.TraitCondition, error) {
- if environment.Integration == nil || !pointer.BoolDeref(t.Enabled,
false) {
+ if environment.Integration == nil || !ptr.Deref(t.Enabled, false) {
return false, nil, nil
}
@@ -106,15 +106,15 @@ func (t *azureKeyVaultTrait) Configure(environment
*trait.Environment) (bool, *t
}
if t.ContextReloadEnabled == nil {
- t.ContextReloadEnabled = pointer.Bool(false)
+ t.ContextReloadEnabled = ptr.To(false)
}
if t.RefreshEnabled == nil {
- t.RefreshEnabled = pointer.Bool(false)
+ t.RefreshEnabled = ptr.To(false)
}
if t.AzureIdentityEnabled == nil {
- t.AzureIdentityEnabled = pointer.Bool(false)
+ t.AzureIdentityEnabled = ptr.To(false)
}
return true, nil, nil
diff --git a/addons/vault/azure/azure_key_vault_test.go
b/addons/vault/azure/azure_key_vault_test.go
index cc9c61171..e829ff0a9 100644
--- a/addons/vault/azure/azure_key_vault_test.go
+++ b/addons/vault/azure/azure_key_vault_test.go
@@ -22,9 +22,9 @@ import (
"github.com/apache/camel-k/v2/pkg/util/test"
corev1 "k8s.io/api/core/v1"
+ "k8s.io/utils/ptr"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/trait"
@@ -39,7 +39,7 @@ func TestAzureKeyVaultTraitApply(t *testing.T) {
e := createEnvironment(t, camel.QuarkusCatalog)
azure := NewAzureKeyVaultTrait()
secrets, _ := azure.(*azureKeyVaultTrait)
- secrets.Enabled = pointer.Bool(true)
+ secrets.Enabled = ptr.To(true)
secrets.TenantID = "tenant-id"
secrets.ClientID = "client-id"
secrets.ClientSecret = "secret"
@@ -78,12 +78,12 @@ func TestAzureKeyVaultTraitApplyWithConfigmapAndRefresh(t
*testing.T) {
})
azure := NewAzureKeyVaultTrait()
secrets, _ := azure.(*azureKeyVaultTrait)
- secrets.Enabled = pointer.Bool(true)
+ secrets.Enabled = ptr.To(true)
secrets.TenantID = "tenant-id"
secrets.ClientID = "client-id"
secrets.ClientSecret = "configmap:my-configmap1/azure-client-secret"
secrets.VaultName = "my-vault"
- secrets.RefreshEnabled = pointer.Bool(true)
+ secrets.RefreshEnabled = ptr.To(true)
secrets.BlobAccessKey = "configmap:my-configmap2/azure-storage-blob-key"
secrets.BlobAccountName = "camel-k"
secrets.BlobContainerName = "camel-k-container"
@@ -125,12 +125,12 @@ func TestAzureKeyVaultTraitApplyWithSecretAndRefresh(t
*testing.T) {
})
azure := NewAzureKeyVaultTrait()
secrets, _ := azure.(*azureKeyVaultTrait)
- secrets.Enabled = pointer.Bool(true)
+ secrets.Enabled = ptr.To(true)
secrets.TenantID = "tenant-id"
secrets.ClientID = "client-id"
secrets.ClientSecret = "secret:my-secret1/azure-client-secret"
secrets.VaultName = "my-vault"
- secrets.RefreshEnabled = pointer.Bool(true)
+ secrets.RefreshEnabled = ptr.To(true)
secrets.BlobAccessKey = "secret:my-secret2/azure-storage-blob-key"
secrets.BlobAccountName = "camel-k"
secrets.BlobContainerName = "camel-k-container"
@@ -172,13 +172,13 @@ func
TestAzureKeyVaultTraitAzureIdentityEnabledApplyWithSecretAndRefresh(t *test
})
azure := NewAzureKeyVaultTrait()
secrets, _ := azure.(*azureKeyVaultTrait)
- secrets.Enabled = pointer.Bool(true)
+ secrets.Enabled = ptr.To(true)
secrets.TenantID = "tenant-id"
secrets.ClientID = "client-id"
secrets.ClientSecret = "secret:my-secret1/azure-client-secret"
secrets.VaultName = "my-vault"
- secrets.RefreshEnabled = pointer.Bool(true)
- secrets.AzureIdentityEnabled = pointer.Bool(true)
+ secrets.RefreshEnabled = ptr.To(true)
+ secrets.AzureIdentityEnabled = ptr.To(true)
secrets.BlobAccessKey = "secret:my-secret2/azure-storage-blob-key"
secrets.BlobAccountName = "camel-k"
secrets.BlobContainerName = "camel-k-container"
diff --git a/addons/vault/gcp/gcp_secret_manager.go
b/addons/vault/gcp/gcp_secret_manager.go
index 12ae1a2d3..8fcdbfc0e 100644
--- a/addons/vault/gcp/gcp_secret_manager.go
+++ b/addons/vault/gcp/gcp_secret_manager.go
@@ -24,7 +24,7 @@ import (
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
"github.com/apache/camel-k/v2/pkg/trait"
"github.com/apache/camel-k/v2/pkg/util"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
// The Google Secret Manager trait can be used to use secrets from Google
Secret Manager
@@ -76,7 +76,7 @@ func NewGcpSecretManagerTrait() trait.Trait {
}
func (t *gcpSecretManagerTrait) Configure(environment *trait.Environment)
(bool, *trait.TraitCondition, error) {
- if environment.Integration == nil || !pointer.BoolDeref(t.Enabled,
false) {
+ if environment.Integration == nil || !ptr.Deref(t.Enabled, false) {
return false, nil, nil
}
@@ -85,15 +85,15 @@ func (t *gcpSecretManagerTrait) Configure(environment
*trait.Environment) (bool,
}
if t.UseDefaultInstance == nil {
- t.UseDefaultInstance = pointer.Bool(false)
+ t.UseDefaultInstance = ptr.To(false)
}
if t.ContextReloadEnabled == nil {
- t.ContextReloadEnabled = pointer.Bool(false)
+ t.ContextReloadEnabled = ptr.To(false)
}
if t.RefreshEnabled == nil {
- t.RefreshEnabled = pointer.Bool(false)
+ t.RefreshEnabled = ptr.To(false)
}
return true, nil, nil
diff --git a/addons/vault/gcp/gcp_secret_manager_test.go
b/addons/vault/gcp/gcp_secret_manager_test.go
index 02b82cd7e..1f36e9b96 100644
--- a/addons/vault/gcp/gcp_secret_manager_test.go
+++ b/addons/vault/gcp/gcp_secret_manager_test.go
@@ -23,7 +23,7 @@ import (
"github.com/apache/camel-k/v2/pkg/util/boolean"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/trait"
@@ -37,8 +37,8 @@ func TestGcpSecretManagerTraitApply(t *testing.T) {
e := createEnvironment(t, camel.QuarkusCatalog)
gcp := NewGcpSecretManagerTrait()
secrets, _ := gcp.(*gcpSecretManagerTrait)
- secrets.Enabled = pointer.Bool(true)
- secrets.UseDefaultInstance = pointer.Bool(false)
+ secrets.Enabled = ptr.To(true)
+ secrets.UseDefaultInstance = ptr.To(false)
secrets.ProjectID = "project-gcp"
secrets.ServiceAccountKey = "file:////usr/local/serviceaccount.json"
ok, condition, err := secrets.Configure(e)
@@ -58,8 +58,8 @@ func TestGcpSecretManagerTraitNoDefaultCreds(t *testing.T) {
e := createEnvironment(t, camel.QuarkusCatalog)
gcp := NewGcpSecretManagerTrait()
secrets, _ := gcp.(*gcpSecretManagerTrait)
- secrets.Enabled = pointer.Bool(true)
- secrets.UseDefaultInstance = pointer.Bool(false)
+ secrets.Enabled = ptr.To(true)
+ secrets.UseDefaultInstance = ptr.To(false)
secrets.ProjectID = "project-gcp"
secrets.ServiceAccountKey = "file:////usr/local/serviceaccount.json"
ok, condition, err := secrets.Configure(e)
diff --git a/addons/vault/hashicorp/hashicorp_vault.go
b/addons/vault/hashicorp/hashicorp_vault.go
index 2542e157e..d8aeb00fd 100644
--- a/addons/vault/hashicorp/hashicorp_vault.go
+++ b/addons/vault/hashicorp/hashicorp_vault.go
@@ -25,7 +25,7 @@ import (
"github.com/apache/camel-k/v2/pkg/trait"
"github.com/apache/camel-k/v2/pkg/util"
"github.com/apache/camel-k/v2/pkg/util/kubernetes"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
// The Hashicorp Vault trait can be used to use secrets from Hashicorp Vault
@@ -69,7 +69,7 @@ func NewHashicorpVaultTrait() trait.Trait {
}
func (t *hashicorpVaultTrait) Configure(environment *trait.Environment) (bool,
*trait.TraitCondition, error) {
- if environment.Integration == nil || !pointer.BoolDeref(t.Enabled,
false) {
+ if environment.Integration == nil || !ptr.Deref(t.Enabled, false) {
return false, nil, nil
}
diff --git a/addons/vault/hashicorp/hashicorp_vault_test.go
b/addons/vault/hashicorp/hashicorp_vault_test.go
index ed21fb6c0..3e0c101cf 100644
--- a/addons/vault/hashicorp/hashicorp_vault_test.go
+++ b/addons/vault/hashicorp/hashicorp_vault_test.go
@@ -22,9 +22,9 @@ import (
"github.com/apache/camel-k/v2/pkg/util/test"
corev1 "k8s.io/api/core/v1"
+ "k8s.io/utils/ptr"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/trait"
@@ -39,7 +39,7 @@ func TestHashicorpVaultTraitApply(t *testing.T) {
e := createEnvironment(t, camel.QuarkusCatalog)
hashicorp := NewHashicorpVaultTrait()
secrets, _ := hashicorp.(*hashicorpVaultTrait)
- secrets.Enabled = pointer.Bool(true)
+ secrets.Enabled = ptr.To(true)
secrets.Engine = "test"
secrets.Token = "wwww.testx1234590"
secrets.Host = "localhost"
@@ -73,7 +73,7 @@ func TestHashicorpVaultTraitWithSecretApply(t *testing.T) {
})
hashicorp := NewHashicorpVaultTrait()
secrets, _ := hashicorp.(*hashicorpVaultTrait)
- secrets.Enabled = pointer.Bool(true)
+ secrets.Enabled = ptr.To(true)
secrets.Engine = "test"
secrets.Token = "secret:my-secret1/hashicorp-vault-token"
secrets.Host = "localhost"
@@ -107,7 +107,7 @@ func TestHashicorpVaultTraitWithConfigMapApply(t
*testing.T) {
})
hashicorp := NewHashicorpVaultTrait()
secrets, _ := hashicorp.(*hashicorpVaultTrait)
- secrets.Enabled = pointer.Bool(true)
+ secrets.Enabled = ptr.To(true)
secrets.Engine = "test"
secrets.Token = "configmap:my-configmap1/hashicorp-vault-token"
secrets.Host = "localhost"
diff --git a/e2e/common/traits/toleration_test.go
b/e2e/common/traits/toleration_test.go
index 000242c14..0bd97ada6 100644
--- a/e2e/common/traits/toleration_test.go
+++ b/e2e/common/traits/toleration_test.go
@@ -30,7 +30,7 @@ import (
. "github.com/onsi/gomega/gstruct"
corev1 "k8s.io/api/core/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
. "github.com/apache/camel-k/v2/e2e/support"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
@@ -53,7 +53,7 @@ func TestTolerationTrait(t *testing.T) {
Key: "camel.apache.org/master",
Operator: corev1.TolerationOpExists,
Effect: corev1.TaintEffectNoExecute,
- TolerationSeconds: pointer.Int64(300),
+ TolerationSeconds: ptr.To(int64(300)),
}))
})
@@ -71,7 +71,7 @@ func TestTolerationTrait(t *testing.T) {
Key: "camel.apache.org/master",
Operator: corev1.TolerationOpEqual,
Value: "test", Effect:
corev1.TaintEffectNoExecute,
- TolerationSeconds: pointer.Int64(300),
+ TolerationSeconds: ptr.To(int64(300)),
}))
})
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index 4bef76677..f8f8a659a 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -61,7 +61,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/rest"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
@@ -420,7 +420,7 @@ func IntegrationLogs(t *testing.T, ctx context.Context, ns,
name string) func()
}
options := corev1.PodLogOptions{
- TailLines: pointer.Int64(100),
+ TailLines: ptr.To(int64(100)),
}
for _, container := range pod.Status.ContainerStatuses {
@@ -442,7 +442,7 @@ func IntegrationLogs(t *testing.T, ctx context.Context, ns,
name string) func()
func TailedLogs(t *testing.T, ctx context.Context, ns, name string, numLines
int64) func() string {
return func() string {
options := corev1.PodLogOptions{
- TailLines: pointer.Int64(numLines),
+ TailLines: ptr.To(numLines),
}
return Logs(t, ctx, ns, name, options)()
@@ -1578,8 +1578,8 @@ func CreatePlainTextConfigmapWithOwnerRefWithLabels(t
*testing.T, ctx context.Co
Kind: "Integration",
Name: orname,
UID: uid,
- Controller: pointer.Bool(true),
- BlockOwnerDeletion: pointer.Bool(true),
+ Controller: ptr.To(true),
+ BlockOwnerDeletion: ptr.To(true),
},
},
Labels: labels,
diff --git a/pkg/apis/camel/v1/common_types_support_test.go
b/pkg/apis/camel/v1/common_types_support_test.go
index 082696987..e04a6e834 100644
--- a/pkg/apis/camel/v1/common_types_support_test.go
+++ b/pkg/apis/camel/v1/common_types_support_test.go
@@ -26,18 +26,18 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
func TestTraitsMerge(t *testing.T) {
t1 := Traits{
Container: &trait.ContainerTrait{
Name: "test-container",
- Auto: pointer.Bool(false),
+ Auto: ptr.To(false),
ServicePort: 81,
},
Logging: &trait.LoggingTrait{
- Color: pointer.Bool(false),
+ Color: ptr.To(false),
Level: "INFO",
},
Addons: map[string]AddonTrait{
@@ -55,7 +55,7 @@ func TestTraitsMerge(t *testing.T) {
PortName: "http-8081",
},
Logging: &trait.LoggingTrait{
- Color: pointer.Bool(true),
+ Color: ptr.To(true),
Level: "DEBUG",
},
Addons: map[string]AddonTrait{
@@ -70,13 +70,13 @@ func TestTraitsMerge(t *testing.T) {
require.NoError(t, err)
assert.NotNil(t, t1.Container)
- assert.False(t, pointer.BoolDeref(t1.Container.Auto, true))
+ assert.False(t, ptr.Deref(t1.Container.Auto, true))
assert.Equal(t, "http-8081", t1.Container.PortName)
assert.Equal(t, 81, t1.Container.ServicePort)
// values from merged trait take precedence over the original ones
assert.NotNil(t, t1.Logging)
- assert.True(t, pointer.BoolDeref(t1.Logging.Color, false))
+ assert.True(t, ptr.Deref(t1.Logging.Color, false))
assert.Equal(t, "DEBUG", t1.Logging.Level)
assert.NotNil(t, t1.Addons)
diff --git a/pkg/cmd/debug.go b/pkg/cmd/debug.go
index b6c38262c..bdbe94616 100644
--- a/pkg/cmd/debug.go
+++ b/pkg/cmd/debug.go
@@ -33,7 +33,7 @@ import (
"github.com/spf13/cobra"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
func newCmdDebug(rootCmdOptions *RootCmdOptions) (*cobra.Command,
*debugCmdOptions) {
@@ -145,8 +145,8 @@ func (o *debugCmdOptions) toggle(it *v1.Integration, active
bool) *v1.Integratio
jvmTrait := it.Spec.Traits.JVM
if active {
- jvmTrait.Debug = pointer.Bool(true)
- jvmTrait.DebugSuspend = pointer.Bool(o.Suspend)
+ jvmTrait.Debug = ptr.To(true)
+ jvmTrait.DebugSuspend = ptr.To(o.Suspend)
} else {
jvmTrait.Debug = nil
jvmTrait.DebugSuspend = nil
diff --git a/pkg/cmd/debug_test.go b/pkg/cmd/debug_test.go
index 67d5e23d0..abd7957bf 100644
--- a/pkg/cmd/debug_test.go
+++ b/pkg/cmd/debug_test.go
@@ -27,7 +27,7 @@ import (
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
const cmdDebug = "debug"
@@ -58,7 +58,7 @@ func TestToggle(t *testing.T) {
_, debugCmdOptions := initializeDebugCmdOptions(t, &defaultIntegration,
&defaultKit)
// toggle on
it := debugCmdOptions.toggle(&defaultIntegration, true)
- assert.Equal(t, pointer.Bool(true), it.Spec.Traits.JVM.Debug)
+ assert.Equal(t, ptr.To(true), it.Spec.Traits.JVM.Debug)
// toggle off
it = debugCmdOptions.toggle(&defaultIntegration, false)
assert.Nil(t, it.Spec.Traits.JVM.Debug)
diff --git a/pkg/cmd/run_test.go b/pkg/cmd/run_test.go
index 3d3a19a5f..0cfa30a92 100644
--- a/pkg/cmd/run_test.go
+++ b/pkg/cmd/run_test.go
@@ -31,11 +31,11 @@ import (
"github.com/apache/camel-k/v2/pkg/trait"
"github.com/apache/camel-k/v2/pkg/util/defaults"
"github.com/apache/camel-k/v2/pkg/util/test"
+ "k8s.io/utils/ptr"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- "k8s.io/utils/pointer"
)
const (
@@ -455,9 +455,9 @@ func TestConfigureTraits(t *testing.T) {
traitMap, err := trait.ToTraitMap(traits)
require.NoError(t, err)
assert.Len(t, traitMap, 3)
- assertTraitConfiguration(t, traits.Affinity,
&traitv1.AffinityTrait{PodAffinity: pointer.Bool(false)})
- assertTraitConfiguration(t, traits.Environment,
&traitv1.EnvironmentTrait{ContainerMeta: pointer.Bool(false)})
- assertTraitConfiguration(t, traits.Prometheus,
&traitv1.PrometheusTrait{PodMonitor: pointer.Bool(false)})
+ assertTraitConfiguration(t, traits.Affinity,
&traitv1.AffinityTrait{PodAffinity: ptr.To(false)})
+ assertTraitConfiguration(t, traits.Environment,
&traitv1.EnvironmentTrait{ContainerMeta: ptr.To(false)})
+ assertTraitConfiguration(t, traits.Prometheus,
&traitv1.PrometheusTrait{PodMonitor: ptr.To(false)})
}
func assertTraitConfiguration(t *testing.T, trait interface{}, expected
interface{}) {
diff --git a/pkg/controller/integration/integration_controller.go
b/pkg/controller/integration/integration_controller.go
index a3c895c2f..04cb6017b 100644
--- a/pkg/controller/integration/integration_controller.go
+++ b/pkg/controller/integration/integration_controller.go
@@ -32,7 +32,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/tools/record"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
"sigs.k8s.io/controller-runtime/pkg/builder"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/event"
@@ -202,7 +202,7 @@ func enqueueRequestsFromConfigFunc(ctx context.Context, c
client.Client, res ctr
for _, integration := range list.Items {
found := false
- if integration.Spec.Traits.Mount == nil ||
!pointer.BoolDeref(integration.Spec.Traits.Mount.HotReload, false) {
+ if integration.Spec.Traits.Mount == nil ||
!ptr.Deref(integration.Spec.Traits.Mount.HotReload, false) {
continue
}
for _, c := range integration.Spec.Traits.Mount.Configs {
diff --git a/pkg/controller/integration/monitor.go
b/pkg/controller/integration/monitor.go
index 5d908cca6..6342269b0 100644
--- a/pkg/controller/integration/monitor.go
+++ b/pkg/controller/integration/monitor.go
@@ -31,7 +31,7 @@ import (
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/selection"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
@@ -310,7 +310,7 @@ func isIntegrationKitResetRequired(integration
*v1.Integration, kit *v1.Integrat
func getIntegrationSecretAndConfigmapResourceVersions(ctx context.Context,
client client.Client, integration *v1.Integration) ([]string, []string) {
configmaps := make([]string, 0)
secrets := make([]string, 0)
- if integration.Spec.Traits.Mount != nil &&
pointer.BoolDeref(integration.Spec.Traits.Mount.HotReload, false) {
+ if integration.Spec.Traits.Mount != nil &&
ptr.Deref(integration.Spec.Traits.Mount.HotReload, false) {
mergedResources := make([]string, 0)
mergedResources = append(mergedResources,
integration.Spec.Traits.Mount.Configs...)
mergedResources = append(mergedResources,
integration.Spec.Traits.Mount.Resources...)
diff --git a/pkg/controller/integration/monitor_test.go
b/pkg/controller/integration/monitor_test.go
index 5d444bf3d..a655edea9 100644
--- a/pkg/controller/integration/monitor_test.go
+++ b/pkg/controller/integration/monitor_test.go
@@ -24,7 +24,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -51,7 +51,7 @@ func TestGetIntegrationSecretAndConfigmapResourceVersions(t
*testing.T) {
Name: "sec-test",
Namespace: "default",
},
- Immutable: pointer.Bool(true),
+ Immutable: ptr.To(true),
}
sec.Data = map[string][]byte{
"test.txt": []byte("hello"),
@@ -81,7 +81,7 @@ func TestGetIntegrationSecretAndConfigmapResourceVersions(t
*testing.T) {
assert.Len(t, configmaps, 0)
assert.Len(t, secrets, 0)
// Enabled hot reload (true)
- it.Spec.Traits.Mount.HotReload = pointer.Bool(true)
+ it.Spec.Traits.Mount.HotReload = ptr.To(true)
configmaps, secrets =
getIntegrationSecretAndConfigmapResourceVersions(context.TODO(), c, it)
assert.Len(t, configmaps, 1)
assert.Len(t, secrets, 1)
diff --git a/pkg/controller/pipe/initialize_test.go
b/pkg/controller/pipe/initialize_test.go
index 2f64cb5df..f12bf7386 100644
--- a/pkg/controller/pipe/initialize_test.go
+++ b/pkg/controller/pipe/initialize_test.go
@@ -24,7 +24,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
@@ -79,10 +79,10 @@ func TestNewPipeWithComponentsCreating(t *testing.T) {
},
Spec: v1.PipeSpec{
Source: v1.Endpoint{
- URI: pointer.String("timer:tick"),
+ URI: ptr.To("timer:tick"),
},
Sink: v1.Endpoint{
- URI: pointer.String("log:info"),
+ URI: ptr.To("log:info"),
},
},
}
@@ -248,7 +248,7 @@ func TestNewPipeUnsupportedRef(t *testing.T) {
},
Spec: v1.PipeSpec{
Source: v1.Endpoint{
- URI: pointer.String("timer:tick"),
+ URI: ptr.To("timer:tick"),
},
Sink: v1.Endpoint{
Ref: &corev1.ObjectReference{
diff --git a/pkg/controller/pipe/integration_test.go
b/pkg/controller/pipe/integration_test.go
index 9a6c69229..3b334f786 100644
--- a/pkg/controller/pipe/integration_test.go
+++ b/pkg/controller/pipe/integration_test.go
@@ -27,7 +27,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
func TestCreateIntegrationForPipe(t *testing.T) {
@@ -202,7 +202,7 @@ func TestExtractTraitAnnotations(t *testing.T) {
}
traits, err := extractAndDeleteTraits(client, annotations)
require.NoError(t, err)
- assert.Equal(t, pointer.Bool(true), traits.Service.Enabled)
+ assert.Equal(t, ptr.To(true), traits.Service.Enabled)
assert.Equal(t, corev1.PullNever, traits.Container.ImagePullPolicy)
assert.Equal(t, "1.2.3", traits.Camel.RuntimeVersion)
assert.Equal(t, []string{"prop1=1", "prop2=2"}, traits.Camel.Properties)
@@ -256,5 +256,5 @@ func
TestCreateIntegrationTraitsForPipeWithTraitAnnotations(t *testing.T) {
assert.Equal(t, map[string]string{
"my-annotation": "my-annotation-val",
}, it.Annotations)
- assert.Equal(t, pointer.Bool(true), it.Spec.Traits.Service.Enabled)
+ assert.Equal(t, ptr.To(true), it.Spec.Traits.Service.Enabled)
}
diff --git a/pkg/controller/pipe/monitor_test.go
b/pkg/controller/pipe/monitor_test.go
index d3dde71da..fc6b37baf 100644
--- a/pkg/controller/pipe/monitor_test.go
+++ b/pkg/controller/pipe/monitor_test.go
@@ -23,7 +23,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
@@ -46,10 +46,10 @@ func TestPipeIntegrationSpecChanged(t *testing.T) {
},
Spec: v1.PipeSpec{
Source: v1.Endpoint{
- URI: pointer.String("timer:tick"),
+ URI: ptr.To("timer:tick"),
},
Sink: v1.Endpoint{
- URI: pointer.String("log:info"),
+ URI: ptr.To("log:info"),
},
},
Status: v1.PipeStatus{
@@ -95,10 +95,10 @@ func TestPipeIntegrationReady(t *testing.T) {
},
Spec: v1.PipeSpec{
Source: v1.Endpoint{
- URI: pointer.String("timer:tick"),
+ URI: ptr.To("timer:tick"),
},
Sink: v1.Endpoint{
- URI: pointer.String("log:info"),
+ URI: ptr.To("log:info"),
},
},
Status: v1.PipeStatus{
@@ -140,10 +140,10 @@ func TestPipeIntegrationUnknown(t *testing.T) {
},
Spec: v1.PipeSpec{
Source: v1.Endpoint{
- URI: pointer.String("timer:tick"),
+ URI: ptr.To("timer:tick"),
},
Sink: v1.Endpoint{
- URI: pointer.String("log:info"),
+ URI: ptr.To("log:info"),
},
},
Status: v1.PipeStatus{
@@ -184,10 +184,10 @@ func TestPipeIntegrationError(t *testing.T) {
},
Spec: v1.PipeSpec{
Source: v1.Endpoint{
- URI: pointer.String("timer:tick"),
+ URI: ptr.To("timer:tick"),
},
Sink: v1.Endpoint{
- URI: pointer.String("log:info"),
+ URI: ptr.To("log:info"),
},
},
Status: v1.PipeStatus{
@@ -260,10 +260,10 @@ func TestPipeIntegrationCreatingFromPipeErrorPhase(t
*testing.T) {
},
Spec: v1.PipeSpec{
Source: v1.Endpoint{
- URI: pointer.String("timer:tick"),
+ URI: ptr.To("timer:tick"),
},
Sink: v1.Endpoint{
- URI: pointer.String("log:info"),
+ URI: ptr.To("log:info"),
},
},
Status: v1.PipeStatus{
@@ -296,10 +296,10 @@ func TestPipeIntegrationCreatingFromPipeCreatingPhase(t
*testing.T) {
},
Spec: v1.PipeSpec{
Source: v1.Endpoint{
- URI: pointer.String("timer:tick"),
+ URI: ptr.To("timer:tick"),
},
Sink: v1.Endpoint{
- URI: pointer.String("log:info"),
+ URI: ptr.To("log:info"),
},
},
Status: v1.PipeStatus{
@@ -344,10 +344,10 @@ func TestPipeIntegrationPipeTraitAnnotations(t
*testing.T) {
},
Spec: v1.PipeSpec{
Source: v1.Endpoint{
- URI: pointer.String("timer:tick"),
+ URI: ptr.To("timer:tick"),
},
Sink: v1.Endpoint{
- URI: pointer.String("log:info"),
+ URI: ptr.To("log:info"),
},
},
Status: v1.PipeStatus{
diff --git a/pkg/trait/affinity.go b/pkg/trait/affinity.go
index 4d653daa6..caa927835 100644
--- a/pkg/trait/affinity.go
+++ b/pkg/trait/affinity.go
@@ -25,7 +25,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/selection"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -45,18 +45,18 @@ func newAffinityTrait() Trait {
return &affinityTrait{
BaseTrait: NewBaseTrait(affinityTraitID, affinityTraitOrder),
AffinityTrait: traitv1.AffinityTrait{
- PodAffinity: pointer.Bool(false),
- PodAntiAffinity: pointer.Bool(false),
+ PodAffinity: ptr.To(false),
+ PodAntiAffinity: ptr.To(false),
},
}
}
func (t *affinityTrait) Configure(e *Environment) (bool, *TraitCondition,
error) {
- if e.Integration == nil || !pointer.BoolDeref(t.Enabled, false) {
+ if e.Integration == nil || !ptr.Deref(t.Enabled, false) {
return false, nil, nil
}
- if pointer.BoolDeref(t.PodAffinity, false) &&
pointer.BoolDeref(t.PodAntiAffinity, false) {
+ if ptr.Deref(t.PodAffinity, false) && ptr.Deref(t.PodAntiAffinity,
false) {
return false, nil, fmt.Errorf("both pod affinity and pod
anti-affinity can't be set simultaneously")
}
@@ -124,7 +124,7 @@ func (t *affinityTrait) addNodeAffinity(_ *Environment,
podSpec *corev1.PodSpec)
//nolint:dupl
func (t *affinityTrait) addPodAffinity(e *Environment, podSpec
*corev1.PodSpec) error {
- if !pointer.BoolDeref(t.PodAffinity, false) && len(t.PodAffinityLabels)
== 0 {
+ if !ptr.Deref(t.PodAffinity, false) && len(t.PodAffinityLabels) == 0 {
return nil
}
@@ -149,7 +149,7 @@ func (t *affinityTrait) addPodAffinity(e *Environment,
podSpec *corev1.PodSpec)
}
}
- if pointer.BoolDeref(t.PodAffinity, false) {
+ if ptr.Deref(t.PodAffinity, false) {
labelSelectorRequirements = append(labelSelectorRequirements,
metav1.LabelSelectorRequirement{
Key: v1.IntegrationLabel,
Operator: metav1.LabelSelectorOpIn,
@@ -176,7 +176,7 @@ func (t *affinityTrait) addPodAffinity(e *Environment,
podSpec *corev1.PodSpec)
//nolint:dupl
func (t *affinityTrait) addPodAntiAffinity(e *Environment, podSpec
*corev1.PodSpec) error {
- if !pointer.BoolDeref(t.PodAntiAffinity, false) &&
len(t.PodAntiAffinityLabels) == 0 {
+ if !ptr.Deref(t.PodAntiAffinity, false) && len(t.PodAntiAffinityLabels)
== 0 {
return nil
}
@@ -201,7 +201,7 @@ func (t *affinityTrait) addPodAntiAffinity(e *Environment,
podSpec *corev1.PodSp
}
}
- if pointer.BoolDeref(t.PodAntiAffinity, false) {
+ if ptr.Deref(t.PodAntiAffinity, false) {
labelSelectorRequirements = append(labelSelectorRequirements,
metav1.LabelSelectorRequirement{
Key: v1.IntegrationLabel,
Operator: metav1.LabelSelectorOpIn,
diff --git a/pkg/trait/affinity_test.go b/pkg/trait/affinity_test.go
index 06885e715..818eb72af 100644
--- a/pkg/trait/affinity_test.go
+++ b/pkg/trait/affinity_test.go
@@ -25,7 +25,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
@@ -43,8 +43,8 @@ func TestConfigureAffinityTraitDoesSucceed(t *testing.T) {
func TestConfigureAffinityTraitWithConflictingAffinitiesFails(t *testing.T) {
affinityTrait := createNominalAffinityTest()
environment, _ := createNominalDeploymentTraitTest()
- affinityTrait.PodAffinity = pointer.Bool(true)
- affinityTrait.PodAntiAffinity = pointer.Bool(true)
+ affinityTrait.PodAffinity = ptr.To(true)
+ affinityTrait.PodAntiAffinity = ptr.To(true)
configured, condition, err := affinityTrait.Configure(environment)
assert.False(t, configured)
@@ -54,7 +54,7 @@ func
TestConfigureAffinityTraitWithConflictingAffinitiesFails(t *testing.T) {
func TestConfigureDisabledAffinityTraitFails(t *testing.T) {
affinityTrait := createNominalAffinityTest()
- affinityTrait.Enabled = pointer.Bool(false)
+ affinityTrait.Enabled = ptr.To(false)
environment, _ := createNominalDeploymentTraitTest()
configured, condition, err := affinityTrait.Configure(environment)
@@ -125,7 +125,7 @@ func testApplyNodeAffinityLabelsDoesSucceed(t *testing.T,
trait *affinityTrait,
func TestApplyPodAntiAffinityLabelsDoesSucceed(t *testing.T) {
affinityTrait := createNominalAffinityTest()
- affinityTrait.PodAntiAffinity = pointer.Bool(true)
+ affinityTrait.PodAntiAffinity = ptr.To(true)
affinityTrait.PodAntiAffinityLabels = []string{"criteria != value"}
environment, deployment := createNominalDeploymentTraitTest()
@@ -160,7 +160,7 @@ func testApplyPodAntiAffinityLabelsDoesSucceed(t
*testing.T, trait *affinityTrai
func TestApplyPodAffinityLabelsDoesSucceed(t *testing.T) {
affinityTrait := createNominalAffinityTest()
- affinityTrait.PodAffinity = pointer.Bool(true)
+ affinityTrait.PodAffinity = ptr.To(true)
affinityTrait.PodAffinityLabels = []string{"!criteria"}
environment, deployment := createNominalDeploymentTraitTest()
@@ -194,7 +194,7 @@ func testApplyPodAffinityLabelsDoesSucceed(t *testing.T,
trait *affinityTrait, e
func createNominalAffinityTest() *affinityTrait {
trait, _ := newAffinityTrait().(*affinityTrait)
- trait.Enabled = pointer.Bool(true)
+ trait.Enabled = ptr.To(true)
return trait
}
diff --git a/pkg/trait/container.go b/pkg/trait/container.go
index b50530481..bfe098e7c 100644
--- a/pkg/trait/container.go
+++ b/pkg/trait/container.go
@@ -26,7 +26,7 @@ import (
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/intstr"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
serving "knative.dev/serving/pkg/apis/serving/v1"
@@ -74,9 +74,9 @@ func newContainerTrait() Trait {
ServicePort: defaultServicePort,
ServicePortName: defaultContainerPortName,
Name: defaultContainerName,
- RunAsNonRoot:
pointer.Bool(defaultContainerRunAsNonRoot),
+ RunAsNonRoot:
ptr.To(defaultContainerRunAsNonRoot),
SeccompProfileType:
defaultContainerSeccompProfileType,
- AllowPrivilegeEscalation:
pointer.Bool(defaultContainerAllowPrivilegeEscalation),
+ AllowPrivilegeEscalation:
ptr.To(defaultContainerAllowPrivilegeEscalation),
CapabilitiesDrop:
[]corev1.Capability{defaultContainerCapabilitiesDrop},
RequestCPU: defaultContainerResourceCPU,
RequestMemory:
defaultContainerResourceMemory,
@@ -116,7 +116,7 @@ func (t *containerTrait) Configure(e *Environment) (bool,
*TraitCondition, error
}
}
- if pointer.BoolDeref(t.Auto, true) {
+ if ptr.Deref(t.Auto, true) {
if t.Expose == nil {
e :=
e.Resources.GetServiceForIntegration(e.Integration) != nil
t.Expose = &e
@@ -268,7 +268,7 @@ func (t *containerTrait) configureContainer(e *Environment)
error {
e.Resources.Add(props)
}
t.configureResources(&container)
- if knative || pointer.BoolDeref(t.Expose, false) {
+ if knative || ptr.Deref(t.Expose, false) {
t.configureService(e, &container, knative)
}
t.configureCapabilities(e)
diff --git a/pkg/trait/container_probes_test.go
b/pkg/trait/container_probes_test.go
index d56857525..5a60f7352 100644
--- a/pkg/trait/container_probes_test.go
+++ b/pkg/trait/container_probes_test.go
@@ -24,7 +24,7 @@ import (
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -69,7 +69,7 @@ func TestProbesDependencies(t *testing.T) {
Traits: v1.Traits{
Health: &traitv1.HealthTrait{
Trait: traitv1.Trait{
- Enabled: pointer.Bool(true),
+ Enabled: ptr.To(true),
},
},
},
@@ -91,10 +91,10 @@ func TestProbesOnDeployment(t *testing.T) {
Traits: v1.Traits{
Health: &traitv1.HealthTrait{
Trait: traitv1.Trait{
- Enabled: pointer.Bool(true),
+ Enabled: ptr.To(true),
},
- LivenessProbeEnabled:
pointer.Bool(true),
- ReadinessProbeEnabled:
pointer.Bool(true),
+ LivenessProbeEnabled: ptr.To(true),
+ ReadinessProbeEnabled: ptr.To(true),
LivenessTimeout: 1234,
},
},
@@ -127,10 +127,10 @@ func TestProbesOnDeploymentWithCustomScheme(t *testing.T)
{
Traits: v1.Traits{
Health: &traitv1.HealthTrait{
Trait: traitv1.Trait{
- Enabled: pointer.Bool(true),
+ Enabled: ptr.To(true),
},
- LivenessProbeEnabled:
pointer.Bool(true),
- ReadinessProbeEnabled:
pointer.Bool(true),
+ LivenessProbeEnabled: ptr.To(true),
+ ReadinessProbeEnabled: ptr.To(true),
LivenessScheme: "HTTPS",
ReadinessScheme: "HTTPS",
LivenessTimeout: 1234,
@@ -166,15 +166,15 @@ func TestProbesOnKnativeService(t *testing.T) {
Traits: v1.Traits{
KnativeService: &traitv1.KnativeServiceTrait{
Trait: traitv1.Trait{
- Enabled: pointer.Bool(true),
+ Enabled: ptr.To(true),
},
},
Health: &traitv1.HealthTrait{
Trait: traitv1.Trait{
- Enabled: pointer.Bool(true),
+ Enabled: ptr.To(true),
},
- LivenessProbeEnabled:
pointer.Bool(true),
- ReadinessProbeEnabled:
pointer.Bool(true),
+ LivenessProbeEnabled: ptr.To(true),
+ ReadinessProbeEnabled: ptr.To(true),
LivenessTimeout: 1234,
},
},
diff --git a/pkg/trait/container_test.go b/pkg/trait/container_test.go
index d3988163b..0e208dcb5 100644
--- a/pkg/trait/container_test.go
+++ b/pkg/trait/container_test.go
@@ -30,7 +30,7 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
@@ -182,8 +182,8 @@ func TestContainerWithOpenshift(t *testing.T) {
assert.NotNil(t, d)
assert.Len(t, d.Spec.Template.Spec.Containers, 1)
assert.Equal(t, defaultContainerName,
d.Spec.Template.Spec.Containers[0].Name)
- assert.Equal(t, pointer.Bool(defaultContainerRunAsNonRoot),
d.Spec.Template.Spec.Containers[0].SecurityContext.RunAsNonRoot)
- assert.Equal(t, pointer.Int64(1000860000),
d.Spec.Template.Spec.Containers[0].SecurityContext.RunAsUser)
+ assert.Equal(t, ptr.To(defaultContainerRunAsNonRoot),
d.Spec.Template.Spec.Containers[0].SecurityContext.RunAsNonRoot)
+ assert.Equal(t, ptr.To(int64(1000860000)),
d.Spec.Template.Spec.Containers[0].SecurityContext.RunAsUser)
}
func TestContainerWithCustomName(t *testing.T) {
@@ -673,10 +673,10 @@ func TestDefaultKubernetesSecurityContext(t *testing.T) {
assert.NotNil(t, d)
assert.Len(t, d.Spec.Template.Spec.Containers, 1)
assert.Equal(t, defaultContainerName,
d.Spec.Template.Spec.Containers[0].Name)
- assert.Equal(t, pointer.Bool(defaultContainerRunAsNonRoot),
d.Spec.Template.Spec.Containers[0].SecurityContext.RunAsNonRoot)
+ assert.Equal(t, ptr.To(defaultContainerRunAsNonRoot),
d.Spec.Template.Spec.Containers[0].SecurityContext.RunAsNonRoot)
assert.Nil(t,
d.Spec.Template.Spec.Containers[0].SecurityContext.RunAsUser)
assert.Equal(t, corev1.SeccompProfileTypeRuntimeDefault,
d.Spec.Template.Spec.Containers[0].SecurityContext.SeccompProfile.Type)
- assert.Equal(t, pointer.Bool(defaultContainerAllowPrivilegeEscalation),
d.Spec.Template.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation)
+ assert.Equal(t, ptr.To(defaultContainerAllowPrivilegeEscalation),
d.Spec.Template.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation)
assert.Equal(t, []corev1.Capability{defaultContainerCapabilitiesDrop},
d.Spec.Template.Spec.Containers[0].SecurityContext.Capabilities.Drop)
assert.Nil(t,
d.Spec.Template.Spec.Containers[0].SecurityContext.Capabilities.Add)
}
@@ -701,10 +701,10 @@ func TestDefaultKnativeSecurityContext(t *testing.T) {
assert.NotNil(t, s)
assert.Len(t, s.Spec.Template.Spec.Containers, 1)
assert.Equal(t, defaultContainerName,
s.Spec.Template.Spec.Containers[0].Name)
- assert.Equal(t, pointer.Bool(defaultContainerRunAsNonRoot),
s.Spec.Template.Spec.Containers[0].SecurityContext.RunAsNonRoot)
+ assert.Equal(t, ptr.To(defaultContainerRunAsNonRoot),
s.Spec.Template.Spec.Containers[0].SecurityContext.RunAsNonRoot)
assert.Nil(t,
s.Spec.Template.Spec.Containers[0].SecurityContext.RunAsUser)
assert.Equal(t, corev1.SeccompProfileTypeRuntimeDefault,
s.Spec.Template.Spec.Containers[0].SecurityContext.SeccompProfile.Type)
- assert.Equal(t, pointer.Bool(defaultContainerAllowPrivilegeEscalation),
s.Spec.Template.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation)
+ assert.Equal(t, ptr.To(defaultContainerAllowPrivilegeEscalation),
s.Spec.Template.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation)
assert.Equal(t, []corev1.Capability{defaultContainerCapabilitiesDrop},
s.Spec.Template.Spec.Containers[0].SecurityContext.Capabilities.Drop)
assert.Nil(t,
s.Spec.Template.Spec.Containers[0].SecurityContext.Capabilities.Add)
}
@@ -713,10 +713,10 @@ func TestUserSecurityContext(t *testing.T) {
environment := createSettingContextEnvironment(t,
v1.TraitProfileKubernetes)
environment.Integration.Spec.Traits = v1.Traits{
Container: &traitv1.ContainerTrait{
- RunAsNonRoot: pointer.Bool(false),
- RunAsUser: pointer.Int64(1000),
+ RunAsNonRoot: ptr.To(false),
+ RunAsUser: ptr.To(int64(1000)),
SeccompProfileType: "Unconfined",
- AllowPrivilegeEscalation: pointer.Bool(true),
+ AllowPrivilegeEscalation: ptr.To(true),
CapabilitiesDrop: []corev1.Capability{"DROP"},
CapabilitiesAdd: []corev1.Capability{"ADD"},
},
@@ -735,10 +735,10 @@ func TestUserSecurityContext(t *testing.T) {
assert.NotNil(t, d)
assert.Len(t, d.Spec.Template.Spec.Containers, 1)
- assert.Equal(t, pointer.Bool(false),
d.Spec.Template.Spec.Containers[0].SecurityContext.RunAsNonRoot)
- assert.Equal(t, pointer.Int64(1000),
d.Spec.Template.Spec.Containers[0].SecurityContext.RunAsUser)
+ assert.Equal(t, ptr.To(false),
d.Spec.Template.Spec.Containers[0].SecurityContext.RunAsNonRoot)
+ assert.Equal(t, ptr.To(int64(1000)),
d.Spec.Template.Spec.Containers[0].SecurityContext.RunAsUser)
assert.Equal(t, corev1.SeccompProfileTypeUnconfined,
d.Spec.Template.Spec.Containers[0].SecurityContext.SeccompProfile.Type)
- assert.Equal(t, pointer.Bool(true),
d.Spec.Template.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation)
+ assert.Equal(t, ptr.To(true),
d.Spec.Template.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation)
assert.Equal(t, []corev1.Capability{"DROP"},
d.Spec.Template.Spec.Containers[0].SecurityContext.Capabilities.Drop)
assert.Equal(t, []corev1.Capability{"ADD"},
d.Spec.Template.Spec.Containers[0].SecurityContext.Capabilities.Add)
}
diff --git a/pkg/trait/cron.go b/pkg/trait/cron.go
index 6c13bb1e8..9b7364bee 100644
--- a/pkg/trait/cron.go
+++ b/pkg/trait/cron.go
@@ -26,7 +26,7 @@ import (
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -83,7 +83,7 @@ func (t *cronTrait) Configure(e *Environment) (bool,
*TraitCondition, error) {
if e.Integration == nil {
return false, nil, nil
}
- if !pointer.BoolDeref(t.Enabled, true) {
+ if !ptr.Deref(t.Enabled, true) {
return false, NewIntegrationConditionUserDisabled("Cron"), nil
}
if !e.IntegrationInPhase(v1.IntegrationPhaseInitialization) &&
!e.IntegrationInRunningPhases() {
@@ -102,7 +102,7 @@ func (t *cronTrait) Configure(e *Environment) (bool,
*TraitCondition, error) {
), nil
}
- if pointer.BoolDeref(t.Auto, true) {
+ if ptr.Deref(t.Auto, true) {
err := t.autoConfigure(e)
if err != nil {
return false,
@@ -118,7 +118,7 @@ func (t *cronTrait) Configure(e *Environment) (bool,
*TraitCondition, error) {
}
// Fallback strategy can be implemented in any other controller
- if pointer.BoolDeref(t.Fallback, false) {
+ if ptr.Deref(t.Fallback, false) {
var condition *TraitCondition
if e.IntegrationInPhase(v1.IntegrationPhaseDeploying) {
condition = NewIntegrationCondition(
@@ -180,7 +180,7 @@ func (t *cronTrait) autoConfigure(e *Environment) error {
}
for _, fromURI := range fromURIs {
if uri.GetComponent(fromURI) == genericCronComponent {
- t.Fallback = pointer.Bool(true)
+ t.Fallback = ptr.To(true)
break
}
}
@@ -193,7 +193,7 @@ func (t *cronTrait) Apply(e *Environment) error {
if e.IntegrationInPhase(v1.IntegrationPhaseInitialization) {
util.StringSliceUniqueAdd(&e.Integration.Status.Capabilities,
v1.CapabilityCron)
- if pointer.BoolDeref(t.Fallback, false) {
+ if ptr.Deref(t.Fallback, false) {
fallbackArtifact :=
e.CamelCatalog.GetArtifactByScheme(genericCronComponentFallbackScheme)
if fallbackArtifact == nil {
return fmt.Errorf("no fallback artifact for
scheme %q has been found in camel catalog", genericCronComponentFallbackScheme)
@@ -203,7 +203,7 @@ func (t *cronTrait) Apply(e *Environment) error {
}
}
- if !pointer.BoolDeref(t.Fallback, false) &&
e.IntegrationInRunningPhases() {
+ if !ptr.Deref(t.Fallback, false) && e.IntegrationInRunningPhases() {
if e.ApplicationProperties == nil {
e.ApplicationProperties = make(map[string]string)
}
@@ -287,13 +287,13 @@ func (t *cronTrait) getCronJobFor(e *Environment)
*batchv1.CronJob {
// SelectControllerStrategy can be used to check if a CronJob can be generated
given the integration and trait settings.
func (t *cronTrait) SelectControllerStrategy(e *Environment)
(*ControllerStrategy, error) {
cronStrategy := ControllerStrategyCronJob
- if pointer.BoolDeref(t.Fallback, false) {
+ if ptr.Deref(t.Fallback, false) {
return nil, nil
}
if t.Schedule != "" {
return &cronStrategy, nil
}
- if pointer.BoolDeref(t.Auto, true) {
+ if ptr.Deref(t.Auto, true) {
globalCron, err := t.getGlobalCron(e)
if err == nil && globalCron != nil {
return &cronStrategy, nil
diff --git a/pkg/trait/cron_test.go b/pkg/trait/cron_test.go
index 5868c8c50..178f22d08 100644
--- a/pkg/trait/cron_test.go
+++ b/pkg/trait/cron_test.go
@@ -28,7 +28,7 @@ import (
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -410,7 +410,7 @@ func TestCronDepsFallback(t *testing.T) {
},
Traits: v1.Traits{
Cron: &traitv1.CronTrait{
- Fallback: pointer.Bool(true),
+ Fallback: ptr.To(true),
},
},
},
@@ -490,7 +490,7 @@ func TestCronWithActiveDeadline(t *testing.T) {
},
Traits: v1.Traits{
Cron: &traitv1.CronTrait{
- ActiveDeadlineSeconds:
pointer.Int64(120),
+ ActiveDeadlineSeconds:
ptr.To(int64(120)),
},
},
},
@@ -579,7 +579,7 @@ func TestCronWithBackoffLimit(t *testing.T) {
},
Traits: v1.Traits{
Cron: &traitv1.CronTrait{
- BackoffLimit: pointer.Int32(5),
+ BackoffLimit: ptr.To(int32(5)),
},
},
},
diff --git a/pkg/trait/deployer.go b/pkg/trait/deployer.go
index 754751722..a308663a1 100644
--- a/pkg/trait/deployer.go
+++ b/pkg/trait/deployer.go
@@ -27,7 +27,7 @@ import (
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/types"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
@@ -70,7 +70,7 @@ func (t *deployerTrait) Apply(e *Environment) error {
// check its list of accepted MIME types.
// As a simpler solution, we fall back to client-side
apply at the first
// 415 error, and assume server-side apply is not
available globally.
- if hasServerSideApply && pointer.BoolDeref(t.UseSSA,
true) {
+ if hasServerSideApply && ptr.Deref(t.UseSSA, true) {
err := t.serverSideApply(env, resource)
switch {
case err == nil:
diff --git a/pkg/trait/environment.go b/pkg/trait/environment.go
index 7dda54826..3609ff7b9 100644
--- a/pkg/trait/environment.go
+++ b/pkg/trait/environment.go
@@ -20,7 +20,7 @@ package trait
import (
"os"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
"github.com/apache/camel-k/v2/pkg/util/camel"
@@ -59,7 +59,7 @@ func newEnvironmentTrait() Trait {
return &environmentTrait{
BasePlatformTrait: NewBasePlatformTrait(environmentTraitID,
environmentTraitOrder),
EnvironmentTrait: traitv1.EnvironmentTrait{
- ContainerMeta: pointer.Bool(true),
+ ContainerMeta: ptr.To(true),
},
}
}
@@ -82,12 +82,12 @@ func (t *environmentTrait) Apply(e *Environment) error {
envvar.SetVal(&e.EnvVars, envVarMountPathConfigMaps,
camel.ConfigConfigmapsMountPath)
envvar.SetVal(&e.EnvVars, envVarMountPathSecrets,
camel.ConfigSecretsMountPath)
- if pointer.BoolDeref(t.ContainerMeta, true) {
+ if ptr.Deref(t.ContainerMeta, true) {
envvar.SetValFrom(&e.EnvVars, envVarNamespace,
"metadata.namespace")
envvar.SetValFrom(&e.EnvVars, envVarPodName, "metadata.name")
}
- if pointer.BoolDeref(t.HTTPProxy, true) {
+ if ptr.Deref(t.HTTPProxy, true) {
if HTTPProxy, ok := os.LookupEnv("HTTP_PROXY"); ok {
envvar.SetVal(&e.EnvVars, "HTTP_PROXY", HTTPProxy)
}
diff --git a/pkg/trait/environment_test.go b/pkg/trait/environment_test.go
index f83043702..fb19d54c6 100644
--- a/pkg/trait/environment_test.go
+++ b/pkg/trait/environment_test.go
@@ -26,7 +26,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -86,7 +86,7 @@ func TestEnabledContainerMetaDataEnvVars(t *testing.T) {
env := mockEnvironment(c)
env.Integration.Spec.Traits = v1.Traits{
Environment: &traitv1.EnvironmentTrait{
- ContainerMeta: pointer.Bool(true),
+ ContainerMeta: ptr.To(true),
},
}
env.Platform.ResyncStatusFullConfig()
@@ -125,7 +125,7 @@ func TestDisabledContainerMetaDataEnvVars(t *testing.T) {
env := mockEnvironment(c)
env.Integration.Spec.Traits = v1.Traits{
Environment: &traitv1.EnvironmentTrait{
- ContainerMeta: pointer.Bool(false),
+ ContainerMeta: ptr.To(false),
},
}
diff --git a/pkg/trait/gc.go b/pkg/trait/gc.go
index cede57eb9..91254de68 100644
--- a/pkg/trait/gc.go
+++ b/pkg/trait/gc.go
@@ -32,6 +32,7 @@ import (
authorization "k8s.io/api/authorization/v1"
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
+ "k8s.io/utils/ptr"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -40,7 +41,6 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/selection"
"k8s.io/client-go/discovery"
- "k8s.io/utils/pointer"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
@@ -109,7 +109,7 @@ func (t *gcTrait) Configure(e *Environment) (bool,
*TraitCondition, error) {
if e.Integration == nil {
return false, nil, nil
}
- if !pointer.BoolDeref(t.Enabled, true) {
+ if !ptr.Deref(t.Enabled, true) {
return false, NewIntegrationConditionUserDisabled("GC"), nil
}
diff --git a/pkg/trait/gc_test.go b/pkg/trait/gc_test.go
index fa21a8531..15a654f5a 100644
--- a/pkg/trait/gc_test.go
+++ b/pkg/trait/gc_test.go
@@ -30,7 +30,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
servingv1 "knative.dev/serving/pkg/apis/serving/v1"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
@@ -49,7 +49,7 @@ func TestConfigureGCTraitDoesSucceed(t *testing.T) {
func TestConfigureDisabledGCTraitDoesNotSucceed(t *testing.T) {
gcTrait, environment := createNominalGCTest()
- gcTrait.Enabled = pointer.Bool(false)
+ gcTrait.Enabled = ptr.To(false)
expectedCondition := NewIntegrationCondition(
"GC",
@@ -308,7 +308,7 @@ func getIntegrationDeployment(integration *v1.Integration)
*appsv1.Deployment {
func createNominalGCTest() (*gcTrait, *Environment) {
trait, _ := newGCTrait().(*gcTrait)
- trait.Enabled = pointer.Bool(true)
+ trait.Enabled = ptr.To(true)
environment := &Environment{
Catalog: NewCatalog(nil),
diff --git a/pkg/trait/health.go b/pkg/trait/health.go
index bbaf9b66c..c4b7e6eec 100644
--- a/pkg/trait/health.go
+++ b/pkg/trait/health.go
@@ -23,7 +23,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/intstr"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -58,13 +58,13 @@ func newHealthTrait() Trait {
func (t *healthTrait) Configure(e *Environment) (bool, *TraitCondition, error)
{
if e.Integration == nil ||
(!e.IntegrationInPhase(v1.IntegrationPhaseInitialization) &&
!e.IntegrationInRunningPhases()) ||
- !pointer.BoolDeref(t.Enabled, false) {
+ !ptr.Deref(t.Enabled, false) {
return false, nil, nil
}
// The trait must be disabled if a debug operation is ongoing
if jt := e.Catalog.GetTrait(jvmTraitID); jt != nil {
- if jvm, ok := jt.(*jvmTrait); ok &&
pointer.BoolDeref(jvm.Debug, false) {
+ if jvm, ok := jt.(*jvmTrait); ok && ptr.Deref(jvm.Debug, false)
{
return false,
NewIntegrationConditionPlatformDisabledWithMessage("Health", "debug operation
ongoing: incompatible with health checks"), nil
}
}
@@ -113,7 +113,7 @@ func (t *healthTrait) Apply(e *Environment) error {
return nil
}
- if !pointer.BoolDeref(t.LivenessProbeEnabled, false) &&
!pointer.BoolDeref(t.ReadinessProbeEnabled, true) &&
!pointer.BoolDeref(t.StartupProbeEnabled, false) {
+ if !ptr.Deref(t.LivenessProbeEnabled, false) &&
!ptr.Deref(t.ReadinessProbeEnabled, true) && !ptr.Deref(t.StartupProbeEnabled,
false) {
return nil
}
@@ -134,19 +134,19 @@ func (t *healthTrait) Apply(e *Environment) error {
}
func (t *healthTrait) setProbes(container *corev1.Container, port
*intstr.IntOrString) error {
- if pointer.BoolDeref(t.LivenessProbeEnabled, false) {
+ if ptr.Deref(t.LivenessProbeEnabled, false) {
if t.LivenessProbe == "" {
return fmt.Errorf("you need to configure a liveness
probe explicitly or in your catalog")
}
container.LivenessProbe = t.newLivenessProbe(port,
t.LivenessProbe)
}
- if pointer.BoolDeref(t.ReadinessProbeEnabled, true) {
+ if ptr.Deref(t.ReadinessProbeEnabled, true) {
if t.ReadinessProbe == "" {
return fmt.Errorf("you need to configure a readiness
probe explicitly or in your catalog")
}
container.ReadinessProbe = t.newReadinessProbe(port,
t.ReadinessProbe)
}
- if pointer.BoolDeref(t.StartupProbeEnabled, false) {
+ if ptr.Deref(t.StartupProbeEnabled, false) {
if t.StartupProbe == "" {
return fmt.Errorf("you need to configure a startup
probe explicitly or in your catalog")
}
diff --git a/pkg/trait/health_test.go b/pkg/trait/health_test.go
index b22709081..e60e8fd15 100644
--- a/pkg/trait/health_test.go
+++ b/pkg/trait/health_test.go
@@ -26,7 +26,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -59,10 +59,10 @@ func TestHealthTrait(t *testing.T) {
Traits: v1.Traits{
Health: &trait.HealthTrait{
Trait: trait.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
- LivenessProbeEnabled:
pointer.Bool(true),
- ReadinessProbeEnabled:
pointer.Bool(true),
+ LivenessProbeEnabled:
ptr.To(true),
+ ReadinessProbeEnabled:
ptr.To(true),
},
},
},
@@ -103,9 +103,9 @@ func TestHealthTrait(t *testing.T) {
assert.Nil(t, d.Spec.Template.Spec.Containers[0].StartupProbe)
// Change traits configuration
- environment.Integration.Spec.Traits.Health.LivenessProbeEnabled =
pointer.Bool(false)
- environment.Integration.Spec.Traits.Health.ReadinessProbeEnabled =
pointer.Bool(false)
- environment.Integration.Spec.Traits.Health.StartupProbeEnabled =
pointer.Bool(true)
+ environment.Integration.Spec.Traits.Health.LivenessProbeEnabled =
ptr.To(false)
+ environment.Integration.Spec.Traits.Health.ReadinessProbeEnabled =
ptr.To(false)
+ environment.Integration.Spec.Traits.Health.StartupProbeEnabled =
ptr.To(true)
environment.Platform.ResyncStatusFullConfig()
_, err = traitCatalog.apply(&environment)
diff --git a/pkg/trait/ingress.go b/pkg/trait/ingress.go
index 277784708..93a42b32b 100644
--- a/pkg/trait/ingress.go
+++ b/pkg/trait/ingress.go
@@ -26,7 +26,7 @@ import (
corev1 "k8s.io/api/core/v1"
networkingv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
const (
@@ -65,7 +65,7 @@ func (t *ingressTrait) Configure(e *Environment) (bool,
*TraitCondition, error)
if !e.IntegrationInRunningPhases() {
return false, nil, nil
}
- if !pointer.BoolDeref(t.Enabled, true) {
+ if !ptr.Deref(t.Enabled, true) {
return false, NewIntegrationCondition(
"Ingress",
v1.IntegrationConditionExposureAvailable,
@@ -75,7 +75,7 @@ func (t *ingressTrait) Configure(e *Environment) (bool,
*TraitCondition, error)
), nil
}
- if pointer.BoolDeref(t.Auto, true) {
+ if ptr.Deref(t.Auto, true) {
if e.Resources.GetUserServiceForIntegration(e.Integration) ==
nil {
return false, nil, nil
}
diff --git a/pkg/trait/ingress_test.go b/pkg/trait/ingress_test.go
index 79249b2a6..a1b310516 100644
--- a/pkg/trait/ingress_test.go
+++ b/pkg/trait/ingress_test.go
@@ -27,7 +27,7 @@ import (
networkingv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/util/kubernetes"
@@ -47,7 +47,7 @@ func TestConfigureIngressTraitDoesSucceed(t *testing.T) {
func TestConfigureDisabledIngressTraitDoesNotSucceed(t *testing.T) {
ingressTrait, environment := createNominalIngressTest()
- ingressTrait.Enabled = pointer.Bool(false)
+ ingressTrait.Enabled = ptr.To(false)
expectedCondition := NewIntegrationCondition(
"Ingress",
@@ -223,8 +223,8 @@ func
TestConfigureTLSWithoutSecretNameIngressTraitWDoesSucceed(t *testing.T) {
func createNominalIngressTest() (*ingressTrait, *Environment) {
trait, _ := newIngressTrait().(*ingressTrait)
- trait.Enabled = pointer.Bool(true)
- trait.Auto = pointer.Bool(false)
+ trait.Enabled = ptr.To(true)
+ trait.Auto = ptr.To(false)
trait.Host = "hostname"
environment := &Environment{
diff --git a/pkg/trait/init.go b/pkg/trait/init.go
index 7c9aff9cb..4a2306764 100644
--- a/pkg/trait/init.go
+++ b/pkg/trait/init.go
@@ -21,12 +21,11 @@ import (
"errors"
"sort"
- "k8s.io/utils/pointer"
-
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
"github.com/apache/camel-k/v2/pkg/util"
"github.com/apache/camel-k/v2/pkg/util/dsl"
+ "k8s.io/utils/ptr"
)
const (
@@ -48,7 +47,7 @@ func NewInitTrait() Trait {
}
func (t *initTrait) Configure(e *Environment) (bool, *TraitCondition, error) {
- if !pointer.BoolDeref(t.Enabled, true) {
+ if !ptr.Deref(t.Enabled, true) {
return false, nil, errors.New("trait init cannot be disabled")
}
diff --git a/pkg/trait/istio.go b/pkg/trait/istio.go
index a3d2a85e5..93169ddbc 100644
--- a/pkg/trait/istio.go
+++ b/pkg/trait/istio.go
@@ -23,7 +23,7 @@ import (
"github.com/apache/camel-k/v2/pkg/util/boolean"
appsv1 "k8s.io/api/apps/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
servingv1 "knative.dev/serving/pkg/apis/serving/v1"
@@ -55,7 +55,7 @@ func newIstioTrait() Trait {
}
func (t *istioTrait) Configure(e *Environment) (bool, *TraitCondition, error) {
- if e.Integration == nil || !pointer.BoolDeref(t.Enabled, false) {
+ if e.Integration == nil || !ptr.Deref(t.Enabled, false) {
return false, nil, nil
}
diff --git a/pkg/trait/istio_test.go b/pkg/trait/istio_test.go
index 3b34f4ff4..7be2a6291 100644
--- a/pkg/trait/istio_test.go
+++ b/pkg/trait/istio_test.go
@@ -26,7 +26,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
serving "knative.dev/serving/pkg/apis/serving/v1"
@@ -78,7 +78,7 @@ func NewIstioTestEnv(t *testing.T, d *appsv1.Deployment, s
*serving.Service, ena
if enabled {
env.Integration.Spec.Traits.Istio = &traitv1.IstioTrait{
Trait: traitv1.Trait{
- Enabled: pointer.Bool(true),
+ Enabled: ptr.To(true),
},
}
}
@@ -123,8 +123,8 @@ func TestIstioForcedInjectTrue(t *testing.T) {
}
env := NewIstioTestEnv(t, &d, &s, true)
- env.Integration.Spec.Traits.Istio.Enabled = pointer.Bool(true)
- env.Integration.Spec.Traits.Istio.Inject = pointer.Bool(true)
+ env.Integration.Spec.Traits.Istio.Enabled = ptr.To(true)
+ env.Integration.Spec.Traits.Istio.Inject = ptr.To(true)
conditions, err := env.Catalog.apply(&env)
require.NoError(t, err)
@@ -148,8 +148,8 @@ func TestIstioForcedInjectFalse(t *testing.T) {
}
env := NewIstioTestEnv(t, &d, &s, true)
- env.Integration.Spec.Traits.Istio.Enabled = pointer.Bool(true)
- env.Integration.Spec.Traits.Istio.Inject = pointer.Bool(false)
+ env.Integration.Spec.Traits.Istio.Enabled = ptr.To(true)
+ env.Integration.Spec.Traits.Istio.Inject = ptr.To(false)
conditions, err := env.Catalog.apply(&env)
require.NoError(t, err)
diff --git a/pkg/trait/jolokia.go b/pkg/trait/jolokia.go
index e78bd9f50..d5f602ea6 100644
--- a/pkg/trait/jolokia.go
+++ b/pkg/trait/jolokia.go
@@ -23,7 +23,7 @@ import (
"strings"
corev1 "k8s.io/api/core/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -52,7 +52,7 @@ func newJolokiaTrait() Trait {
}
func (t *jolokiaTrait) Configure(e *Environment) (bool, *TraitCondition,
error) {
- if e.Integration == nil || !pointer.BoolDeref(t.Enabled, false) {
+ if e.Integration == nil || !ptr.Deref(t.Enabled, false) {
return false, nil, nil
}
diff --git a/pkg/trait/jolokia_test.go b/pkg/trait/jolokia_test.go
index 6668f3850..b9ffa492b 100644
--- a/pkg/trait/jolokia_test.go
+++ b/pkg/trait/jolokia_test.go
@@ -25,7 +25,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/util/boolean"
@@ -214,7 +214,7 @@ func TestSetDefaultBoolJolokiaOptionShouldSucceed(t
*testing.T) {
func TestSetDefaultBoolJolokiaOptionShouldNotOverrideExistingValue(t
*testing.T) {
trait, _ := newJolokiaTrait().(*jolokiaTrait)
options := map[string]string{}
- option := pointer.Bool(false)
+ option := ptr.To(false)
trait.setDefaultJolokiaOption(options, &option, "key", true)
@@ -257,7 +257,7 @@ func TestAddBoolPointerOptionToJolokiaOptions(t *testing.T)
{
trait, _ := newJolokiaTrait().(*jolokiaTrait)
options := map[string]string{}
- trait.addToJolokiaOptions(options, "key", pointer.Bool(false))
+ trait.addToJolokiaOptions(options, "key", ptr.To(false))
assert.Len(t, options, 1)
assert.Equal(t, boolean.FalseString, options["key"])
@@ -274,7 +274,7 @@ func TestAddWrongTypeOptionToJolokiaOptionsDoesNothing(t
*testing.T) {
func createNominalJolokiaTest() (*jolokiaTrait, *Environment) {
trait, _ := newJolokiaTrait().(*jolokiaTrait)
- trait.Enabled = pointer.Bool(true)
+ trait.Enabled = ptr.To(true)
environment := &Environment{
Catalog: NewCatalog(nil),
diff --git a/pkg/trait/jvm.go b/pkg/trait/jvm.go
index 2a352f52b..3b43191ba 100644
--- a/pkg/trait/jvm.go
+++ b/pkg/trait/jvm.go
@@ -27,7 +27,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
@@ -66,7 +66,7 @@ func newJvmTrait() Trait {
func (t *jvmTrait) Configure(e *Environment) (bool, *TraitCondition, error) {
// Deprecated: the JVM has to be a platform trait and the user should
not be able to disable it
- if !pointer.BoolDeref(t.Enabled, true) {
+ if !ptr.Deref(t.Enabled, true) {
notice := userDisabledMessage + "; this configuration is
deprecated and may be removed within next releases"
return false, NewIntegrationCondition("JVM",
v1.IntegrationConditionTraitInfo, corev1.ConditionTrue,
traitConfigurationReason, notice), nil
}
@@ -122,7 +122,7 @@ func (t *jvmTrait) Apply(e *Environment) error {
// Other traits may have already contributed some arguments
args := container.Args
- if pointer.BoolDeref(t.Debug, false) {
+ if ptr.Deref(t.Debug, false) {
debugArgs := t.enableDebug(e)
args = append(args, debugArgs)
}
@@ -188,7 +188,7 @@ func (t *jvmTrait) Apply(e *Environment) error {
func (t *jvmTrait) enableDebug(e *Environment) string {
suspend := "n"
- if pointer.BoolDeref(t.DebugSuspend, false) {
+ if ptr.Deref(t.DebugSuspend, false) {
suspend = "y"
}
// Add label to mark the pods with debug enabled
diff --git a/pkg/trait/jvm_test.go b/pkg/trait/jvm_test.go
index fefefffd2..fab68efc2 100644
--- a/pkg/trait/jvm_test.go
+++ b/pkg/trait/jvm_test.go
@@ -32,7 +32,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
serving "knative.dev/serving/pkg/apis/serving/v1"
)
@@ -74,7 +74,7 @@ func
TestConfigureJvmTraitInWrongIntegrationKitPhaseDoesNotSucceed(t *testing.T)
func TestConfigureJvmTraitInWrongJvmDisabled(t *testing.T) {
trait, environment :=
createNominalJvmTest(v1.IntegrationKitTypePlatform)
- trait.Enabled = pointer.Bool(false)
+ trait.Enabled = ptr.To(false)
expectedCondition := NewIntegrationCondition(
"JVM",
@@ -346,8 +346,8 @@ func TestApplyJvmTraitWithKnativeResource(t *testing.T) {
func TestApplyJvmTraitWithDebugEnabled(t *testing.T) {
trait, environment :=
createNominalJvmTest(v1.IntegrationKitTypePlatform)
- trait.Debug = pointer.Bool(true)
- trait.DebugSuspend = pointer.Bool(true)
+ trait.Debug = ptr.To(true)
+ trait.DebugSuspend = ptr.To(true)
d := appsv1.Deployment{
Spec: appsv1.DeploymentSpec{
@@ -585,7 +585,7 @@ func createNominalJvmTest(kitType string) (*jvmTrait,
*Environment) {
catalog, _ := camel.DefaultCatalog()
client, _ := test.NewFakeClient()
trait, _ := newJvmTrait().(*jvmTrait)
- trait.PrintCommand = pointer.Bool(false)
+ trait.PrintCommand = ptr.To(false)
trait.Client = client
environment := &Environment{
diff --git a/pkg/trait/kamelets.go b/pkg/trait/kamelets.go
index 8f59d547b..402833b9c 100644
--- a/pkg/trait/kamelets.go
+++ b/pkg/trait/kamelets.go
@@ -27,7 +27,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -79,7 +79,7 @@ func (t *kameletsTrait) Configure(e *Environment) (bool,
*TraitCondition, error)
if e.Integration == nil {
return false, nil, nil
}
- if !pointer.BoolDeref(t.Enabled, true) {
+ if !ptr.Deref(t.Enabled, true) {
return false, NewIntegrationConditionUserDisabled("Kamelets"),
nil
}
if !e.IntegrationInPhase(v1.IntegrationPhaseInitialization) &&
!e.IntegrationInRunningPhases() {
@@ -88,7 +88,7 @@ func (t *kameletsTrait) Configure(e *Environment) (bool,
*TraitCondition, error)
if t.MountPoint == "" {
t.MountPoint = filepath.Join(camel.BasePath, "kamelets")
}
- if pointer.BoolDeref(t.Auto, true) {
+ if ptr.Deref(t.Auto, true) {
if e.CamelCatalog == nil {
// Cannot execute this trait for synthetic
IntegrationKit. In order to use it, the
// user has to specify forcefully auto=false option and
pass a list of kamelets explicitly
diff --git a/pkg/trait/kamelets_test.go b/pkg/trait/kamelets_test.go
index 85e606bc5..ff379c74d 100644
--- a/pkg/trait/kamelets_test.go
+++ b/pkg/trait/kamelets_test.go
@@ -31,7 +31,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
func TestConfigurationNoKameletsUsed(t *testing.T) {
@@ -602,7 +602,7 @@ func TestKameletSyntheticKitConditionTrue(t *testing.T) {
})
environment.CamelCatalog = nil
environment.Integration.Spec.Sources = nil
- trait.Auto = pointer.Bool(false)
+ trait.Auto = ptr.To(false)
trait.List = "timer-source"
enabled, condition, err := trait.Configure(environment)
diff --git a/pkg/trait/knative.go b/pkg/trait/knative.go
index c8aa3fc87..677cf2f4d 100644
--- a/pkg/trait/knative.go
+++ b/pkg/trait/knative.go
@@ -30,7 +30,7 @@ import (
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
@@ -75,7 +75,7 @@ func (t *knativeTrait) Configure(e *Environment) (bool,
*TraitCondition, error)
if e.Integration == nil {
return false, nil, nil
}
- if !pointer.BoolDeref(t.Enabled, true) {
+ if !ptr.Deref(t.Enabled, true) {
return false, NewIntegrationConditionUserDisabled("Knative"),
nil
}
if e.CamelCatalog == nil {
@@ -90,7 +90,7 @@ func (t *knativeTrait) Configure(e *Environment) (bool,
*TraitCondition, error)
if !e.IntegrationInPhase(v1.IntegrationPhaseInitialization) &&
!e.IntegrationInRunningPhases() {
return false, nil, nil
}
- if !pointer.BoolDeref(t.Auto, true) {
+ if !ptr.Deref(t.Auto, true) {
return true, nil, nil
}
@@ -147,7 +147,7 @@ func (t *knativeTrait) Configure(e *Environment) (bool,
*TraitCondition, error)
}
if t.FilterSourceChannels == nil {
// Filtering is no longer used by default
- t.FilterSourceChannels = pointer.Bool(false)
+ t.FilterSourceChannels = ptr.To(false)
}
if t.SinkBinding == nil {
allowed := t.isSinkBindingAllowed(e)
@@ -159,7 +159,7 @@ func (t *knativeTrait) Configure(e *Environment) (bool,
*TraitCondition, error)
// This is true only when the user set the enabled flag on and the auto flag
off.
func (t *knativeTrait) isForcefullyEnabled() bool {
- return pointer.BoolDeref(t.Enabled, false) &&
!pointer.BoolDeref(t.Auto, true)
+ return ptr.Deref(t.Enabled, false) && !ptr.Deref(t.Auto, true)
}
func filterMetaItems(catalog *camel.RuntimeCatalog, sources []v1.SourceSpec,
cst knativeapi.CamelServiceType, uriType string) ([]string, error) {
@@ -240,7 +240,7 @@ func (t *knativeTrait) configureChannels(e *Environment,
env *knativeapi.CamelEn
knativeapi.CamelMetaKnativeKind: ref.Kind,
knativeapi.CamelMetaKnativeReply:
boolean.FalseString,
}
- if pointer.BoolDeref(t.FilterSourceChannels, false) {
+ if ptr.Deref(t.FilterSourceChannels, false) {
meta[knativeapi.CamelMetaFilterPrefix+knativeHistoryHeader] = loc.Host
}
svc := knativeapi.CamelServiceDefinition{
@@ -417,7 +417,7 @@ func (t *knativeTrait) isSinkBindingAllowed(e *Environment)
bool {
}
func (t *knativeTrait) configureSinkBinding(e *Environment, env
*knativeapi.CamelEnvironment) error {
- if !pointer.BoolDeref(t.SinkBinding, false) {
+ if !ptr.Deref(t.SinkBinding, false) {
return nil
}
var serviceType knativeapi.CamelServiceType
@@ -477,7 +477,7 @@ func (t *knativeTrait) configureSinkBinding(e *Environment,
env *knativeapi.Came
APIVersion: ref.APIVersion,
}
- if pointer.BoolDeref(t.NamespaceLabel, true) {
+ if ptr.Deref(t.NamespaceLabel, true) {
// set the namespace label to allow
automatic sinkbinding injection
enabled, err :=
knativeutil.EnableKnativeBindInNamespace(e.Ctx, e.Client,
e.Integration.Namespace)
if err != nil {
@@ -526,7 +526,7 @@ func (t *knativeTrait) createTrigger(e *Environment, ref
*corev1.ObjectReference
attributes[key] = value
}
- if _, eventTypeSpecified := attributes["type"]; !eventTypeSpecified &&
pointer.BoolDeref(t.FilterEventType, true) && eventType != "" {
+ if _, eventTypeSpecified := attributes["type"]; !eventTypeSpecified &&
ptr.Deref(t.FilterEventType, true) && eventType != "" {
// Apply default trigger filter attribute for the event type
attributes["type"] = eventType
}
diff --git a/pkg/trait/knative_service.go b/pkg/trait/knative_service.go
index 50c87a451..fab0b05a7 100644
--- a/pkg/trait/knative_service.go
+++ b/pkg/trait/knative_service.go
@@ -23,7 +23,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
serving "knative.dev/serving/pkg/apis/serving/v1"
@@ -77,7 +77,7 @@ func (t *knativeServiceTrait) Configure(e *Environment)
(bool, *TraitCondition,
if e.Integration == nil {
return false, nil, nil
}
- if !pointer.BoolDeref(t.Enabled, true) {
+ if !ptr.Deref(t.Enabled, true) {
return false, NewIntegrationCondition(
"KnativeService",
v1.IntegrationConditionKnativeServiceAvailable,
@@ -148,7 +148,7 @@ func (t *knativeServiceTrait) Apply(e *Environment) error {
}
func (t *knativeServiceTrait) SelectControllerStrategy(e *Environment)
(*ControllerStrategy, error) {
- if !pointer.BoolDeref(t.Enabled, true) {
+ if !ptr.Deref(t.Enabled, true) {
// explicitly disabled by the user
return nil, nil
}
@@ -194,7 +194,7 @@ func (t *knativeServiceTrait) SelectControllerStrategy(e
*Environment) (*Control
// This is true only when the user set the enabled flag on and the auto flag
off.
func (t *knativeServiceTrait) isForcefullyEnabled() bool {
- return pointer.BoolDeref(t.Enabled, false) &&
!pointer.BoolDeref(t.Auto, true)
+ return ptr.Deref(t.Enabled, false) && !ptr.Deref(t.Auto, true)
}
func (t *knativeServiceTrait) ControllerStrategySelectorOrder() int {
diff --git a/pkg/trait/knative_service_test.go
b/pkg/trait/knative_service_test.go
index 5fa1e8d10..14ecfc461 100644
--- a/pkg/trait/knative_service_test.go
+++ b/pkg/trait/knative_service_test.go
@@ -28,7 +28,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
serving "knative.dev/serving/pkg/apis/serving/v1"
@@ -88,7 +88,7 @@ func TestKnativeService(t *testing.T) {
Traits: v1.Traits{
KnativeService:
&traitv1.KnativeServiceTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
},
},
@@ -212,9 +212,9 @@ func TestKnativeServiceWithCustomContainerName(t
*testing.T) {
},
KnativeService:
&traitv1.KnativeServiceTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
- Auto: pointer.Bool(false),
+ Auto: ptr.To(false),
},
Container: &traitv1.ContainerTrait{
Name: "my-container-name",
diff --git a/pkg/trait/knative_test.go b/pkg/trait/knative_test.go
index bcecc5581..cc5625bf1 100644
--- a/pkg/trait/knative_test.go
+++ b/pkg/trait/knative_test.go
@@ -28,7 +28,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1"
eventing "knative.dev/eventing/pkg/apis/eventing/v1"
@@ -71,9 +71,9 @@ func TestKnativeEnvConfigurationFromTrait(t *testing.T) {
Traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
- Auto:
pointer.Bool(false),
+ Auto: ptr.To(false),
ChannelSources:
[]string{"channel-source-1"},
ChannelSinks:
[]string{"channel-sink-1"},
EndpointSources:
[]string{"endpoint-source-1"},
@@ -203,7 +203,7 @@ func TestKnativeEnvConfigurationFromSource(t *testing.T) {
Traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
},
},
@@ -315,7 +315,7 @@ func TestKnativeTriggerExplicitFilterConfig(t *testing.T) {
Traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
Filters:
[]string{"source=my-source"},
},
@@ -414,10 +414,10 @@ func
TestKnativeTriggerExplicitFilterConfigNoEventTypeFilter(t *testing.T) {
Traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
Filters:
[]string{"source=my-source"},
- FilterEventType:
pointer.Bool(false),
+ FilterEventType: ptr.To(false),
},
},
},
@@ -513,7 +513,7 @@ func TestKnativeTriggerDefaultEventTypeFilter(t *testing.T)
{
Traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
},
},
@@ -609,9 +609,9 @@ func TestKnativeTriggerDefaultEventTypeFilterDisabled(t
*testing.T) {
Traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
- FilterEventType:
pointer.Bool(false),
+ FilterEventType: ptr.To(false),
},
},
},
@@ -710,7 +710,7 @@ func TestKnativeMultipleTrigger(t *testing.T) {
Traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
},
},
@@ -847,7 +847,7 @@ func TestKnativeMultipleTriggerAdditionalFilterConfig(t
*testing.T) {
Traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
Filters:
[]string{"subject=Hello"},
},
@@ -983,7 +983,7 @@ func TestKnativeTriggerNoEventType(t *testing.T) {
Traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
},
},
@@ -1080,7 +1080,7 @@ func TestKnativeTriggerNoServingAvailable(t *testing.T) {
Traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
},
},
@@ -1393,7 +1393,7 @@ func NewFakeEnvironment(t *testing.T, source
v1.SourceSpec) Environment {
Traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
},
},
@@ -1448,7 +1448,7 @@ func NewFakeEnvironmentForSyntheticKit(t *testing.T)
Environment {
Traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
},
},
@@ -1697,8 +1697,8 @@ func TestKnativeSyntheticKitDefault(t *testing.T) {
func TestKnativeSyntheticKitEnabled(t *testing.T) {
e := NewFakeEnvironmentForSyntheticKit(t)
knTrait, _ := newKnativeTrait().(*knativeTrait)
- knTrait.Enabled = pointer.Bool(true)
- knTrait.Auto = pointer.Bool(false)
+ knTrait.Enabled = ptr.To(true)
+ knTrait.Auto = ptr.To(false)
ok, condition, err := knTrait.Configure(&e)
require.NoError(t, err)
assert.True(t, ok)
diff --git a/pkg/trait/logging.go b/pkg/trait/logging.go
index 54c7a69d6..60cdb4113 100644
--- a/pkg/trait/logging.go
+++ b/pkg/trait/logging.go
@@ -18,11 +18,10 @@ limitations under the License.
package trait
import (
- "k8s.io/utils/pointer"
-
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
"github.com/apache/camel-k/v2/pkg/util/boolean"
"github.com/apache/camel-k/v2/pkg/util/envvar"
+ "k8s.io/utils/ptr"
)
const (
@@ -55,7 +54,7 @@ func (l loggingTrait) Configure(e *Environment) (bool,
*TraitCondition, error) {
if e.Integration == nil {
return false, nil, nil
}
- if !pointer.BoolDeref(l.Enabled, true) {
+ if !ptr.Deref(l.Enabled, true) {
return false, NewIntegrationConditionUserDisabled("Logging"),
nil
}
@@ -80,16 +79,16 @@ func (l loggingTrait) setEnvConfiguration(e *Environment) {
envvar.SetVal(&e.EnvVars, envVarQuarkusLogConsoleFormat,
l.Format)
}
- if pointer.BoolDeref(l.JSON, false) {
+ if ptr.Deref(l.JSON, false) {
envvar.SetVal(&e.EnvVars, envVarQuarkusLogConsoleJSON,
boolean.TrueString)
- if pointer.BoolDeref(l.JSONPrettyPrint, false) {
+ if ptr.Deref(l.JSONPrettyPrint, false) {
envvar.SetVal(&e.EnvVars,
envVarQuarkusLogConsoleJSONPrettyPrint, boolean.TrueString)
}
} else {
// If the trait is false OR unset, we default to false.
envvar.SetVal(&e.EnvVars, envVarQuarkusLogConsoleJSON,
boolean.FalseString)
- if pointer.BoolDeref(l.Color, true) {
+ if ptr.Deref(l.Color, true) {
envvar.SetVal(&e.EnvVars, envVarQuarkusConsoleColor,
boolean.TrueString)
}
}
@@ -103,15 +102,15 @@ func (l loggingTrait) setCatalogConfiguration(e
*Environment) {
if l.Format != "" {
e.ApplicationProperties["camel.k.logging.format"] = l.Format
}
- if pointer.BoolDeref(l.JSON, false) {
+ if ptr.Deref(l.JSON, false) {
e.ApplicationProperties["camel.k.logging.json"] =
boolean.TrueString
- if pointer.BoolDeref(l.JSONPrettyPrint, false) {
+ if ptr.Deref(l.JSONPrettyPrint, false) {
e.ApplicationProperties["camel.k.logging.jsonPrettyPrint"] = boolean.TrueString
}
} else {
// If the trait is false OR unset, we default to false.
e.ApplicationProperties["camel.k.logging.json"] =
boolean.FalseString
- if pointer.BoolDeref(l.Color, true) {
+ if ptr.Deref(l.Color, true) {
e.ApplicationProperties["camel.k.logging.color"] =
boolean.TrueString
}
}
diff --git a/pkg/trait/logging_test.go b/pkg/trait/logging_test.go
index 1a2bae6d3..1ba6c482e 100644
--- a/pkg/trait/logging_test.go
+++ b/pkg/trait/logging_test.go
@@ -26,7 +26,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -63,10 +63,10 @@ func createLoggingTestEnv(t *testing.T, color bool, json
bool, jsonPrettyPrint b
Profile: v1.TraitProfileOpenShift,
Traits: v1.Traits{
Logging: &traitv1.LoggingTrait{
- Color:
pointer.Bool(color),
+ Color: ptr.To(color),
Format: logFormat,
- JSON:
pointer.Bool(json),
- JSONPrettyPrint:
pointer.Bool(jsonPrettyPrint),
+ JSON: ptr.To(json),
+ JSONPrettyPrint:
ptr.To(jsonPrettyPrint),
Level: logLevel,
},
},
diff --git a/pkg/trait/mount.go b/pkg/trait/mount.go
index 778de6a68..becc42da9 100644
--- a/pkg/trait/mount.go
+++ b/pkg/trait/mount.go
@@ -25,7 +25,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
serving "knative.dev/serving/pkg/apis/serving/v1"
@@ -206,7 +206,7 @@ func (t *mountTrait) addImplicitKameletsSecrets(e
*Environment) *TraitCondition
"Unexpected error happened while casting to
kamelets trait",
)
}
- if !pointer.BoolDeref(t.ScanKameletsImplicitLabelSecrets, true)
{
+ if !ptr.Deref(t.ScanKameletsImplicitLabelSecrets, true) {
return nil
}
implicitKameletSecrets, err :=
kamelets.listConfigurationSecrets(e)
diff --git a/pkg/trait/owner.go b/pkg/trait/owner.go
index 591390e2f..ee945de0a 100644
--- a/pkg/trait/owner.go
+++ b/pkg/trait/owner.go
@@ -20,7 +20,7 @@ package trait
import (
appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
serving "knative.dev/serving/pkg/apis/serving/v1"
@@ -48,7 +48,7 @@ func (t *ownerTrait) Configure(e *Environment) (bool,
*TraitCondition, error) {
if e.Integration == nil {
return false, nil, nil
}
- if !pointer.BoolDeref(t.Enabled, true) {
+ if !ptr.Deref(t.Enabled, true) {
return false, NewIntegrationConditionUserDisabled("Owner"), nil
}
diff --git a/pkg/trait/pdb.go b/pkg/trait/pdb.go
index 9ef25223f..d4a88a0b0 100644
--- a/pkg/trait/pdb.go
+++ b/pkg/trait/pdb.go
@@ -23,7 +23,7 @@ import (
policyv1 "k8s.io/api/policy/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -46,7 +46,7 @@ func newPdbTrait() Trait {
}
func (t *pdbTrait) Configure(e *Environment) (bool, *TraitCondition, error) {
- if e.Integration == nil || !pointer.BoolDeref(t.Enabled, false) {
+ if e.Integration == nil || !ptr.Deref(t.Enabled, false) {
return false, nil, nil
}
diff --git a/pkg/trait/pdb_test.go b/pkg/trait/pdb_test.go
index 5c72d5a7c..7c32a4467 100644
--- a/pkg/trait/pdb_test.go
+++ b/pkg/trait/pdb_test.go
@@ -27,7 +27,7 @@ import (
corev1 "k8s.io/api/core/v1"
policyv1 "k8s.io/api/policy/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/util/kubernetes"
@@ -102,7 +102,7 @@ func findPdb(resources *kubernetes.Collection)
*policyv1.PodDisruptionBudget {
// nolint: unparam
func createPdbTest() (*pdbTrait, *Environment, *appsv1.Deployment) {
trait, _ := newPdbTrait().(*pdbTrait)
- trait.Enabled = pointer.Bool(true)
+ trait.Enabled = ptr.To(true)
deployment := &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{
diff --git a/pkg/trait/platform.go b/pkg/trait/platform.go
index f46623bf8..cc9a04bbb 100644
--- a/pkg/trait/platform.go
+++ b/pkg/trait/platform.go
@@ -20,7 +20,7 @@ package trait
import (
"github.com/apache/camel-k/v2/pkg/install"
apierrors "k8s.io/apimachinery/pkg/api/errors"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -57,16 +57,16 @@ func (t *platformTrait) Configure(e *Environment) (bool,
*TraitCondition, error)
return false, nil, nil
}
- if t.CreateDefault == nil && pointer.BoolDeref(t.Auto, false) &&
e.Platform == nil {
+ if t.CreateDefault == nil && ptr.Deref(t.Auto, false) && e.Platform ==
nil {
// Calculate if the platform should be automatically created
when missing.
if ocp, err := openshift.IsOpenShift(t.Client); err != nil {
return false, nil, err
} else if ocp {
- t.CreateDefault = pointer.Bool(true)
+ t.CreateDefault = ptr.To(true)
} else if addr, err := image.GetRegistryAddress(e.Ctx,
t.Client); err != nil {
return false, nil, err
} else if addr != nil {
- t.CreateDefault = pointer.Bool(true)
+ t.CreateDefault = ptr.To(true)
}
}
@@ -117,7 +117,7 @@ func (t *platformTrait) getOrCreatePlatform(e *Environment)
(*v1.IntegrationPlat
if err != nil && !apierrors.IsNotFound(err) {
return nil, err
}
- if apierrors.IsNotFound(err) && pointer.BoolDeref(t.CreateDefault,
false) {
+ if apierrors.IsNotFound(err) && ptr.Deref(t.CreateDefault, false) {
pl = t.createDefaultPlatform(e)
e.Resources.Add(pl)
@@ -146,7 +146,7 @@ func (t *platformTrait) createDefaultPlatform(e
*Environment) *v1.IntegrationPla
platformName = platform.DefaultPlatformName
}
namespace := e.Integration.Namespace
- if pointer.BoolDeref(t.Global, false) {
+ if ptr.Deref(t.Global, false) {
operatorNamespace := platform.GetOperatorNamespace()
if operatorNamespace != "" {
namespace = operatorNamespace
diff --git a/pkg/trait/platform_test.go b/pkg/trait/platform_test.go
index 0965773ff..0c1e7d8f0 100644
--- a/pkg/trait/platform_test.go
+++ b/pkg/trait/platform_test.go
@@ -30,7 +30,7 @@ import (
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
func TestPlatformTraitChangeStatus(t *testing.T) {
@@ -61,7 +61,7 @@ func TestPlatformTraitChangeStatus(t *testing.T) {
}
trait, _ := newPlatformTrait().(*platformTrait)
- trait.CreateDefault = pointer.Bool(false)
+ trait.CreateDefault = ptr.To(false)
var err error
trait.Client, err = test.NewFakeClient()
@@ -96,7 +96,7 @@ func TestPlatformTraitCreatesDefaultPlatform(t *testing.T) {
}
trait, _ := newPlatformTrait().(*platformTrait)
- trait.CreateDefault = pointer.Bool(true)
+ trait.CreateDefault = ptr.To(true)
var err error
trait.Client, err = test.NewFakeClient()
@@ -152,7 +152,7 @@ func TestPlatformTraitExisting(t *testing.T) {
}
trait, _ := newPlatformTrait().(*platformTrait)
- trait.CreateDefault = pointer.Bool(true)
+ trait.CreateDefault = ptr.To(true)
var err error
existingPlatform := v1.NewIntegrationPlatform("ns1",
"existing")
diff --git a/pkg/trait/pod.go b/pkg/trait/pod.go
index 80fc15063..715c1916f 100644
--- a/pkg/trait/pod.go
+++ b/pkg/trait/pod.go
@@ -25,7 +25,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/json"
"k8s.io/apimachinery/pkg/util/strategicpatch"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
serving "knative.dev/serving/pkg/apis/serving/v1"
@@ -50,7 +50,7 @@ func (t *podTrait) Configure(e *Environment) (bool,
*TraitCondition, error) {
if e.Integration == nil {
return false, nil, nil
}
- if !pointer.BoolDeref(t.Enabled, true) {
+ if !ptr.Deref(t.Enabled, true) {
return false, NewIntegrationConditionUserDisabled("Pod"), nil
}
if e.Integration.Spec.PodTemplate == nil {
diff --git a/pkg/trait/pod_test.go b/pkg/trait/pod_test.go
index 520a9d388..80d4f0c04 100755
--- a/pkg/trait/pod_test.go
+++ b/pkg/trait/pod_test.go
@@ -24,11 +24,11 @@ import (
"github.com/stretchr/testify/require"
"k8s.io/apimachinery/pkg/util/yaml"
+ "k8s.io/utils/ptr"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/util/digest"
@@ -115,7 +115,7 @@ func TestAutomountServiceAccountToken(t *testing.T) {
// nolint: unparam
func createPodTest(podSpecTemplate string) (*podTrait, *Environment,
*appsv1.Deployment) {
trait, _ := newPodTrait().(*podTrait)
- trait.Enabled = pointer.Bool(true)
+ trait.Enabled = ptr.To(true)
var podSpec v1.PodSpec
if podSpecTemplate != "" {
diff --git a/pkg/trait/prometheus.go b/pkg/trait/prometheus.go
index c4b45427d..4138ff8fd 100644
--- a/pkg/trait/prometheus.go
+++ b/pkg/trait/prometheus.go
@@ -22,7 +22,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
monitoringv1
"github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
@@ -45,13 +45,13 @@ func newPrometheusTrait() Trait {
return &prometheusTrait{
BaseTrait: NewBaseTrait(prometheusTraitID,
prometheusTraitOrder),
PrometheusTrait: traitv1.PrometheusTrait{
- PodMonitor: pointer.Bool(true),
+ PodMonitor: ptr.To(true),
},
}
}
func (t *prometheusTrait) Configure(e *Environment) (bool, *TraitCondition,
error) {
- if e.Integration == nil || !pointer.BoolDeref(t.Enabled, false) {
+ if e.Integration == nil || !ptr.Deref(t.Enabled, false) {
return false, nil, nil
}
@@ -89,7 +89,7 @@ func (t *prometheusTrait) Apply(e *Environment) error {
condition.Message = fmt.Sprintf("%s(%d)", container.Name,
containerPort.ContainerPort)
// Add the PodMonitor resource
- if pointer.BoolDeref(t.PodMonitor, false) {
+ if ptr.Deref(t.PodMonitor, false) {
portName := containerPort.Name
podMonitor, err := t.getPodMonitorFor(e, portName)
if err != nil {
diff --git a/pkg/trait/pull_secret.go b/pkg/trait/pull_secret.go
index a0dc5549f..6f91c89c2 100644
--- a/pkg/trait/pull_secret.go
+++ b/pkg/trait/pull_secret.go
@@ -23,7 +23,7 @@ import (
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
@@ -53,21 +53,21 @@ func (t *pullSecretTrait) Configure(e *Environment) (bool,
*TraitCondition, erro
if e.Integration == nil {
return false, nil, nil
}
- if !pointer.BoolDeref(t.Enabled, true) {
+ if !ptr.Deref(t.Enabled, true) {
return false,
NewIntegrationConditionUserDisabled("PullSecret"), nil
}
if !e.IntegrationInRunningPhases() {
return false, nil, nil
}
- if pointer.BoolDeref(t.Auto, true) {
+ if ptr.Deref(t.Auto, true) {
err := t.autoConfigure(e)
if err != nil {
return false, nil, err
}
}
- return t.SecretName != "" || pointer.BoolDeref(t.ImagePullerDelegation,
false), nil, nil
+ return t.SecretName != "" || ptr.Deref(t.ImagePullerDelegation, false),
nil, nil
}
func (t *pullSecretTrait) autoConfigure(e *Environment) error {
if t.SecretName == "" {
@@ -105,7 +105,7 @@ func (t *pullSecretTrait) Apply(e *Environment) error {
})
})
}
- if pointer.BoolDeref(t.ImagePullerDelegation, false) {
+ if ptr.Deref(t.ImagePullerDelegation, false) {
if err := t.delegateImagePuller(e); err != nil {
return err
}
diff --git a/pkg/trait/pull_secret_test.go b/pkg/trait/pull_secret_test.go
index e470c51f1..ffe5e0c44 100644
--- a/pkg/trait/pull_secret_test.go
+++ b/pkg/trait/pull_secret_test.go
@@ -29,7 +29,7 @@ import (
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
"sigs.k8s.io/controller-runtime/pkg/client"
"github.com/stretchr/testify/assert"
@@ -66,7 +66,7 @@ func TestPullSecretAuto(t *testing.T) {
e, _ := getEnvironmentAndDeployment(t)
trait, _ := newPullSecretTrait().(*pullSecretTrait)
- trait.Auto = pointer.Bool(false)
+ trait.Auto = ptr.To(false)
enabled, condition, err := trait.Configure(e)
require.NoError(t, err)
assert.False(t, enabled)
@@ -77,8 +77,8 @@ func TestPullSecretImagePullerDelegation(t *testing.T) {
e, _ := getEnvironmentAndDeployment(t)
trait, _ := newPullSecretTrait().(*pullSecretTrait)
- trait.Auto = pointer.Bool(false)
- trait.ImagePullerDelegation = pointer.Bool(true)
+ trait.Auto = ptr.To(false)
+ trait.ImagePullerDelegation = ptr.To(true)
enabled, condition, err := trait.Configure(e)
require.NoError(t, err)
assert.True(t, enabled)
diff --git a/pkg/trait/quarkus.go b/pkg/trait/quarkus.go
index 8d4744614..2c4e5e219 100644
--- a/pkg/trait/quarkus.go
+++ b/pkg/trait/quarkus.go
@@ -24,7 +24,7 @@ import (
"github.com/rs/xid"
corev1 "k8s.io/api/core/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -429,7 +429,7 @@ func (t *quarkusTrait) isIncrementalImageBuild(e
*Environment) bool {
// We need to get this information from the builder trait
if trait := e.Catalog.GetTrait(builderTraitID); trait != nil {
builder, ok := trait.(*builderTrait)
- return ok && pointer.BoolDeref(builder.IncrementalImageBuild,
true)
+ return ok && ptr.Deref(builder.IncrementalImageBuild, true)
}
// Default always to true for performance reasons
diff --git a/pkg/trait/registry.go b/pkg/trait/registry.go
index 3ef00ea1d..288aef615 100644
--- a/pkg/trait/registry.go
+++ b/pkg/trait/registry.go
@@ -34,7 +34,7 @@ import (
"github.com/apache/camel-k/v2/pkg/util/registry"
corev1 "k8s.io/api/core/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
)
@@ -61,7 +61,7 @@ func (t *registryTrait) InfluencesKit() bool {
func (t *registryTrait) Configure(e *Environment) (bool, *TraitCondition,
error) {
// disabled by default
- if e.IntegrationKit == nil || !pointer.BoolDeref(t.Enabled, false) {
+ if e.IntegrationKit == nil || !ptr.Deref(t.Enabled, false) {
return false, nil, nil
}
enabled := e.IntegrationKitInPhase(v1.IntegrationKitPhaseBuildSubmitted)
diff --git a/pkg/trait/route.go b/pkg/trait/route.go
index a95e9827d..c35b83c87 100644
--- a/pkg/trait/route.go
+++ b/pkg/trait/route.go
@@ -25,7 +25,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
routev1 "github.com/openshift/api/route/v1"
@@ -63,7 +63,7 @@ func (t *routeTrait) Configure(e *Environment) (bool,
*TraitCondition, error) {
if e.Integration == nil {
return false, nil, nil
}
- if !pointer.BoolDeref(t.Enabled, true) {
+ if !ptr.Deref(t.Enabled, true) {
return false, NewIntegrationCondition(
"Route",
v1.IntegrationConditionExposureAvailable,
diff --git a/pkg/trait/route_test.go b/pkg/trait/route_test.go
index 927998678..376464fa6 100644
--- a/pkg/trait/route_test.go
+++ b/pkg/trait/route_test.go
@@ -29,7 +29,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -230,7 +230,7 @@ func TestRoute_Disabled(t *testing.T) {
environment.Integration.Spec.Traits = v1.Traits{
Route: &traitv1.RouteTrait{
Trait: traitv1.Trait{
- Enabled: pointer.Bool(false),
+ Enabled: ptr.To(false),
},
},
}
diff --git a/pkg/trait/security_context.go b/pkg/trait/security_context.go
index d1dfa1b26..c43d90f98 100644
--- a/pkg/trait/security_context.go
+++ b/pkg/trait/security_context.go
@@ -21,7 +21,7 @@ import (
"fmt"
corev1 "k8s.io/api/core/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -45,7 +45,7 @@ func newSecurityContextTrait() Trait {
return &securityContextTrait{
BasePlatformTrait: NewBasePlatformTrait(securityContextTraitID,
securityContextTraitOder),
SecurityContextTrait: traitv1.SecurityContextTrait{
- RunAsNonRoot:
pointer.Bool(defaultPodRunAsNonRoot),
+ RunAsNonRoot: ptr.To(defaultPodRunAsNonRoot),
SeccompProfileType: defaultPodSeccompProfileType,
},
}
diff --git a/pkg/trait/security_context_test.go
b/pkg/trait/security_context_test.go
index c45edabf9..633177233 100644
--- a/pkg/trait/security_context_test.go
+++ b/pkg/trait/security_context_test.go
@@ -26,7 +26,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -63,7 +63,7 @@ func TestDefaultPodKubernetesSecurityContext(t *testing.T) {
d :=
environment.Resources.GetDeploymentForIntegration(environment.Integration)
assert.NotNil(t, d)
- assert.Equal(t, pointer.Bool(defaultPodRunAsNonRoot),
d.Spec.Template.Spec.SecurityContext.RunAsNonRoot)
+ assert.Equal(t, ptr.To(defaultPodRunAsNonRoot),
d.Spec.Template.Spec.SecurityContext.RunAsNonRoot)
assert.Nil(t, d.Spec.Template.Spec.SecurityContext.RunAsUser)
assert.Equal(t, corev1.SeccompProfileTypeRuntimeDefault,
d.Spec.Template.Spec.SecurityContext.SeccompProfile.Type)
}
@@ -83,7 +83,7 @@ func TestDefaultPodOpenshiftSecurityContext(t *testing.T) {
d :=
environment.Resources.GetDeploymentForIntegration(environment.Integration)
assert.NotNil(t, d)
- assert.Equal(t, pointer.Bool(defaultPodRunAsNonRoot),
d.Spec.Template.Spec.SecurityContext.RunAsNonRoot)
+ assert.Equal(t, ptr.To(defaultPodRunAsNonRoot),
d.Spec.Template.Spec.SecurityContext.RunAsNonRoot)
assert.NotNil(t, d.Spec.Template.Spec.SecurityContext.RunAsUser)
assert.Equal(t, corev1.SeccompProfileTypeRuntimeDefault,
d.Spec.Template.Spec.SecurityContext.SeccompProfile.Type)
}
@@ -113,8 +113,8 @@ func TestUserPodSecurityContext(t *testing.T) {
environment := createPodSettingContextEnvironment(t,
v1.TraitProfileKubernetes)
environment.Integration.Spec.Traits = v1.Traits{
SecurityContext: &traitv1.SecurityContextTrait{
- RunAsNonRoot: pointer.Bool(false),
- RunAsUser: pointer.Int64(1000),
+ RunAsNonRoot: ptr.To(false),
+ RunAsUser: ptr.To(int64(1000)),
SeccompProfileType: "Unconfined",
},
}
@@ -131,8 +131,8 @@ func TestUserPodSecurityContext(t *testing.T) {
d :=
environment.Resources.GetDeploymentForIntegration(environment.Integration)
assert.NotNil(t, d)
- assert.Equal(t, pointer.Bool(false),
d.Spec.Template.Spec.SecurityContext.RunAsNonRoot)
- assert.Equal(t, pointer.Int64(1000),
d.Spec.Template.Spec.SecurityContext.RunAsUser)
+ assert.Equal(t, ptr.To(false),
d.Spec.Template.Spec.SecurityContext.RunAsNonRoot)
+ assert.Equal(t, ptr.To(int64(1000)),
d.Spec.Template.Spec.SecurityContext.RunAsUser)
assert.Equal(t, corev1.SeccompProfileTypeUnconfined,
d.Spec.Template.Spec.SecurityContext.SeccompProfile.Type)
}
diff --git a/pkg/trait/service.go b/pkg/trait/service.go
index 50fc30b6d..51859517f 100644
--- a/pkg/trait/service.go
+++ b/pkg/trait/service.go
@@ -22,7 +22,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -50,7 +50,7 @@ func (t *serviceTrait) Configure(e *Environment) (bool,
*TraitCondition, error)
if e.Integration == nil {
return false, nil, nil
}
- if !pointer.BoolDeref(t.Enabled, true) {
+ if !ptr.Deref(t.Enabled, true) {
return false, NewIntegrationCondition(
"Service",
v1.IntegrationConditionServiceAvailable,
@@ -66,7 +66,7 @@ func (t *serviceTrait) Configure(e *Environment) (bool,
*TraitCondition, error)
// then this service is disabled
if e.GetTrait(knativeServiceTraitID) != nil {
knativeServiceTrait, _ :=
e.GetTrait(knativeServiceTraitID).(*knativeServiceTrait)
- if pointer.BoolDeref(knativeServiceTrait.Enabled, true) {
+ if ptr.Deref(knativeServiceTrait.Enabled, true) {
return false,
NewIntegrationConditionPlatformDisabledWithMessage("Service", "knative-service
trait has priority over this trait"), nil
}
}
@@ -75,7 +75,7 @@ func (t *serviceTrait) Configure(e *Environment) (bool,
*TraitCondition, error)
return false, nil, nil
}
- if pointer.BoolDeref(t.Auto, true) {
+ if ptr.Deref(t.Auto, true) {
sources, err := kubernetes.ResolveIntegrationSources(e.Ctx,
t.Client, e.Integration, e.Resources)
var condition *TraitCondition
if err != nil {
@@ -118,7 +118,7 @@ func (t *serviceTrait) Apply(e *Environment) error {
default:
return fmt.Errorf("unsupported service type:
%s", *t.Type)
}
- } else if pointer.BoolDeref(t.NodePort, false) {
+ } else if ptr.Deref(t.NodePort, false) {
t.L.ForIntegration(e.Integration).Infof("Integration
%s/%s should no more use the flag node-port as it is deprecated, use type
instead", e.Integration.Namespace, e.Integration.Name)
serviceType = corev1.ServiceTypeNodePort
}
diff --git a/pkg/trait/service_binding.go b/pkg/trait/service_binding.go
index 7e328772a..e2956858f 100644
--- a/pkg/trait/service_binding.go
+++ b/pkg/trait/service_binding.go
@@ -21,7 +21,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/dynamic"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
sb
"github.com/redhat-developer/service-binding-operator/apis/binding/v1alpha1"
"github.com/redhat-developer/service-binding-operator/pkg/client/kubernetes"
@@ -71,7 +71,7 @@ func (t *serviceBindingTrait) Configure(e *Environment)
(bool, *TraitCondition,
if e.Integration == nil {
return false, nil, nil
}
- if !pointer.BoolDeref(t.Enabled, true) {
+ if !ptr.Deref(t.Enabled, true) {
return false,
NewIntegrationConditionUserDisabled("ServiceBinding"), nil
}
if e.CamelCatalog == nil {
diff --git a/pkg/trait/service_test.go b/pkg/trait/service_test.go
index 1769110f9..58063df29 100644
--- a/pkg/trait/service_test.go
+++ b/pkg/trait/service_test.go
@@ -26,7 +26,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -78,9 +78,9 @@ func TestServiceWithDefaults(t *testing.T) {
Traits: v1.Traits{
Service: &traitv1.ServiceTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
- Auto: pointer.Bool(false),
+ Auto: ptr.To(false),
},
},
},
@@ -177,13 +177,13 @@ func TestService(t *testing.T) {
Traits: v1.Traits{
Service: &traitv1.ServiceTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
},
Container: &traitv1.ContainerTrait{
PlatformBaseTrait:
traitv1.PlatformBaseTrait{},
- Auto:
pointer.Bool(false),
- Expose:
pointer.Bool(true),
+ Auto:
ptr.To(false),
+ Expose: ptr.To(true),
Port: 8081,
PortName: "http-8081",
ServicePort: 81,
@@ -269,9 +269,9 @@ func TestServiceWithCustomContainerName(t *testing.T) {
Traits: v1.Traits{
Service: &traitv1.ServiceTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
- Auto: pointer.Bool(false),
+ Auto: ptr.To(false),
},
Container: &traitv1.ContainerTrait{
Name: "my-container-name",
@@ -362,9 +362,9 @@ func TestServiceWithNodePort(t *testing.T) {
Traits: v1.Traits{
Service: &traitv1.ServiceTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
- Auto: pointer.Bool(false),
+ Auto: ptr.To(false),
Type: &serviceType,
},
},
@@ -457,13 +457,13 @@ func TestServiceWithKnativeServiceEnabled(t *testing.T) {
Traits: v1.Traits{
Service: &traitv1.ServiceTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
- Auto: pointer.Bool(false),
+ Auto: ptr.To(false),
},
KnativeService:
&traitv1.KnativeServiceTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
},
},
@@ -639,7 +639,7 @@ func
TestServiceWithKnativeServiceDisabledInIntegrationPlatform(t *testing.T) {
Traits: v1.Traits{
KnativeService:
&traitv1.KnativeServiceTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(false),
+ Enabled: ptr.To(false),
},
},
},
diff --git a/pkg/trait/toleration.go b/pkg/trait/toleration.go
index 1a55ee1b0..0414e2029 100644
--- a/pkg/trait/toleration.go
+++ b/pkg/trait/toleration.go
@@ -21,7 +21,7 @@ import (
"fmt"
corev1 "k8s.io/api/core/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
"github.com/apache/camel-k/v2/pkg/util/kubernetes"
@@ -44,7 +44,7 @@ func newTolerationTrait() Trait {
}
func (t *tolerationTrait) Configure(e *Environment) (bool, *TraitCondition,
error) {
- if e.Integration == nil || !pointer.BoolDeref(t.Enabled, false) {
+ if e.Integration == nil || !ptr.Deref(t.Enabled, false) {
return false, nil, nil
}
diff --git a/pkg/trait/toleration_test.go b/pkg/trait/toleration_test.go
index 184a671cf..ea4538902 100644
--- a/pkg/trait/toleration_test.go
+++ b/pkg/trait/toleration_test.go
@@ -24,7 +24,7 @@ import (
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
func TestConfigureTolerationTraitMissingTaint(t *testing.T) {
@@ -133,7 +133,7 @@ func TestTolerationValidTaints(t *testing.T) {
func createNominalTolerationTrait() *tolerationTrait {
tolerationTrait, _ := newTolerationTrait().(*tolerationTrait)
- tolerationTrait.Enabled = pointer.Bool(true)
+ tolerationTrait.Enabled = ptr.To(true)
tolerationTrait.Taints = make([]string, 0)
return tolerationTrait
diff --git a/pkg/trait/trait_configure_test.go
b/pkg/trait/trait_configure_test.go
index 1dbd2c644..1c6654e8a 100644
--- a/pkg/trait/trait_configure_test.go
+++ b/pkg/trait/trait_configure_test.go
@@ -24,7 +24,7 @@ import (
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -38,15 +38,15 @@ func TestTraitConfiguration(t *testing.T) {
Profile: v1.TraitProfileKubernetes,
Traits: v1.Traits{
Logging: &traitv1.LoggingTrait{
- JSON:
pointer.Bool(true),
- JSONPrettyPrint:
pointer.Bool(false),
+ JSON: ptr.To(true),
+ JSONPrettyPrint: ptr.To(false),
Level: "DEBUG",
},
Service: &traitv1.ServiceTrait{
Trait: traitv1.Trait{
- Enabled:
pointer.Bool(true),
+ Enabled: ptr.To(true),
},
- Auto: pointer.Bool(true),
+ Auto: ptr.To(true),
},
},
},
@@ -78,7 +78,7 @@ func TestTraitConfigurationFromAnnotations(t *testing.T) {
Profile: v1.TraitProfileKubernetes,
Traits: v1.Traits{
Cron: &traitv1.CronTrait{
- Fallback:
pointer.Bool(true),
+ Fallback: ptr.To(true),
ConcurrencyPolicy: "mypolicy",
},
},
@@ -141,7 +141,7 @@ func TestTraitConfigurationOverrideRulesFromAnnotations(t
*testing.T) {
Spec: v1.IntegrationKitSpec{
Traits: v1.IntegrationKitTraits{
Builder: &traitv1.BuilderTrait{
- Verbose: pointer.Bool(false),
+ Verbose: ptr.To(false),
},
},
},
@@ -219,7 +219,7 @@ func TestTraitDecode(t *testing.T) {
PlatformBaseTrait: traitv1.PlatformBaseTrait{},
Name: "test-container",
Port: 7071,
- Auto: pointer.Bool(false),
+ Auto: ptr.To(false),
})
target, ok := newContainerTrait().(*containerTrait)
@@ -229,5 +229,5 @@ func TestTraitDecode(t *testing.T) {
assert.Equal(t, "test-container", target.Name)
assert.Equal(t, 7071, target.Port)
- assert.False(t, pointer.BoolDeref(target.Auto, true))
+ assert.False(t, ptr.Deref(target.Auto, true))
}
diff --git a/pkg/trait/trait_test.go b/pkg/trait/trait_test.go
index 34f0ac5bc..a759f17e2 100644
--- a/pkg/trait/trait_test.go
+++ b/pkg/trait/trait_test.go
@@ -29,7 +29,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -95,7 +95,7 @@ func TestOpenShiftTraitsWithWebAndDisabledTrait(t *testing.T)
{
env := createTestEnv(t, v1.IntegrationPlatformClusterOpenShift,
"from('netty-http:http').to('log:info')")
env.Integration.Spec.Traits.Service = &traitv1.ServiceTrait{
Trait: traitv1.Trait{
- Enabled: pointer.Bool(false),
+ Enabled: ptr.To(false),
},
}
res := processTestEnv(t, env)
@@ -144,20 +144,20 @@ func TestTraitHierarchyDecode(t *testing.T) {
env.Platform.Spec.Traits.KnativeService = &traitv1.KnativeServiceTrait{
Trait: traitv1.Trait{
- Enabled: pointer.Bool(false),
+ Enabled: ptr.To(false),
},
- MinScale: pointer.Int(1),
- MaxScale: pointer.Int(10),
- Target: pointer.Int(15),
+ MinScale: ptr.To(1),
+ MaxScale: ptr.To(10),
+ Target: ptr.To(15),
}
env.Platform.ResyncStatusFullConfig()
env.Integration.Spec.Traits.KnativeService =
&traitv1.KnativeServiceTrait{
Trait: traitv1.Trait{
- Enabled: pointer.Bool(true),
+ Enabled: ptr.To(true),
},
- MinScale: pointer.Int(5),
- MaxScale: pointer.Int(20),
+ MinScale: ptr.To(5),
+ MaxScale: ptr.To(20),
}
c := NewTraitTestCatalog()
diff --git a/pkg/trait/trait_types_test.go b/pkg/trait/trait_types_test.go
index ab3eabef3..6397995c4 100644
--- a/pkg/trait/trait_types_test.go
+++ b/pkg/trait/trait_types_test.go
@@ -24,7 +24,7 @@ import (
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -199,9 +199,9 @@ func
TestDetermineControllerStrategySyntheticKitForceKnative(t *testing.T) {
e.Integration.Spec.Traits = v1.Traits{
KnativeService: &trait.KnativeServiceTrait{
Trait: trait.Trait{
- Enabled: pointer.Bool(true),
+ Enabled: ptr.To(true),
},
- Auto: pointer.Bool(false),
+ Auto: ptr.To(false),
},
}
e.Platform.ResyncStatusFullConfig()
diff --git a/pkg/trait/util_test.go b/pkg/trait/util_test.go
index fe3977fd4..e8e8e153c 100644
--- a/pkg/trait/util_test.go
+++ b/pkg/trait/util_test.go
@@ -21,7 +21,7 @@ import (
"testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -36,8 +36,8 @@ func TestToTraitMap(t *testing.T) {
Container: &traitv1.ContainerTrait{
PlatformBaseTrait: traitv1.PlatformBaseTrait{},
Name: "test-container",
- Auto: pointer.Bool(false),
- Expose: pointer.Bool(true),
+ Auto: ptr.To(false),
+ Expose: ptr.To(true),
Port: 8081,
PortName: "http-8081",
ServicePort: 81,
@@ -45,7 +45,7 @@ func TestToTraitMap(t *testing.T) {
},
Service: &traitv1.ServiceTrait{
Trait: traitv1.Trait{
- Enabled: pointer.Bool(true),
+ Enabled: ptr.To(true),
},
},
Addons: map[string]v1.AddonTrait{
@@ -84,8 +84,8 @@ func TestToPropertyMap(t *testing.T) {
trait := traitv1.ContainerTrait{
PlatformBaseTrait: traitv1.PlatformBaseTrait{},
Name: "test-container",
- Auto: pointer.Bool(false),
- Expose: pointer.Bool(true),
+ Auto: ptr.To(false),
+ Expose: ptr.To(true),
Port: 8081,
PortName: "http-8081",
ServicePort: 81,
@@ -159,8 +159,8 @@ func TestToTrait(t *testing.T) {
expected := traitv1.ContainerTrait{
PlatformBaseTrait: traitv1.PlatformBaseTrait{},
Name: "test-container",
- Auto: pointer.Bool(false),
- Expose: pointer.Bool(true),
+ Auto: ptr.To(false),
+ Expose: ptr.To(true),
Port: 8081,
PortName: "http-8081",
ServicePort: 81,
diff --git a/pkg/util/bindings/bindings_test.go
b/pkg/util/bindings/bindings_test.go
index 0cd7e3516..f1e06b7a0 100644
--- a/pkg/util/bindings/bindings_test.go
+++ b/pkg/util/bindings/bindings_test.go
@@ -23,7 +23,7 @@ import (
"testing"
corev1 "k8s.io/api/core/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -128,7 +128,7 @@ func TestBindings(t *testing.T) {
traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
Filters:
[]string{"type=myeventtype"},
- FilterEventType: pointer.Bool(true),
+ FilterEventType: ptr.To(true),
},
},
},
@@ -183,7 +183,7 @@ func TestBindings(t *testing.T) {
{
endpointType: v1.EndpointTypeSink,
endpoint: v1.Endpoint{
- URI: pointer.String("https://myurl/hey";),
+ URI: ptr.To("https://myurl/hey";),
Properties:
asEndpointProperties(map[string]string{
"ce.override.ce-type": "mytype",
}),
@@ -191,7 +191,7 @@ func TestBindings(t *testing.T) {
uri: "knative:endpoint/sink?ce.override.ce-type=mytype",
traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
- SinkBinding: pointer.Bool(false),
+ SinkBinding: ptr.To(false),
Configuration:
asKnativeConfig("https://myurl/hey";),
},
},
@@ -199,7 +199,7 @@ func TestBindings(t *testing.T) {
{
endpointType: v1.EndpointTypeSink,
endpoint: v1.Endpoint{
- URI: pointer.String("https://myurl/hey";),
+ URI: ptr.To("https://myurl/hey";),
},
profile: v1.TraitProfileKubernetes,
uri: "https://myurl/hey";,
@@ -207,7 +207,7 @@ func TestBindings(t *testing.T) {
{
endpointType: v1.EndpointTypeSink,
endpoint: v1.Endpoint{
- URI: pointer.String("docker://xxx"),
+ URI: ptr.To("docker://xxx"),
},
uri: "docker://xxx",
},
diff --git a/pkg/util/bindings/catalog.go b/pkg/util/bindings/catalog.go
index 995228150..18bcb2483 100644
--- a/pkg/util/bindings/catalog.go
+++ b/pkg/util/bindings/catalog.go
@@ -25,7 +25,7 @@ import (
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/v2/pkg/platform"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
var bindingProviders []BindingProvider
@@ -76,7 +76,7 @@ func Translate(ctx BindingContext, endpointCtx
EndpointContext, endpoint v1.Endp
if endpoint.Ref != nil {
errorMessage = fmt.Sprintf("could not find any suitable binding
provider for %s/%s %s in namespace %s. Bindings available: %q",
endpoint.Ref.APIVersion, endpoint.Ref.Kind,
endpoint.Ref.Name, endpoint.Ref.Namespace, availableBindings)
- } else if pointer.StringDeref(endpoint.URI, "") != "" {
+ } else if ptr.Deref(endpoint.URI, "") != "" {
errorMessage = fmt.Sprintf("could not find any suitable binding
provider for %s", *endpoint.URI)
}
return nil, fmt.Errorf(errorMessage)
diff --git a/pkg/util/bindings/knative_ref_test.go
b/pkg/util/bindings/knative_ref_test.go
index 18e482090..be0506a7d 100644
--- a/pkg/util/bindings/knative_ref_test.go
+++ b/pkg/util/bindings/knative_ref_test.go
@@ -25,7 +25,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
v1 "k8s.io/api/core/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/util/test"
@@ -49,7 +49,7 @@ func TestKnativeRefAsSource(t *testing.T) {
},
},
uri:
"knative:event?apiVersion=eventing.knative.dev%2Fv1&kind=Broker&name=default",
- filterEventType: pointer.Bool(false),
+ filterEventType: ptr.To(false),
},
{
name: "broker-name-property",
@@ -62,7 +62,7 @@ func TestKnativeRefAsSource(t *testing.T) {
Properties:
asEndpointProperties(map[string]string{"name": "my-broker"}),
},
uri:
"knative:event?apiVersion=eventing.knative.dev%2Fv1&kind=Broker&name=my-broker",
- filterEventType: pointer.Bool(false),
+ filterEventType: ptr.To(false),
},
{
name: "event-type-filter",
@@ -102,7 +102,7 @@ func TestKnativeRefAsSource(t *testing.T) {
},
uri:
"knative:event?apiVersion=eventing.knative.dev%2Fv1&kind=Broker&name=default",
filters: []string{"source=my-source",
"subject=mySubject"},
- filterEventType: pointer.Bool(false),
+ filterEventType: ptr.To(false),
},
{
name: "event-extension-filters",
@@ -116,7 +116,7 @@ func TestKnativeRefAsSource(t *testing.T) {
},
uri:
"knative:event?apiVersion=eventing.knative.dev%2Fv1&kind=Broker&name=default",
filters: []string{"myextension=foo"},
- filterEventType: pointer.Bool(false),
+ filterEventType: ptr.To(false),
},
{
name: "channel",
@@ -164,7 +164,7 @@ func TestKnativeRefAsSource(t *testing.T) {
assert.NotNil(t, binding)
assert.Equal(t, tc.uri, binding.URI)
- if tc.filters != nil ||
!pointer.BoolDeref(tc.filterEventType, true) {
+ if tc.filters != nil || !ptr.Deref(tc.filterEventType,
true) {
assert.NotNil(t, binding.Traits.Knative)
assert.Len(t, binding.Traits.Knative.Filters,
len(tc.filters))
@@ -172,7 +172,7 @@ func TestKnativeRefAsSource(t *testing.T) {
assert.Contains(t,
binding.Traits.Knative.Filters, filterExpression)
}
- assert.Equal(t,
pointer.BoolDeref(binding.Traits.Knative.FilterEventType, true),
pointer.BoolDeref(tc.filterEventType, true))
+ assert.Equal(t,
ptr.Deref(binding.Traits.Knative.FilterEventType, true),
ptr.Deref(tc.filterEventType, true))
}
})
}
diff --git a/pkg/util/bindings/knative_uri.go b/pkg/util/bindings/knative_uri.go
index 2873dca4a..ae5a626db 100644
--- a/pkg/util/bindings/knative_uri.go
+++ b/pkg/util/bindings/knative_uri.go
@@ -21,12 +21,11 @@ import (
"net/url"
"strings"
- "k8s.io/utils/pointer"
-
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
knativeapis "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "k8s.io/utils/ptr"
"github.com/apache/camel-k/v2/pkg/util/uri"
)
@@ -91,7 +90,7 @@ func (k KnativeURIBindingProvider) Translate(ctx
BindingContext, endpointCtx End
Traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
Configuration: config,
- SinkBinding: pointer.Bool(false),
+ SinkBinding: ptr.To(false),
},
},
}, nil
@@ -164,7 +163,7 @@ func (k V1alpha1KnativeURIBindingProvider) Translate(ctx
V1alpha1BindingContext,
Traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
Configuration: config,
- SinkBinding: pointer.Bool(false),
+ SinkBinding: ptr.To(false),
},
},
}, nil
diff --git a/pkg/util/digest/digest_test.go b/pkg/util/digest/digest_test.go
index a087dfc37..81dd4aa44 100644
--- a/pkg/util/digest/digest_test.go
+++ b/pkg/util/digest/digest_test.go
@@ -22,7 +22,7 @@ import (
"testing"
"github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/stretchr/testify/assert"
@@ -71,7 +71,7 @@ func TestDigestUsesConfigmap(t *testing.T) {
Traits: v1.Traits{
Mount: &trait.MountTrait{
Configs: []string{"configmap:cm"},
- HotReload: pointer.Bool(true),
+ HotReload: ptr.To(true),
},
},
},
@@ -101,7 +101,7 @@ func TestDigestUsesSecret(t *testing.T) {
Traits: v1.Traits{
Mount: &trait.MountTrait{
Configs: []string{"secret:mysec"},
- HotReload: pointer.Bool(true),
+ HotReload: ptr.To(true),
},
},
},
diff --git a/pkg/util/kubernetes/security.go b/pkg/util/kubernetes/security.go
index 3c5d55697..1f4e346a2 100644
--- a/pkg/util/kubernetes/security.go
+++ b/pkg/util/kubernetes/security.go
@@ -19,17 +19,17 @@ package kubernetes
import (
corev1 "k8s.io/api/core/v1"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
// DefaultOperatorSecurityContext to ensure a container with low privilege and
limited permissions.
func DefaultOperatorSecurityContext() *corev1.SecurityContext {
sc := corev1.SecurityContext{
- RunAsNonRoot: pointer.Bool(true),
+ RunAsNonRoot: ptr.To(true),
SeccompProfile: &corev1.SeccompProfile{
Type: corev1.SeccompProfileTypeRuntimeDefault,
},
- AllowPrivilegeEscalation: pointer.Bool(false),
+ AllowPrivilegeEscalation: ptr.To(false),
Capabilities: &corev1.Capabilities{Drop:
[]corev1.Capability{"ALL"}},
}
diff --git a/pkg/util/openshift/openshift.go b/pkg/util/openshift/openshift.go
index 77e02b627..d2e280bd9 100644
--- a/pkg/util/openshift/openshift.go
+++ b/pkg/util/openshift/openshift.go
@@ -28,7 +28,7 @@ import (
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
// IsOpenShift returns true if we are connected to a OpenShift cluster.
@@ -88,11 +88,11 @@ func GetOpenshiftSecurityContextRestricted(ctx
context.Context, client kubernete
sc := corev1.SecurityContext{
RunAsUser: uid,
- RunAsNonRoot: pointer.Bool(true),
+ RunAsNonRoot: ptr.To(true),
SeccompProfile: &corev1.SeccompProfile{
Type: corev1.SeccompProfileTypeRuntimeDefault,
},
- AllowPrivilegeEscalation: pointer.Bool(false),
+ AllowPrivilegeEscalation: ptr.To(false),
Capabilities: &corev1.Capabilities{Drop:
[]corev1.Capability{"ALL"}},
}
diff --git a/pkg/util/openshift/openshift_test.go
b/pkg/util/openshift/openshift_test.go
index e7d943585..1de9a5c01 100644
--- a/pkg/util/openshift/openshift_test.go
+++ b/pkg/util/openshift/openshift_test.go
@@ -26,7 +26,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
fakeclientset "k8s.io/client-go/kubernetes/fake"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
)
var noSccAnnotationNamespace *corev1.Namespace = &corev1.Namespace{
@@ -68,7 +68,7 @@ func TestGetUserIdNamespaceConstrained(t *testing.T) {
uid, errUID := GetOpenshiftUser(context.Background(), kclient, "myuser")
require.NoError(t, errUID)
- assert.Equal(t, pointer.Int64(1000860000), uid)
+ assert.Equal(t, ptr.To(int64(1000860000)), uid)
}
func TestGetPodSecurityContextNamespaceWithoutLabels(t *testing.T) {
