use managed-by k8s annotation

Signed-off-by: odubajDT <[email protected]>
open-feature · Jan 22, 2024 · 76125b9 · 76125b9
1 parent 75974ab
commit 76125b9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/common/flagdproxy/flagdproxy.go b/common/flagdproxy/flagdproxy.go
@@ -6,7 +6,6 @@ import (
 	"reflect"
 
 	"github.com/go-logr/logr"
-	"github.com/open-feature/open-feature-operator/common"
 	"github.com/open-feature/open-feature-operator/common/types"
 	appsV1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -22,7 +21,6 @@ const (
 	FlagdProxyServiceAccountName = "open-feature-operator-flagd-proxy"
 	FlagdProxyServiceName        = "flagd-proxy-svc"
 	operatorDeploymentName       = "open-feature-operator-controller-manager"
-	ofoDeployed                  = "deployed"
 )
 
 type FlagdProxyHandler struct {
@@ -120,7 +118,7 @@ func (f *FlagdProxyHandler) newFlagdProxyServiceManifest(ownerReference *metav1.
 			Namespace:       f.config.Namespace,
 			OwnerReferences: []metav1.OwnerReference{*ownerReference},
 			Labels: map[string]string{
-				fmt.Sprintf("%s/%s", common.OpenFeatureAnnotationPrefix, ofoDeployed): "true",
+				"app.kubernetes.io/managed-by": ManagedByAnnotationValue,
 			},
 		},
 		Spec: corev1.ServiceSpec{
@@ -157,7 +155,6 @@ func (f *FlagdProxyHandler) newFlagdProxyManifest(ownerReference *metav1.OwnerRe
 				"app":                          FlagdProxyDeploymentName,
 				"app.kubernetes.io/managed-by": ManagedByAnnotationValue,
 				"app.kubernetes.io/version":    f.config.Tag,
-				fmt.Sprintf("%s/%s", common.OpenFeatureAnnotationPrefix, ofoDeployed): "true",
 			},
 			OwnerReferences: []metav1.OwnerReference{*ownerReference},
 		},
@@ -245,6 +242,6 @@ func (f *FlagdProxyHandler) getOwnerReference(ctx context.Context) (*metav1.Owne
 }
 
 func isDeployedByOFO(d *appsV1.Deployment) bool {
-	val, ok := d.Labels[fmt.Sprintf("%s/%s", common.OpenFeatureAnnotationPrefix, ofoDeployed)]
-	return ok && val == "true"
+	val, ok := d.Labels["app.kubernetes.io/managed-by"]
+	return ok && val == ManagedByAnnotationValue
 }
diff --git a/common/flagdproxy/flagdproxy_test.go b/common/flagdproxy/flagdproxy_test.go
@@ -6,7 +6,6 @@ import (
 	"testing"
 
 	"github.com/go-logr/logr/testr"
-	"github.com/open-feature/open-feature-operator/common"
 	"github.com/open-feature/open-feature-operator/common/types"
 	"github.com/stretchr/testify/require"
 	appsV1 "k8s.io/api/apps/v1"
@@ -138,7 +137,7 @@ func TestFlagdProxyHandler_HandleFlagdProxy_ProxyExistsWithBadVersion(t *testing
 			Name:            FlagdProxyDeploymentName,
 			OwnerReferences: []metav1.OwnerReference{*ownerRef},
 			Labels: map[string]string{
-				fmt.Sprintf("%s/%s", common.OpenFeatureAnnotationPrefix, ofoDeployed): "true",
+				"app.kubernetes.io/managed-by": ManagedByAnnotationValue,
 			},
 		},
 		Spec: v1.DeploymentSpec{
@@ -328,7 +327,6 @@ func TestFlagdProxyHandler_HandleFlagdProxy_CreateProxy(t *testing.T) {
 				"app":                          FlagdProxyDeploymentName,
 				"app.kubernetes.io/managed-by": ManagedByAnnotationValue,
 				"app.kubernetes.io/version":    "tag",
-				fmt.Sprintf("%s/%s", common.OpenFeatureAnnotationPrefix, ofoDeployed): "true",
 			},
 			ResourceVersion: "1",
 			OwnerReferences: []metav1.OwnerReference{
@@ -407,7 +405,7 @@ func TestFlagdProxyHandler_HandleFlagdProxy_CreateProxy(t *testing.T) {
 				},
 			},
 			Labels: map[string]string{
-				fmt.Sprintf("%s/%s", common.OpenFeatureAnnotationPrefix, ofoDeployed): "true",
+				"app.kubernetes.io/managed-by": ManagedByAnnotationValue,
 			},
 		},
 		Spec: corev1.ServiceSpec{

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -10,5 +10,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: docker.io/odubajdt/operator
-  newTag: proxy-update
+  newName: controller
+  newTag: latest