This is an automated email from the ASF dual-hosted git repository.
gfournier pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new dd84adf53 chore(api): deprecate PublishStrategyOptions
dd84adf53 is described below
commit dd84adf53f37a0d355fb7e293278d175192c0196
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Mon Aug 19 10:44:22 2024 +0200
chore(api): deprecate PublishStrategyOptions
It's no longer in use for some time now.
---
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 2 +-
helm/camel-k/crds/camel-k-crds.yaml | 4 ++--
pkg/apis/camel/v1/integrationplatform_types.go | 2 +-
pkg/apis/camel/v1/integrationplatform_types_support.go | 10 ----------
pkg/platform/defaults.go | 9 +--------
.../crd/bases/camel.apache.org_integrationplatforms.yaml | 4 ++--
pkg/trait/builder_test.go | 9 ++++-----
7 files changed, 11 insertions(+), 29 deletions(-)
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
index a2ce10971..09d12c0e9 100644
--- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -2833,7 +2833,7 @@ map[string]string
|
-Generic options that can used by any publish strategy
+Deprecated: no longer in use
|`maxRunningBuilds` +
int32
diff --git a/helm/camel-k/crds/camel-k-crds.yaml
b/helm/camel-k/crds/camel-k-crds.yaml
index 10f51c0fb..6eb2218ec 100644
--- a/helm/camel-k/crds/camel-k-crds.yaml
+++ b/helm/camel-k/crds/camel-k-crds.yaml
@@ -3238,7 +3238,7 @@ spec:
PublishStrategyOptions:
additionalProperties:
type: string
- description: Generic options that can used by any publish
strategy
+ description: 'Deprecated: no longer in use'
type: object
baseImage:
description: |-
@@ -5286,7 +5286,7 @@ spec:
PublishStrategyOptions:
additionalProperties:
type: string
- description: Generic options that can used by any publish
strategy
+ description: 'Deprecated: no longer in use'
type: object
baseImage:
description: |-
diff --git a/pkg/apis/camel/v1/integrationplatform_types.go
b/pkg/apis/camel/v1/integrationplatform_types.go
index b0d1528a7..81ae587cd 100644
--- a/pkg/apis/camel/v1/integrationplatform_types.go
+++ b/pkg/apis/camel/v1/integrationplatform_types.go
@@ -131,7 +131,7 @@ type IntegrationPlatformBuildSpec struct {
Timeout *metav1.Duration `json:"timeout,omitempty"`
// Maven configuration used to build the Camel/Camel-Quarkus
applications
Maven MavenSpec `json:"maven,omitempty"`
- // Generic options that can used by any publish strategy
+ // Deprecated: no longer in use
PublishStrategyOptions map[string]string
`json:"PublishStrategyOptions,omitempty"`
// the maximum amount of parallel running pipelines started by this
operator instance
MaxRunningBuilds int32 `json:"maxRunningBuilds,omitempty"`
diff --git a/pkg/apis/camel/v1/integrationplatform_types_support.go
b/pkg/apis/camel/v1/integrationplatform_types_support.go
index e3f9e4fbd..d4569863a 100644
--- a/pkg/apis/camel/v1/integrationplatform_types_support.go
+++ b/pkg/apis/camel/v1/integrationplatform_types_support.go
@@ -171,16 +171,6 @@ func (in *IntegrationPlatformStatus)
RemoveCondition(condType IntegrationPlatfor
in.Conditions = newConditions
}
-// AddOption add a publish strategy option.
-func (b *IntegrationPlatformBuildSpec) AddOption(option string, value string) {
- options := b.PublishStrategyOptions
- if options == nil {
- options = make(map[string]string)
- b.PublishStrategyOptions = options
- }
- options[option] = value
-}
-
// GetTimeout returns the specified duration or a default one.
func (b IntegrationPlatformBuildSpec) GetTimeout() metav1.Duration {
if b.Timeout == nil {
diff --git a/pkg/platform/defaults.go b/pkg/platform/defaults.go
index 2814d72eb..3b6e89a60 100644
--- a/pkg/platform/defaults.go
+++ b/pkg/platform/defaults.go
@@ -230,10 +230,7 @@ func applyPlatformSpec(source *v1.IntegrationPlatform,
target *v1.IntegrationPla
if target.Status.Build.PublishStrategy == "" {
target.Status.Build.PublishStrategy =
source.Status.Build.PublishStrategy
}
- if target.Status.Build.PublishStrategyOptions == nil {
- log.Debugf("Integration Platform %s [%s]: setting publish
strategy options", target.Name, target.Namespace)
- target.Status.Build.PublishStrategyOptions =
source.Status.Build.PublishStrategyOptions
- }
+
if target.Status.Build.BuildConfiguration.Strategy == "" {
target.Status.Build.BuildConfiguration.Strategy =
source.Status.Build.BuildConfiguration.Strategy
}
@@ -311,10 +308,6 @@ func applyPlatformSpec(source *v1.IntegrationPlatform,
target *v1.IntegrationPla
}
func setPlatformDefaults(p *v1.IntegrationPlatform, verbose bool) error {
- if p.Status.Build.PublishStrategyOptions == nil {
- log.Debugf("Integration Platform %s [%s]: setting publish
strategy options", p.Name, p.Namespace)
- p.Status.Build.PublishStrategyOptions = map[string]string{}
- }
if p.Status.Build.RuntimeVersion == "" {
log.Debugf("Integration Platform %s [%s]: setting runtime
version", p.Name, p.Namespace)
p.Status.Build.RuntimeVersion = defaults.DefaultRuntimeVersion
diff --git
a/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml
b/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml
index 5d992edfa..7b9029b60 100644
--- a/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml
+++ b/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml
@@ -92,7 +92,7 @@ spec:
PublishStrategyOptions:
additionalProperties:
type: string
- description: Generic options that can used by any publish
strategy
+ description: 'Deprecated: no longer in use'
type: object
baseImage:
description: |-
@@ -2140,7 +2140,7 @@ spec:
PublishStrategyOptions:
additionalProperties:
type: string
- description: Generic options that can used by any publish
strategy
+ description: 'Deprecated: no longer in use'
type: object
baseImage:
description: |-
diff --git a/pkg/trait/builder_test.go b/pkg/trait/builder_test.go
index 3ea5de9f0..bc1adede5 100644
--- a/pkg/trait/builder_test.go
+++ b/pkg/trait/builder_test.go
@@ -145,11 +145,10 @@ func createBuilderTestEnv(cluster
v1.IntegrationPlatformCluster, strategy v1.Int
Spec: v1.IntegrationPlatformSpec{
Cluster: cluster,
Build: v1.IntegrationPlatformBuildSpec{
- PublishStrategy: strategy,
- Registry:
v1.RegistrySpec{Address: "registry"},
- RuntimeVersion:
defaults.DefaultRuntimeVersion,
- RuntimeProvider:
v1.RuntimeProviderQuarkus,
- PublishStrategyOptions:
map[string]string{},
+ PublishStrategy: strategy,
+ Registry:
v1.RegistrySpec{Address: "registry"},
+ RuntimeVersion:
defaults.DefaultRuntimeVersion,
+ RuntimeProvider:
v1.RuntimeProviderQuarkus,
BuildConfiguration:
v1.BuildConfiguration{
Strategy: buildStrategy,
},
