Not just render oidc env-vars when cfg is on, we need also a present audience to ensure the camel containers work correct (knative#8448)

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

Author: matzew

pkg/reconciler/integration/source/integrationsource.go

@@ -78,7 +78,9 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, source *v1alpha1.Integra
 }
 
 func (r *Reconciler) reconcileContainerSource(ctx context.Context, source *v1alpha1.IntegrationSource) (*v1.ContainerSource, error) {
-	expected := resources.NewContainerSource(source, feature.FromContext(ctx).IsOIDCAuthentication())
+	// set the OIDC to true only if the feature is enabled and the sink audience is set
+	// to prevent container environment vars to be set, just when the config is on.
+	expected := resources.NewContainerSource(source, feature.FromContext(ctx).IsOIDCAuthentication() && source.Status.SinkAudience != nil)
 
 	cs, err := r.containerSourceLister.ContainerSources(source.Namespace).Get(expected.Name)
 	if apierrors.IsNotFound(err) {

pkg/reconciler/integration/source/integrationsource_test.go

@@ -189,7 +189,7 @@ func TestReconcile(t *testing.T) {
 					WithIntegrationSourceSpec(makeIntegrationSourceSpec(sinkDest)),
 					WithInitIntegrationSourceConditions,
 					WithIntegrationSourceStatusObservedGeneration(generation),
-					WithIntegrationSourcePropagateContainerSourceStatus(makeContainerSourceStatus(&conditionTrue)),
+					WithIntegrationSourcePropagateContainerSourceStatus(makeContainerSourceStatusOIDC(&conditionTrue)),
 					WithIntegrationSourceOIDCServiceAccountName(getOIDCServiceAccountNameForContainerSource()),
 				),
 			}},
@@ -218,39 +218,6 @@ func TestReconcile(t *testing.T) {
 
 func makeContainerSourceOIDC(source *sourcesv1alpha1.IntegrationSource, ready *corev1.ConditionStatus) *sourcesv1.ContainerSource {
 	cs := makeContainerSource(source, ready)
-
-	// replace all env_vars for inserting the OIDC ones at the right order/index
-	cs.Spec.Template.Spec.Containers[0].Env = []corev1.EnvVar{
-		{
-			Name:  "CAMEL_KNATIVE_CLIENT_SSL_ENABLED",
-			Value: "true",
-		},
-		{
-			Name:  "CAMEL_KNATIVE_CLIENT_SSL_CERT_PATH",
-			Value: "/knative-custom-certs/knative-eventing-bundle.pem",
-		},
-		{
-			Name:  "CAMEL_KNATIVE_CLIENT_OIDC_ENABLED",
-			Value: "true",
-		},
-		{
-			Name:  "CAMEL_KNATIVE_CLIENT_OIDC_TOKEN_PATH",
-			Value: "file:///oidc/token",
-		},
-		{
-			Name:  "CAMEL_KAMELET_TIMER_SOURCE_PERIOD",
-			Value: "1000",
-		},
-		{
-			Name:  "CAMEL_KAMELET_TIMER_SOURCE_MESSAGE",
-			Value: "Hallo",
-		},
-		{
-			Name:  "CAMEL_KAMELET_TIMER_SOURCE_REPEATCOUNT",
-			Value: "0",
-		},
-	}
-
 	cs.Status = *makeContainerSourceStatusOIDC(ready)
 
 	return cs