You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/09/18 08:39:09 UTC
[camel-k] branch main updated: chore(trait): deprecation notice
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
The following commit(s) were added to refs/heads/main by this push:
new 4b3a8ed96 chore(trait): deprecation notice
4b3a8ed96 is described below
commit 4b3a8ed96db4fd4173d1785ef279704e12f4e036
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Sep 18 10:21:10 2023 +0200
chore(trait): deprecation notice
Closes #4166
---
addons/vault/aws/aws_secrets_manager.go | 3 ++-
addons/vault/azure/azure_key_vault.go | 3 ++-
addons/vault/gcp/gcp_secret_manager.go | 3 ++-
addons/vault/hashicorp/hashicorp_vault.go | 3 ++-
pkg/trait/jolokia.go | 3 ++-
pkg/trait/knative.go | 3 ++-
pkg/trait/prometheus.go | 3 ++-
7 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/addons/vault/aws/aws_secrets_manager.go b/addons/vault/aws/aws_secrets_manager.go
index 8cbb68efe..8ad20e026 100644
--- a/addons/vault/aws/aws_secrets_manager.go
+++ b/addons/vault/aws/aws_secrets_manager.go
@@ -100,7 +100,8 @@ func (t *awsSecretsManagerTrait) Configure(environment *trait.Environment) (bool
func (t *awsSecretsManagerTrait) Apply(environment *trait.Environment) error {
if environment.IntegrationInPhase(v1.IntegrationPhaseInitialization) {
util.StringSliceUniqueAdd(&environment.Integration.Status.Capabilities, v1.CapabilityAwsSecretsManager)
- // TODO remove dependencies after runtime > 2.16.0
+ // Deprecated
+ // remove dependencies after Camel K Runtime > 2.16.0 and no longer supported or LTS
util.StringSliceUniqueAdd(&environment.Integration.Status.Dependencies, "mvn:org.apache.camel.quarkus:camel-quarkus-aws-secrets-manager")
}
diff --git a/addons/vault/azure/azure_key_vault.go b/addons/vault/azure/azure_key_vault.go
index 2deca3359..76ecee985 100644
--- a/addons/vault/azure/azure_key_vault.go
+++ b/addons/vault/azure/azure_key_vault.go
@@ -106,7 +106,8 @@ func (t *azureKeyVaultTrait) Configure(environment *trait.Environment) (bool, er
func (t *azureKeyVaultTrait) Apply(environment *trait.Environment) error {
if environment.IntegrationInPhase(v1.IntegrationPhaseInitialization) {
util.StringSliceUniqueAdd(&environment.Integration.Status.Capabilities, v1.CapabilityAzureKeyVault)
- // TODO remove dependencies after runtime > 2.16.0
+ // Deprecated
+ // remove dependencies after Camel K Runtime > 2.16.0 and no longer supported or LTS
util.StringSliceUniqueAdd(&environment.Integration.Status.Dependencies, "mvn:org.apache.camel.quarkus:camel-quarkus-azure-key-vault")
}
diff --git a/addons/vault/gcp/gcp_secret_manager.go b/addons/vault/gcp/gcp_secret_manager.go
index a2c118812..b3784d89e 100644
--- a/addons/vault/gcp/gcp_secret_manager.go
+++ b/addons/vault/gcp/gcp_secret_manager.go
@@ -102,7 +102,8 @@ func (t *gcpSecretManagerTrait) Configure(environment *trait.Environment) (bool,
func (t *gcpSecretManagerTrait) Apply(environment *trait.Environment) error {
if environment.IntegrationInPhase(v1.IntegrationPhaseInitialization) {
util.StringSliceUniqueAdd(&environment.Integration.Status.Capabilities, v1.CapabilityGcpSecretManager)
- // TODO remove dependencies after runtime > 2.16.0
+ // Deprecated
+ // remove dependencies after Camel K Runtime > 2.16.0 and no longer supported or LTS
util.StringSliceUniqueAdd(&environment.Integration.Status.Dependencies, "mvn:org.apache.camel.quarkus:camel-quarkus-google-secret-manager")
}
diff --git a/addons/vault/hashicorp/hashicorp_vault.go b/addons/vault/hashicorp/hashicorp_vault.go
index 1b5bd58fd..e3eefed8e 100644
--- a/addons/vault/hashicorp/hashicorp_vault.go
+++ b/addons/vault/hashicorp/hashicorp_vault.go
@@ -78,7 +78,8 @@ func (t *hashicorpVaultTrait) Configure(environment *trait.Environment) (bool, e
func (t *hashicorpVaultTrait) Apply(environment *trait.Environment) error {
if environment.IntegrationInPhase(v1.IntegrationPhaseInitialization) {
util.StringSliceUniqueAdd(&environment.Integration.Status.Capabilities, v1.CapabilityHashicorpVault)
- // TODO remove dependencies after runtime > 2.16.0
+ // Deprecated
+ // remove dependencies after Camel K Runtime > 2.16.0 and no longer supported or LTS
util.StringSliceUniqueAdd(&environment.Integration.Status.Dependencies, "mvn:org.apache.camel.quarkus:camel-quarkus-hashicorp-vault")
}
diff --git a/pkg/trait/jolokia.go b/pkg/trait/jolokia.go
index 9e37c0f68..871c257ee 100644
--- a/pkg/trait/jolokia.go
+++ b/pkg/trait/jolokia.go
@@ -56,7 +56,8 @@ func (t *jolokiaTrait) Apply(e *Environment) error {
if e.IntegrationInPhase(v1.IntegrationPhaseInitialization) {
util.StringSliceUniqueAdd(&e.Integration.Status.Capabilities, v1.CapabilityJolokia)
- // TODO remove dependencies after runtime > 2.16.0
+ // Deprecated
+ // remove dependencies after Camel K Runtime > 2.16.0 and no longer supported or LTS
if e.CamelCatalog.Runtime.Provider == v1.RuntimeProviderQuarkus {
util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "camel-quarkus:management")
util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "camel:jaxb")
diff --git a/pkg/trait/knative.go b/pkg/trait/knative.go
index ba8d44aef..dfd947b15 100644
--- a/pkg/trait/knative.go
+++ b/pkg/trait/knative.go
@@ -183,7 +183,8 @@ func (t *knativeTrait) Apply(e *Environment) error {
if e.IntegrationInPhase(v1.IntegrationPhaseInitialization) {
util.StringSliceUniqueAdd(&e.Integration.Status.Capabilities, v1.CapabilityKnative)
}
- // TODO remove dependencies after runtime > 2.16.0
+ // Deprecated
+ // remove dependencies after Camel K Runtime > 2.16.0 and no longer supported or LTS
if pointer.BoolDeref(t.SinkBinding, false) {
util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "camel:knative")
util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "mvn:org.apache.camel.k:camel-k-knative-impl")
diff --git a/pkg/trait/prometheus.go b/pkg/trait/prometheus.go
index 8446b670e..620b32293 100644
--- a/pkg/trait/prometheus.go
+++ b/pkg/trait/prometheus.go
@@ -56,7 +56,8 @@ func (t *prometheusTrait) Configure(e *Environment) (bool, error) {
func (t *prometheusTrait) Apply(e *Environment) error {
if e.IntegrationInPhase(v1.IntegrationPhaseInitialization) {
util.StringSliceUniqueAdd(&e.Integration.Status.Capabilities, v1.CapabilityPrometheus)
- // TODO remove dependencies after runtime > 2.16.0
+ // Deprecated
+ // remove dependencies after Camel K Runtime > 2.16.0 and no longer supported or LTS
util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "mvn:org.apache.camel.quarkus:camel-quarkus-micrometer")
util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "mvn:io.micrometer:micrometer-registry-prometheus")
return nil