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 161fe9eec4eb13f664276af212b7422b549b5282 Author: Pasquale Congiusti <[email protected]> AuthorDate: Fri May 5 10:05:31 2023 +0200 chore: default build strategy --- config/crd/bases/camel.apache.org_integrationplatforms.yaml | 4 ++-- config/samples/bases/camel_v1_integrationplatform.yaml | 3 +++ docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 2 +- helm/camel-k/crds/crd-integration-platform.yaml | 4 ++-- pkg/apis/camel/v1/integrationplatform_types.go | 2 +- .../camel/applyconfiguration/camel/v1/integrationplatformbuildspec.go | 2 +- pkg/platform/defaults.go | 2 +- 7 files changed, 11 insertions(+), 8 deletions(-) diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml index bb6c461d5..d2bf63d43 100644 --- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -100,7 +100,7 @@ spec: description: the timeout (in seconds) to use when creating the build tools container image type: string - buildconfiguration: + buildConfiguration: description: the configuration required to build an Integration container image properties: @@ -1705,7 +1705,7 @@ spec: description: the timeout (in seconds) to use when creating the build tools container image type: string - buildconfiguration: + buildConfiguration: description: the configuration required to build an Integration container image properties: diff --git a/config/samples/bases/camel_v1_integrationplatform.yaml b/config/samples/bases/camel_v1_integrationplatform.yaml index 30c582628..fe0440802 100644 --- a/config/samples/bases/camel_v1_integrationplatform.yaml +++ b/config/samples/bases/camel_v1_integrationplatform.yaml @@ -22,3 +22,6 @@ metadata: labels: app: "camel-k" spec: + build: + buildConfiguration: + strategy: pod diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index a49c055ab..8c72fa7ed 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -2459,7 +2459,7 @@ You can define the build strategy, the image registry to use and the Maven confi |Field |Description -|`buildconfiguration` + +|`buildConfiguration` + *xref:#_camel_apache_org_v1_BuildConfiguration[BuildConfiguration]* | diff --git a/helm/camel-k/crds/crd-integration-platform.yaml b/helm/camel-k/crds/crd-integration-platform.yaml index bb6c461d5..d2bf63d43 100644 --- a/helm/camel-k/crds/crd-integration-platform.yaml +++ b/helm/camel-k/crds/crd-integration-platform.yaml @@ -100,7 +100,7 @@ spec: description: the timeout (in seconds) to use when creating the build tools container image type: string - buildconfiguration: + buildConfiguration: description: the configuration required to build an Integration container image properties: @@ -1705,7 +1705,7 @@ spec: description: the timeout (in seconds) to use when creating the build tools container image type: string - buildconfiguration: + buildConfiguration: description: the configuration required to build an Integration container image properties: diff --git a/pkg/apis/camel/v1/integrationplatform_types.go b/pkg/apis/camel/v1/integrationplatform_types.go index ae064cae9..3244cacb9 100644 --- a/pkg/apis/camel/v1/integrationplatform_types.go +++ b/pkg/apis/camel/v1/integrationplatform_types.go @@ -112,7 +112,7 @@ var AllIntegrationPlatformClusters = []IntegrationPlatformCluster{IntegrationPla // You can define the build strategy, the image registry to use and the Maven configuration to adopt. type IntegrationPlatformBuildSpec struct { // the configuration required to build an Integration container image - BuildConfiguration BuildConfiguration `json:"buildconfiguration,omitempty"` + BuildConfiguration BuildConfiguration `json:"buildConfiguration,omitempty"` // the strategy to adopt for publishing an Integration container image PublishStrategy IntegrationPlatformBuildPublishStrategy `json:"publishStrategy,omitempty"` // the Camel K Runtime dependency version diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformbuildspec.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformbuildspec.go index 6a954c69d..924aaea51 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformbuildspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformbuildspec.go @@ -27,7 +27,7 @@ import ( // IntegrationPlatformBuildSpecApplyConfiguration represents an declarative configuration of the IntegrationPlatformBuildSpec type for use // with apply. type IntegrationPlatformBuildSpecApplyConfiguration struct { - BuildConfiguration *BuildConfigurationApplyConfiguration `json:"buildconfiguration,omitempty"` + BuildConfiguration *BuildConfigurationApplyConfiguration `json:"buildConfiguration,omitempty"` PublishStrategy *camelv1.IntegrationPlatformBuildPublishStrategy `json:"publishStrategy,omitempty"` RuntimeVersion *string `json:"runtimeVersion,omitempty"` RuntimeProvider *camelv1.RuntimeProvider `json:"runtimeProvider,omitempty"` diff --git a/pkg/platform/defaults.go b/pkg/platform/defaults.go index 9a5bb8019..f6d14829a 100644 --- a/pkg/platform/defaults.go +++ b/pkg/platform/defaults.go @@ -83,7 +83,7 @@ func ConfigureDefaults(ctx context.Context, c client.Client, p *v1.IntegrationPl if p.Status.Build.BuildConfiguration.Strategy == "" { p.Status.Build.BuildConfiguration.Strategy = v1.BuildStrategyPod - log.Debugf("Integration Platform [%s]: setting build strategy %s", p.Namespace, p.Status.Build.BuildConfiguration.Strategy) + log.Debugf("Integration Platform %s [%s]: setting build strategy %s", p.Name, p.Namespace, p.Status.Build.BuildConfiguration.Strategy) } err := setPlatformDefaults(p, verbose)
