From 8f2f70b4fea9afb9cc171fe46fab0092f8d1ab9a Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Fri, 3 Dec 2021 19:17:01 +0100 Subject: [PATCH] set applicationId of FES CRD by taking label from manifest --- pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go | 1 + pkg/cluster/streams.go | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go b/pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go index b0f0dae25..f5c669d9e 100644 --- a/pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go +++ b/pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/pkg/cluster/streams.go b/pkg/cluster/streams.go index cef86a05f..301db97e4 100644 --- a/pkg/cluster/streams.go +++ b/pkg/cluster/streams.go @@ -108,8 +108,14 @@ func (c *Cluster) syncPostgresConfig() error { } func (c *Cluster) generateFabricEventStream() *zalandov1alpha1.FabricEventStream { + var applicationId string eventStreams := make([]zalandov1alpha1.EventStream, 0) + // take application label from manifest + if spec, err := c.GetSpec(); err == nil { + applicationId = spec.ObjectMeta.Labels["application"] + } + for _, stream := range c.Spec.Streams { for tableName, table := range stream.Tables { streamSource := c.getEventStreamSource(stream, tableName, table.IdColumn) @@ -136,7 +142,7 @@ func (c *Cluster) generateFabricEventStream() *zalandov1alpha1.FabricEventStream OwnerReferences: c.ownerReferences(), }, Spec: zalandov1alpha1.FabricEventStreamSpec{ - ApplicationId: "", + ApplicationId: applicationId, EventStreams: eventStreams, }, }