Merge branch 'main' into health-metric

Author: k15r

CODEOWNERS

@@ -74,7 +74,7 @@
 /tests/fast-integration/monitoring @kyma-project/observability
 /tests/fast-integration/telemetry-test @kyma-project/observability
 /tests/fast-integration/tracing @kyma-project/observability
-
+/tests/fast-integration/prow @kyma-project/Jellyfish
 
 /tests/function-controller @kyma-project/Otters
 /tests/components/api-gateway @kyma-project/goat

components/eventing-controller/cmd/eventing-controller/main.go

@@ -118,7 +118,8 @@ func main() {
 	// Start the backend manager.
 	ctx := context.Background()
 	recorder := mgr.GetEventRecorderFor("backend-controller")
-	backendReconciler := backend.NewReconciler(ctx, natsSubMgr, natsConfig, envConfig, bebSubMgr,
+	backendConfig := env.GetBackendConfig()
+	backendReconciler := backend.NewReconciler(ctx, natsSubMgr, natsConfig, envConfig, backendConfig, bebSubMgr,
 		mgr.GetClient(), ctrLogger, recorder)
 	if err = backendReconciler.SetupWithManager(mgr); err != nil {
 		setupLogger.Fatalw("Failed to start backend controller", "error", err)

components/eventing-controller/controllers/backend/reconciler.go

@@ -103,10 +103,16 @@ type Reconciler struct {
 	credentials oauth2Credentials
 }
 
-func NewReconciler(ctx context.Context, natsSubMgr subscriptionmanager.Manager, natsConfig env.NATSConfig,
-	envCfg env.Config, bebSubMgr subscriptionmanager.Manager, client client.Client, logger *logger.Logger,
+func NewReconciler(
+	ctx context.Context,
+	natsSubMgr subscriptionmanager.Manager,
+	natsConfig env.NATSConfig,
+	envCfg env.Config,
+	backendCfg env.BackendConfig,
+	bebSubMgr subscriptionmanager.Manager,
+	client client.Client,
+	logger *logger.Logger,
 	recorder record.EventRecorder) *Reconciler {
-	cfg := env.GetBackendConfig()
 	return &Reconciler{
 		ctx:        ctx,
 		natsSubMgr: natsSubMgr,
@@ -116,10 +122,18 @@ func NewReconciler(ctx context.Context, natsSubMgr subscriptionmanager.Manager,
 		Client:     client,
 		logger:     logger,
 		record:     recorder,
-		cfg:        cfg,
+		cfg:        backendCfg,
 	}
 }
 
+func (r *Reconciler) SetNatsConfig(natsConfig env.NATSConfig) {
+	r.natsConfig = natsConfig
+}
+
+func (r *Reconciler) SetBackendConfig(backendCfg env.BackendConfig) {
+	r.cfg = backendCfg
+}
+
 // +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;update;patch;create;delete
 // +kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;update;patch;create;delete
 // +kubebuilder:rbac:groups=eventing.kyma-project.io,resources=eventingbackends,verbs=get;list;watch;create;update;patch;delete
@@ -622,7 +636,16 @@ func getSecretStringData(clientID, clientSecret, tokenEndpoint, grantType, publi
 }
 
 func (r *Reconciler) CreateOrUpdatePublisherProxy(ctx context.Context, backend eventingv1alpha1.BackendType) (*appsv1.Deployment, error) {
+	return r.CreateOrUpdatePublisherProxyDeployment(ctx, backend, true)
+}
+
+func (r *Reconciler) CreateOrUpdatePublisherProxyDeployment(
+	ctx context.Context,
+	backend eventingv1alpha1.BackendType,
+	setOwnerReference bool) (*appsv1.Deployment, error) {
 	var desiredPublisher *appsv1.Deployment
+	// set backend type here so that the function can be used in eventing-manager
+	r.backendType = backend
 
 	switch backend {
 	case eventingv1alpha1.NatsBackendType:
@@ -633,8 +656,10 @@ func (r *Reconciler) CreateOrUpdatePublisherProxy(ctx context.Context, backend e
 		return nil, fmt.Errorf("unknown EventingBackend type %q", backend)
 	}
 
-	if err := r.setAsOwnerReference(ctx, desiredPublisher); err != nil {
-		return nil, errors.Wrapf(err, "set owner reference for Event Publisher failed")
+	if setOwnerReference {
+		if err := r.setAsOwnerReference(ctx, desiredPublisher); err != nil {
+			return nil, errors.Wrapf(err, "set owner reference for Event Publisher failed")
+		}
 	}
 
 	currentPublisher, err := r.getEPPDeployment(ctx)

components/eventing-controller/controllers/backend/reconciler_internal_integration_test.go

@@ -169,11 +169,13 @@ var _ = BeforeSuite(func(done Done) {
 	}
 
 	envConfig := env.Config{}
+	backendConfig := env.GetBackendConfig()
 	err = NewReconciler(
 		context.Background(),
 		natsSubMgr,
 		natsConfig,
 		envConfig,
+		backendConfig,
 		bebSubMgr,
 		k8sManager.GetClient(),
 		defaultLogger,

components/eventing-controller/pkg/backend/eventmesh/eventmesh.go

@@ -303,7 +303,7 @@ func (em *EventMesh) handleWebhookAuthChange(eventMeshSub *types.Subscription,
 	}
 
 	// pause subscription
-	em.namedLogger().Debugf("Pausing EventMmesh subscription: %s", eventMeshSub.Name)
+	em.namedLogger().Debugf("Pausing EventMesh subscription: %s", eventMeshSub.Name)
 	state := types.State{Action: types.StateActionPause}
 	resp, err := em.client.UpdateState(eventMeshSub.Name, state)
 	if err != nil {
@@ -319,7 +319,7 @@ func (em *EventMesh) handleWebhookAuthChange(eventMeshSub *types.Subscription,
 	}
 
 	// update webhook auth config
-	em.namedLogger().Debugf("Updating WebhookAuth config for EventMmesh subscription: %s", eventMeshSub.Name)
+	em.namedLogger().Debugf("Updating WebhookAuth config for EventMesh subscription: %s", eventMeshSub.Name)
 	updateResp, err := em.client.Update(eventMeshSub.Name, eventMeshSub.WebhookAuth)
 	if err != nil {
 		return fmt.Errorf("failed to update webhook auth config: %w", err)
@@ -334,7 +334,7 @@ func (em *EventMesh) handleWebhookAuthChange(eventMeshSub *types.Subscription,
 	}
 
 	// resume subscription
-	em.namedLogger().Debugf("Resuming EventMmesh subscription: %s", eventMeshSub.Name)
+	em.namedLogger().Debugf("Resuming EventMesh subscription: %s", eventMeshSub.Name)
 	state = types.State{Action: types.StateActionResume}
 	resp, err = em.client.UpdateState(eventMeshSub.Name, state)
 	if err != nil {
@@ -401,7 +401,7 @@ func (em *EventMesh) getSubscription(name string) (*types.Subscription, error) {
 
 // deleteSubscription deletes the subscription on EventMesh.
 func (em *EventMesh) deleteSubscription(name string) error {
-	em.namedLogger().Debugf("Deleting EventMmesh subscription: %s", name)
+	em.namedLogger().Debugf("Deleting EventMesh subscription: %s", name)
 	resp, err := em.client.Delete(name)
 	if err != nil {
 		return fmt.Errorf("delete subscription failed: %v", err)

components/eventing-controller/pkg/backend/jetstream/utils.go

@@ -148,13 +148,14 @@ func getStreamConfig(natsConfig env.NATSConfig) (*nats.StreamConfig, error) {
 	}
 
 	streamConfig := &nats.StreamConfig{
-		Name:      natsConfig.JSStreamName,
-		Storage:   storage,
-		Replicas:  natsConfig.JSStreamReplicas,
-		Retention: retentionPolicy,
-		MaxMsgs:   natsConfig.JSStreamMaxMessages,
-		MaxBytes:  maxBytes.Value(),
-		Discard:   discardPolicy,
+		Name:              natsConfig.JSStreamName,
+		Storage:           storage,
+		Replicas:          natsConfig.JSStreamReplicas,
+		Retention:         retentionPolicy,
+		MaxMsgs:           natsConfig.JSStreamMaxMessages,
+		MaxBytes:          maxBytes.Value(),
+		Discard:           discardPolicy,
+		MaxMsgsPerSubject: natsConfig.JSStreamMaxMsgsPerTopic,
 		// Since one stream is used to store events of all types, the stream has to match all event types, and therefore
 		// we use the wildcard char >. However, to avoid matching internal JetStream and non-Kyma-related subjects, we
 		// use a prefix. This prefix is handled only on the JetStream level (i.e. JetStream handler

components/eventing-controller/pkg/env/nats_config.go

@@ -39,6 +39,7 @@ type NATSConfig struct {
 	JSStreamRetentionPolicy string `envconfig:"JS_STREAM_RETENTION_POLICY" default:"interest"`
 	JSStreamMaxMessages     int64  `envconfig:"JS_STREAM_MAX_MSGS" default:"-1"`
 	JSStreamMaxBytes        string `envconfig:"JS_STREAM_MAX_BYTES" default:"-1"`
+	JSStreamMaxMsgsPerTopic int64  `envconfig:"JS_STREAM_MAX_MSGS_PER_TOPIC" default:"-1"`
 	// JSStreamDiscardPolicy specifies which events to discard from the stream in case limits are reached
 	//  new: reject new messages for the stream
 	//  old: discard old messages from the stream to make room for new messages

components/function-runtimes/nodejs/.gitignore

@@ -0,0 +1,5 @@
+#For local debugging
+function
+package.json
+package-lock.json
+node_modules

components/function-runtimes/nodejs/README.md

@@ -0,0 +1,13 @@
+## How to locally run and debug the Node.js Function and runtime
+
+* Copy `package.json` from the desired Node.js version
+* Create the `function` directory with `handler.js` and `package.json`
+* Install dependencies from the runtime and Function:
+    ```bash
+    npm install
+    npm install function/
+    ```
+* Run Function from the terminal.
+    ```bash
+    npm start
+    ```

components/function-runtimes/nodejs/lib/helper.js

@@ -6,32 +6,32 @@ function configureGracefulShutdown(server) {
     let nextConnectionId = 0;
     const connections = [];
     let terminating = false;
-  
+
     server.on('connection', connection => {
       const connectionId = nextConnectionId++;
       connection.$$isIdle = true;
       connections[connectionId] = connection;
       connection.on('close', () => delete connections[connectionId]);
     });
-  
+
     server.on('request', (request, response) => {
       const connection = request.connection;
       connection.$$isIdle = false;
-  
+
       response.on('finish', () => {
         connection.$$isIdle = true;
         if (terminating) {
           connection.destroy();
         }
       });
     });
-  
+
     const handleShutdown = () => {
       console.log("Shutting down..");
-  
+
       terminating = true;
       server.close(() => console.log("Server stopped"));
-  
+
       for (const connectionId in connections) {
         if (connections.hasOwnProperty(connectionId)) {
           const connection = connections[connectionId];
@@ -41,7 +41,7 @@ function configureGracefulShutdown(server) {
         }
       }
     };
-  
+
     process.on('SIGINT', handleShutdown);
     process.on('SIGTERM', handleShutdown);
   }
@@ -64,8 +64,8 @@ const isPromise = (promise) => {
 
 
 function handleError(err, span, sendResponse) {
+    console.error(err);
     const errTxt = resolveErrorMsg(err);
-    console.error(errTxt);
     span.setStatus({ code: SpanStatusCode.ERROR, message: errTxt });
     span.setAttribute("error", errTxt);
     sendResponse(errTxt, 500);
@@ -76,7 +76,7 @@ function resolveErrorMsg(err) {
     if (typeof err == "string") {
         errText = err
     } else {
-        errText = err.msg || "Internal server error"
+        errText = "Internal server error"
     }
     return errText
 }

resources/istio/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: istio
-version: 1.18.0
-appVersion: 1.18.0
+version: 1.18.1
+appVersion: 1.18.1
 tillerVersion: ">=2.7.2-0"
 description: Kyma 2.0 Helm chart for Istio Operator resource
 keywords:

resources/istio/values.yaml

@@ -4,6 +4,7 @@ helmValues:
     priorityClassName: "kyma-system-priority"
     imagePullPolicy: IfNotPresent
     proxy:
+      tracer: none
       readinessFailureThreshold: 40
       readinessInitialDelaySeconds: 5
       readinessPeriodSeconds: 5
@@ -43,6 +44,8 @@ meshConfig:
     tracing: []
   defaultConfig:
     holdApplicationUntilProxyStarts: true
+    proxyMetadata:
+      BOOTSTRAP_XDS_AGENT: "true"
   enablePrometheusMerge: false
   enableTracing: false
   extensionProviders:
@@ -176,15 +179,15 @@ global:
     # these definitions aren't used by the chart, but they are required by external tool for list generation
     istio_proxyv2:
       name: "proxyv2"
-      version: "1.18.0-distroless"
+      version: "1.18.1-distroless"
       directory: "prod/external/istio"
     istio_pilot:
       name: "pilot"
-      version: "1.18.0-distroless"
+      version: "1.18.1-distroless"
       directory: "prod/external/istio"
     istio_install-cni:
       name: "install-cni"
-      version: "1.18.0-distroless"
+      version: "1.18.1-distroless"
       directory: "prod/external/istio"
 
   # This configuration is only temporary and will be removed in kyma version 2.7.x.

resources/keda-manager/values.yaml

@@ -4,17 +4,17 @@ global:
   images:
     keda_manager:
       name: "keda-manager"
-      version: "v20230621-a32a09b8"
+      version: "v20230719-22acef2b"
       directory: "prod"
     keda:
       name: "keda"
-      version: "2.10.1"
+      version: "2.11.1"
       directory: "prod/external/ghcr.io/kedacore"
     keda_admission_webhooks:
       name: "keda-admission-webhooks"
-      version: "2.10.1"
+      version: "2.11.1"
       directory: "prod/external/ghcr.io/kedacore"
     keda_metrics_apiserver:
       name: "keda-metrics-apiserver"
-      version: "2.10.1"
+      version: "2.11.1"
       directory: "prod/external/ghcr.io/kedacore"

resources/serverless/values.yaml

@@ -97,11 +97,11 @@ global:
       directory: "prod"
     function_runtime_nodejs16:
       name: "function-runtime-nodejs16"
-      version: "PR-17818"
+      version: "PR-17824"
       directory: "dev"
     function_runtime_nodejs18:
       name: "function-runtime-nodejs18"
-      version: "PR-17818"
+      version: "PR-17824"
       directory: "dev"
     function_runtime_python39:
       name: "function-runtime-python39"

resources/telemetry/values.yaml

@@ -8,7 +8,7 @@ global:
       directory: "prod"
     telemetry_operator:
       name: "telemetry-manager"
-      version: "v20230707-612ab16b"
+      version: "v20230719-8dfcbbe8"
       directory: "prod"
     telemetry_otel_collector:
       name: "otel-collector"