Merge pull request openshift#2120 from vrutkovs/annotate-owners

OCPBUGS-24214: Add ownership annotations
pperiyasamy · Feb 12, 2024 · 138bdf1 · 138bdf1
2 parents 1a0de92 + 98acf32
commit 138bdf1
Show file tree

Hide file tree

Showing 15 changed files with 231 additions and 38 deletions.
diff --git a/bindata/network/ovn-kubernetes/managed/007-certificate.yaml b/bindata/network/ovn-kubernetes/managed/007-certificate.yaml
@@ -8,6 +8,7 @@ metadata:
   annotations:
     network.operator.openshift.io/cluster-name:  {{.ManagementClusterName}}
     network.operator.openshift.io/copy-from: "default/openshift-ovn-kubernetes/ovn-cert"
+    openshift.io/owning-component: "Networking / cluster-network-operator"
 data: {}
 
 ---
@@ -20,4 +21,5 @@ metadata:
   annotations:
     network.operator.openshift.io/cluster-name:  {{.ManagementClusterName}}
     network.operator.openshift.io/copy-from: "default/openshift-ovn-kubernetes/ovn-ca"
+    openshift.io/owning-component: "Networking / cluster-network-operator"
 data: {}
diff --git a/go.mod b/go.mod
@@ -113,7 +113,7 @@ require (
 require (
 	github.com/openshift/api v0.0.0-20240201144024-a4bde0c30de8
 	github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1
-	github.com/openshift/library-go v0.0.0-20231123173213-a037480d443b
+	github.com/openshift/library-go v0.0.0-20231128230659-785a9313da6c
 	github.com/openshift/machine-config-operator v0.0.1-0.20231002195040-a2469941c0dc
 	k8s.io/apiextensions-apiserver v0.29.0
 	k8s.io/client-go v0.29.0

diff --git a/go.sum b/go.sum
@@ -266,8 +266,8 @@ github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d h1:RR
 github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
 github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1 h1:W1N/3nVciqmjPjn2xldHjb0AwwCQzlGxLvX5BCgE8H4=
 github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1/go.mod h1:ihUJrhBcYAGYQrJu/gP2OMgfVds5f5z5kbeLNBqjHLo=
-github.com/openshift/library-go v0.0.0-20231123173213-a037480d443b h1:BcKyYoFdkPDQf4SrToLkQ3Q09dcx1Yj+ABwnD4kWtLM=
-github.com/openshift/library-go v0.0.0-20231123173213-a037480d443b/go.mod h1:8UzmrBMCn7+GzouL8DVYkL9COBQTB1Ggd13/mHJQCUg=
+github.com/openshift/library-go v0.0.0-20231128230659-785a9313da6c h1:L/nRp+uq0MKKvK14y18Ua84dYF860b1dCE973wSQ1do=
+github.com/openshift/library-go v0.0.0-20231128230659-785a9313da6c/go.mod h1:8UzmrBMCn7+GzouL8DVYkL9COBQTB1Ggd13/mHJQCUg=
 github.com/openshift/machine-config-operator v0.0.1-0.20231002195040-a2469941c0dc h1:m8c26gPEv0p621926Kl26kYQvnkOrW7pOirvYzORn24=
 github.com/openshift/machine-config-operator v0.0.1-0.20231002195040-a2469941c0dc/go.mod h1:ftCpVtU6Q31exB0DTBn9s2eu90RJESOSisNAruWkvcE=
 github.com/pin/tftp v2.1.0+incompatible/go.mod h1:xVpZOMCXTy+A5QMjEVN0Glwa1sUvaJhFXbr/aAxuxGY=

diff --git a/pkg/controller/pki/pki_controller.go b/pkg/controller/pki/pki_controller.go
@@ -19,6 +19,7 @@ import (
 	cnoclient "github.com/openshift/cluster-network-operator/pkg/client"
 	"github.com/openshift/cluster-network-operator/pkg/controller/eventrecorder"
 	"github.com/openshift/cluster-network-operator/pkg/controller/statusmanager"
+	"github.com/openshift/cluster-network-operator/pkg/names"
 
 	"github.com/openshift/library-go/pkg/controller/factory"
 	"github.com/openshift/library-go/pkg/crypto"
@@ -194,6 +195,7 @@ func newPKI(config *netopv1.OperatorPKI, clientset *kubernetes.Clientset, mgr ma
 		certrotation.RotatedSigningCASecret{
 			Namespace:     config.Namespace,
 			Name:          config.Name + "-ca",
+			JiraComponent: names.ClusterNetworkOperatorJiraComponent,
 			Validity:      10 * OneYear,
 			Refresh:       9 * OneYear,
 			Informer:      inf.Core().V1().Secrets(),
@@ -204,16 +206,18 @@ func newPKI(config *netopv1.OperatorPKI, clientset *kubernetes.Clientset, mgr ma
 		certrotation.CABundleConfigMap{
 			Namespace:     config.Namespace,
 			Name:          config.Name + "-ca",
+			JiraComponent: names.ClusterNetworkOperatorJiraComponent,
 			Lister:        inf.Core().V1().ConfigMaps().Lister(),
 			Informer:      inf.Core().V1().ConfigMaps(),
 			Client:        clientset.CoreV1(),
 			EventRecorder: &eventrecorder.LoggingRecorder{},
 		},
 		certrotation.RotatedSelfSignedCertKeySecret{
-			Namespace: config.Namespace,
-			Name:      config.Name + "-cert",
-			Validity:  OneYear / 2,
-			Refresh:   OneYear / 4,
+			Namespace:     config.Namespace,
+			Name:          config.Name + "-cert",
+			JiraComponent: names.ClusterNetworkOperatorJiraComponent,
+			Validity:      OneYear / 2,
+			Refresh:       OneYear / 4,
 			CertCreator: &certrotation.ServingRotation{
 				Hostnames: func() []string { return []string{spec.TargetCert.CommonName} },
 

diff --git a/vendor/github.com/openshift/api/annotations/annotations.go b/vendor/github.com/openshift/api/annotations/annotations.go
diff --git a/vendor/github.com/openshift/library-go/pkg/controller/controllercmd/builder.go b/vendor/github.com/openshift/library-go/pkg/controller/controllercmd/builder.go
diff --git a/vendor/github.com/openshift/library-go/pkg/controller/controllercmd/cmd.go b/vendor/github.com/openshift/library-go/pkg/controller/controllercmd/cmd.go
diff --git a/vendor/github.com/openshift/library-go/pkg/operator/certrotation/annotations.go b/vendor/github.com/openshift/library-go/pkg/operator/certrotation/annotations.go
diff --git a/vendor/github.com/openshift/library-go/pkg/operator/certrotation/cabundle.go b/vendor/github.com/openshift/library-go/pkg/operator/certrotation/cabundle.go
diff --git a/...hub.com/openshift/library-go/pkg/operator/certrotation/client_cert_rotation_controller.go b/...hub.com/openshift/library-go/pkg/operator/certrotation/client_cert_rotation_controller.go