tadayosi commented on code in PR #3171:
URL: https://github.com/apache/camel-k/pull/3171#discussion_r843430334
##########
pkg/util/camel/catalog.go:
##########
@@ -94,8 +95,10 @@ func GenerateCatalog(
}
var caCerts [][]byte
- if mvn.CASecret != nil {
- caCerts, err = kubernetes.GetSecretsRefData(ctx, client,
namespace, mvn.CASecret)
+ // nolint: staticcheck
+ secrets := mergeSecrets(mvn.CASecrets, mvn.CASecret)
+ if secrets != nil {
Review Comment:
same here
##########
pkg/util/camel/catalog.go:
##########
@@ -104,6 +107,16 @@ 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 {
Review Comment:
same here
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
