fix after rebase

Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>

common/flagdinjector/flagdinjector.go

@@ -62,8 +62,8 @@ func (fi *FlagdContainerInjector) InjectFlagd(
 
 	// Enable probes
 	if flagSourceConfig.ProbesEnabled != nil && *flagSourceConfig.ProbesEnabled {
-		flagdContainer.LivenessProbe = buildProbe(constant.ProbeLiveness, int(flagSourceConfig.MetricsPort))
-		flagdContainer.ReadinessProbe = buildProbe(constant.ProbeReadiness, int(flagSourceConfig.MetricsPort))
+		flagdContainer.LivenessProbe = buildProbe(constant.ProbeLiveness, int(flagSourceConfig.ManagementPort))
+		flagdContainer.ReadinessProbe = buildProbe(constant.ProbeReadiness, int(flagSourceConfig.ManagementPort))
 	}
 
 	if err := fi.handleSidecarSources(ctx, objectMeta, podSpec, flagSourceConfig, &flagdContainer); err != nil {
@@ -386,7 +386,7 @@ func (fi *FlagdContainerInjector) generateBasicFlagdContainer(flagSourceConfig *
 		Ports: []corev1.ContainerPort{
 			{
 				Name:          "metrics",
-				ContainerPort: flagSourceConfig.MetricsPort,
+				ContainerPort: flagSourceConfig.ManagementPort,
 			},
 		},
 		SecurityContext: getSecurityContext(),

common/flagdinjector/flagdinjector_test.go

@@ -831,10 +831,10 @@ func getFlagSourceConfigSpec() *api.FeatureFlagSourceSpec {
 	probesEnabled := true
 
 	return &api.FeatureFlagSourceSpec{
-		MetricsPort: 8014,
-		Port:        8013,
-		Image:       "flagd",
-		Tag:         "0.5.0",
+		ManagementPort: 8014,
+		Port:           8013,
+		Image:          "flagd",
+		Tag:            "0.5.0",
 		EnvVars: []v1.EnvVar{
 			{
 				Name:  "my-env-var",

go.mod

@@ -5,7 +5,7 @@ go 1.19
 require (
 	github.com/go-logr/logr v1.2.4
 	github.com/golang/mock v1.4.4
-	github.com/open-feature/open-feature-operator/apis v0.2.37
+	github.com/open-feature/open-feature-operator/apis v0.2.38-0.20231116103437-e3c8b4290be9
 	github.com/stretchr/testify v1.8.4
 	go.uber.org/zap v1.24.0
 	k8s.io/api v0.26.4

go.sum

@@ -33,6 +33,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -161,6 +163,7 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf
 github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -221,6 +224,8 @@ github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
 github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
 github.com/open-feature/open-feature-operator/apis v0.2.37 h1:JU/g9hKWfVChgd/uKXj3TYxu1uG5YDSsSmHofg9VBlg=
 github.com/open-feature/open-feature-operator/apis v0.2.37/go.mod h1:BpsW/HPbvNaAT2h2X47bYjLNmADF1I3Kg2DSj//TuZ0=
+github.com/open-feature/open-feature-operator/apis v0.2.38-0.20231116103437-e3c8b4290be9 h1:N94/iQZmTvfdQCpqlL9T5lx3X/m7JXK+xG5buPy/xIU=
+github.com/open-feature/open-feature-operator/apis v0.2.38-0.20231116103437-e3c8b4290be9/go.mod h1:BpsW/HPbvNaAT2h2X47bYjLNmADF1I3Kg2DSj//TuZ0=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

test/e2e/kuttl/fsconfig-file-sync/00-install.yaml

@@ -4,7 +4,7 @@ kind: FeatureFlagSource
 metadata:
     name: source-configuration
 spec:
-    metricsPort: 8080
+    managementPort: 8080
     evaluator: json
     defaultSyncProvider: file
     # renovate: datasource=github-tags depName=open-feature/flagd/flagd

test/e2e/kuttl/fsconfig-flagd-proxy-sync/00-install.yaml

@@ -4,7 +4,7 @@ kind: FeatureFlagSource
 metadata:
     name: source-configuration
 spec:
-    metricsPort: 8080
+    managementPort: 8080
     evaluator: json
     defaultSyncProvider: flagd-proxy
     # renovate: datasource=github-tags depName=open-feature/flagd/flagd

test/e2e/kuttl/fsconfig-k8s-sync/00-install.yaml

@@ -4,7 +4,7 @@ kind: FeatureFlagSource
 metadata:
     name: source-configuration
 spec:
-    metricsPort: 8080
+    managementPort: 8080
     evaluator: json
     defaultSyncProvider: kubernetes
     # renovate: datasource=github-tags depName=open-feature/flagd/flagd