Set ownership annotations for konnectivity-agent secret

openshift · Jan 9, 2025 · 7224fd1 · 7224fd1
1 parent 57681ee
commit 7224fd1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/control-plane-operator/controllers/hostedcontrolplane/manifests/pki.go b/control-plane-operator/controllers/hostedcontrolplane/manifests/pki.go
@@ -1,6 +1,8 @@
 package manifests
 
 import (
+	"github.com/openshift/api/annotations"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -282,7 +284,17 @@ func KonnectivityClusterSecret(ns string) *corev1.Secret {
 
 func KonnectivityClientSecret(ns string) *corev1.Secret { return secretFor(ns, "konnectivity-client") }
 
-func KonnectivityAgentSecret(ns string) *corev1.Secret { return secretFor(ns, "konnectivity-agent") }
+func KonnectivityAgentSecret(ns string) *corev1.Secret {
+	return &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "konnectivity-agent",
+			Namespace: ns,
+			Annotations: map[string]string{
+				annotations.OpenShiftComponent: "HyperShift",
+			},
+		},
+	}
+}
 
 func IngressCert(ns string) *corev1.Secret { return secretFor(ns, "ingress-crt") }
 

diff --git a/control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources.go b/control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources.go
@@ -44,12 +44,12 @@ import (
 	"github.com/openshift/hypershift/support/upsert"
 	"github.com/openshift/hypershift/support/util"
 
+	"github.com/openshift/api/annotations"
 	configv1 "github.com/openshift/api/config/v1"
 	imageregistryv1 "github.com/openshift/api/imageregistry/v1"
 	openshiftcpv1 "github.com/openshift/api/openshiftcontrolplane/v1"
 	operatorv1 "github.com/openshift/api/operator/v1"
 
-	"github.com/openshift/api/annotations"
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"