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 de4f44519cebe944384ac00e5271016724346d87 Author: Pasquale Congiusti <[email protected]> AuthorDate: Thu Nov 17 10:39:56 2022 +0100 fix: lint warnings --- pkg/apis/camel/v1alpha1/kamelet_types_support.go | 7 ------- pkg/builder/project.go | 12 ------------ pkg/controller/integrationplatform/initialize.go | 1 - pkg/kamelet/initialize.go | 9 --------- pkg/trait/openapi.go | 10 ---------- pkg/trait/trait_types.go | 14 -------------- pkg/util/camel/catalog.go | 16 ++-------------- 7 files changed, 2 insertions(+), 67 deletions(-) diff --git a/pkg/apis/camel/v1alpha1/kamelet_types_support.go b/pkg/apis/camel/v1alpha1/kamelet_types_support.go index 3b91a2d1e..52635f28e 100644 --- a/pkg/apis/camel/v1alpha1/kamelet_types_support.go +++ b/pkg/apis/camel/v1alpha1/kamelet_types_support.go @@ -192,13 +192,6 @@ func ValidKameletProperties(kamelet *Kamelet) bool { return true } -func ValidKamelet(kamelet *Kamelet) bool { - if kamelet == nil { - return true - } - return true -} - // NewKamelet creates a new kamelet func NewKamelet(namespace string, name string) Kamelet { return Kamelet{ diff --git a/pkg/builder/project.go b/pkg/builder/project.go index 66071522e..8c325ff8b 100644 --- a/pkg/builder/project.go +++ b/pkg/builder/project.go @@ -24,8 +24,6 @@ import ( "regexp" "strings" - corev1 "k8s.io/api/core/v1" - v1 "github.com/apache/camel-k/pkg/apis/camel/v1" "github.com/apache/camel-k/pkg/util/camel" "github.com/apache/camel-k/pkg/util/jvm" @@ -93,16 +91,6 @@ func generateJavaKeystore(ctx *builderContext) error { return jvm.GenerateKeystore(ctx.C, ctx.Path, ctx.Maven.TrustStoreName, ctx.Maven.TrustStorePass, certsData) } -func mergeSecrets(secrets []corev1.SecretKeySelector, secret *corev1.SecretKeySelector) []corev1.SecretKeySelector { - if secrets == nil && secret == nil { - return nil - } - if secret == nil { - return secrets - } - return append(secrets, *secret) -} - func generateProjectSettings(ctx *builderContext) error { val, err := kubernetes.ResolveValueSource(ctx.C, ctx.Client, ctx.Namespace, &ctx.Build.Maven.Settings) if err != nil { diff --git a/pkg/controller/integrationplatform/initialize.go b/pkg/controller/integrationplatform/initialize.go index 9fc708adb..ae820d6a7 100644 --- a/pkg/controller/integrationplatform/initialize.go +++ b/pkg/controller/integrationplatform/initialize.go @@ -69,7 +69,6 @@ func (action *initializeAction) Handle(ctx context.Context, platform *v1.Integra if err = platformutil.ConfigureDefaults(ctx, action.client, platform, true); err != nil { return nil, err } - // nolint: staticcheck if platform.Status.Build.PublishStrategy == v1.IntegrationPlatformBuildPublishStrategyKaniko { cacheEnabled := platform.Status.Build.IsOptionEnabled(builder.KanikoBuildCacheEnabled) if cacheEnabled { diff --git a/pkg/kamelet/initialize.go b/pkg/kamelet/initialize.go index 3d9ce8c23..cb0a93bf0 100644 --- a/pkg/kamelet/initialize.go +++ b/pkg/kamelet/initialize.go @@ -50,15 +50,6 @@ func Initialize(kamelet *v1alpha1.Kamelet) (*v1alpha1.Kamelet, error) { fmt.Sprintf("Kamelet property %q is reserved and cannot be part of the schema", v1alpha1.KameletIDProperty), ) } - if !v1alpha1.ValidKamelet(kamelet) { - ok = false - target.Status.SetCondition( - v1alpha1.KameletConditionReady, - corev1.ConditionFalse, - v1alpha1.KameletConditionReasonInvalidTemplate, - `Kamelet can only specify one of "flow" or "template"`, - ) - } if !ok { target.Status.Phase = v1alpha1.KameletPhaseError diff --git a/pkg/trait/openapi.go b/pkg/trait/openapi.go index 15b3b061b..8615b1b07 100644 --- a/pkg/trait/openapi.go +++ b/pkg/trait/openapi.go @@ -319,16 +319,6 @@ func (t *openAPITrait) createNewOpenAPIConfigMap(e *Environment, resource v1.Dat return nil } -func mergeSecrets(secrets []corev1.SecretKeySelector, secret *corev1.SecretKeySelector) []corev1.SecretKeySelector { - if secrets == nil && secret == nil { - return nil - } - if secret == nil { - return secrets - } - return append(secrets, *secret) -} - func (t *openAPITrait) generateMavenProject(e *Environment) (maven.Project, error) { if e.CamelCatalog == nil { return maven.Project{}, errors.New("unknown camel catalog") diff --git a/pkg/trait/trait_types.go b/pkg/trait/trait_types.go index 4b9d29f78..39c800077 100644 --- a/pkg/trait/trait_types.go +++ b/pkg/trait/trait_types.go @@ -608,20 +608,6 @@ func convertToKeyToPath(k, v string) []corev1.KeyToPath { return kp } -func getResourcePath(resourceName string, maybePath string, resourceType v1.ResourceType) string { - // If the path is specified, we'll return it - if maybePath != "" { - return maybePath - } - // otherwise return a default path, according to the resource type - if resourceType == v1.ResourceTypeData { - return path.Join(camel.ResourcesDefaultMountPath, resourceName) - } - - // Default, config type - return path.Join(camel.ConfigResourcesMountPath, resourceName) -} - func getMountPoint(resourceName string, mountPoint string, storagetype, resourceType string) string { if mountPoint != "" { return mountPoint diff --git a/pkg/util/camel/catalog.go b/pkg/util/camel/catalog.go index 3186620a2..360f5ed12 100644 --- a/pkg/util/camel/catalog.go +++ b/pkg/util/camel/catalog.go @@ -23,7 +23,6 @@ import ( yaml2 "gopkg.in/yaml.v2" - corev1 "k8s.io/api/core/v1" ctrl "sigs.k8s.io/controller-runtime/pkg/client" v1 "github.com/apache/camel-k/pkg/apis/camel/v1" @@ -95,9 +94,8 @@ func GenerateCatalog( } var caCerts [][]byte - secrets := mvn.CASecrets - if secrets != nil { - caCerts, err = kubernetes.GetSecretsRefData(ctx, client, namespace, secrets) + if mvn.CASecrets != nil { + caCerts, err = kubernetes.GetSecretsRefData(ctx, client, namespace, mvn.CASecrets) if err != nil { return nil, err } @@ -106,16 +104,6 @@ func GenerateCatalog( return GenerateCatalogCommon(ctx, globalSettings, []byte(userSettings), caCerts, mvn, runtime, providerDependencies) } -func mergeSecrets(secrets []corev1.SecretKeySelector, secret *corev1.SecretKeySelector) []corev1.SecretKeySelector { - if secrets == nil && secret == nil { - return nil - } - if secret == nil { - return secrets - } - return append(secrets, *secret) -} - func GenerateCatalogCommon( ctx context.Context, globalSettings []byte,
