From 8226d577f6e46e60ae0e8b4875d980fd690715e2 Mon Sep 17 00:00:00 2001 From: travisn Date: Mon, 24 Jun 2019 13:55:09 -0600 Subject: [PATCH] remove obsolete check for setting the resource ownerreferences The check for whether to set the OwnerReferences is no longer necessary. When passing the correct value to the apiVersion, the OwnerReferences can be successfully set for OpenShift. Signed-off-by: travisn --- pkg/operator/ceph/cluster/cluster.go | 6 +-- pkg/operator/ceph/cluster/mgr/dashboard.go | 2 +- pkg/operator/ceph/cluster/mgr/spec.go | 6 +-- pkg/operator/ceph/cluster/mon/config.go | 2 +- pkg/operator/ceph/cluster/mon/mon.go | 2 +- pkg/operator/ceph/cluster/mon/service.go | 2 +- pkg/operator/ceph/cluster/mon/spec.go | 2 +- pkg/operator/ceph/cluster/osd/spec.go | 4 +- pkg/operator/ceph/cluster/rbd/spec.go | 2 +- pkg/operator/ceph/config/keyring/store.go | 2 +- pkg/operator/ceph/config/store.go | 2 +- pkg/operator/ceph/config/store_test.go | 4 +- pkg/operator/ceph/file/mds/spec.go | 2 +- pkg/operator/ceph/nfs/nfs.go | 2 +- pkg/operator/ceph/nfs/spec.go | 4 +- pkg/operator/ceph/object/spec.go | 4 +- pkg/operator/ceph/object/user/controller.go | 2 +- pkg/operator/cockroachdb/controller.go | 8 ++-- pkg/operator/edgefs/cluster/cluster.go | 2 +- pkg/operator/edgefs/cluster/configmap.go | 2 +- pkg/operator/edgefs/cluster/mgr/mgr.go | 8 ++-- .../edgefs/cluster/prepare/prepare.go | 2 +- pkg/operator/edgefs/cluster/target/pod.go | 4 +- pkg/operator/edgefs/iscsi/iscsi.go | 4 +- pkg/operator/edgefs/isgw/isgw.go | 4 +- pkg/operator/edgefs/nfs/nfs.go | 4 +- pkg/operator/edgefs/s3/s3.go | 4 +- pkg/operator/edgefs/s3x/s3x.go | 4 +- pkg/operator/edgefs/swift/swift.go | 4 +- pkg/operator/k8sutil/kvstore.go | 2 +- pkg/operator/k8sutil/resources.go | 47 ++----------------- pkg/operator/k8sutil/resources_test.go | 34 +------------- pkg/operator/minio/controller.go | 4 +- 33 files changed, 58 insertions(+), 129 deletions(-) diff --git a/pkg/operator/ceph/cluster/cluster.go b/pkg/operator/ceph/cluster/cluster.go index ebff57a67..c49ea5bc0 100755 --- a/pkg/operator/ceph/cluster/cluster.go +++ b/pkg/operator/ceph/cluster/cluster.go @@ -117,7 +117,7 @@ func (c *cluster) detectCephVersion(image string, timeout time.Duration) (*cephv }, } k8sutil.AddRookVersionLabelToJob(job) - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &job.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&job.ObjectMeta, &c.ownerRef) // run the job to detect the version if err := k8sutil.RunReplaceableJob(c.context.Clientset, job, true); err != nil { @@ -179,7 +179,7 @@ func (c *cluster) doOrchestration(rookImage string, cephVersion cephver.CephVers }, Data: placeholderConfig, } - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &cm.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&cm.ObjectMeta, &c.ownerRef) _, err := c.context.Clientset.CoreV1().ConfigMaps(c.Namespace).Create(cm) if err != nil && !errors.IsAlreadyExists(err) { return fmt.Errorf("failed to create override configmap %s. %+v", c.Namespace, err) @@ -282,7 +282,7 @@ func (c *cluster) createInitialCrushMap() error { }, Data: map[string]string{crushmapCreatedKey: "1"}, } - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &configMap.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&configMap.ObjectMeta, &c.ownerRef) if !configMapExists { if _, err := c.context.Clientset.CoreV1().ConfigMaps(c.Namespace).Create(configMap); err != nil { diff --git a/pkg/operator/ceph/cluster/mgr/dashboard.go b/pkg/operator/ceph/cluster/mgr/dashboard.go index 46164cc90..7ac86b543 100755 --- a/pkg/operator/ceph/cluster/mgr/dashboard.go +++ b/pkg/operator/ceph/cluster/mgr/dashboard.go @@ -262,7 +262,7 @@ func (c *Cluster) getOrGenerateDashboardPassword() (string, error) { Data: secrets, Type: k8sutil.RookType, } - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &secret.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&secret.ObjectMeta, &c.ownerRef) _, err = c.context.Clientset.CoreV1().Secrets(c.Namespace).Create(secret) if err != nil { diff --git a/pkg/operator/ceph/cluster/mgr/spec.go b/pkg/operator/ceph/cluster/mgr/spec.go index 923add902..0397b18a8 100644 --- a/pkg/operator/ceph/cluster/mgr/spec.go +++ b/pkg/operator/ceph/cluster/mgr/spec.go @@ -108,7 +108,7 @@ func (c *Cluster) makeDeployment(mgrConfig *mgrConfig) *apps.Deployment { d.ObjectMeta.Annotations = prometheusAnnotations } opspec.AddCephVersionLabelToDeployment(c.clusterInfo.CephVersion, d) - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &d.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&d.ObjectMeta, &c.ownerRef) return d } @@ -300,7 +300,7 @@ func (c *Cluster) makeMetricsService(name string) *v1.Service { }, } - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &svc.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&svc.ObjectMeta, &c.ownerRef) return svc } @@ -324,7 +324,7 @@ func (c *Cluster) makeDashboardService(name string, port int) *v1.Service { }, }, } - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &svc.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&svc.ObjectMeta, &c.ownerRef) return svc } diff --git a/pkg/operator/ceph/cluster/mon/config.go b/pkg/operator/ceph/cluster/mon/config.go index 3a3a5419a..bc7ee2d64 100644 --- a/pkg/operator/ceph/cluster/mon/config.go +++ b/pkg/operator/ceph/cluster/mon/config.go @@ -198,7 +198,7 @@ func createClusterAccessSecret(clientset kubernetes.Interface, namespace string, Data: secrets, Type: k8sutil.RookType, } - k8sutil.SetOwnerRef(clientset, namespace, &secret.ObjectMeta, ownerRef) + k8sutil.SetOwnerRef(&secret.ObjectMeta, ownerRef) if _, err = clientset.CoreV1().Secrets(namespace).Create(secret); err != nil { return fmt.Errorf("failed to save mon secrets. %+v", err) diff --git a/pkg/operator/ceph/cluster/mon/mon.go b/pkg/operator/ceph/cluster/mon/mon.go index 42387d381..b436a2926 100644 --- a/pkg/operator/ceph/cluster/mon/mon.go +++ b/pkg/operator/ceph/cluster/mon/mon.go @@ -459,7 +459,7 @@ func (c *Cluster) saveMonConfig() error { Namespace: c.Namespace, }, } - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &configMap.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&configMap.ObjectMeta, &c.ownerRef) monMapping, err := json.Marshal(c.mapping) if err != nil { diff --git a/pkg/operator/ceph/cluster/mon/service.go b/pkg/operator/ceph/cluster/mon/service.go index 6e9c585b8..7675b93ab 100644 --- a/pkg/operator/ceph/cluster/mon/service.go +++ b/pkg/operator/ceph/cluster/mon/service.go @@ -47,7 +47,7 @@ func (c *Cluster) createService(mon *monConfig) (string, error) { Selector: labels, }, } - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &svcDef.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&svcDef.ObjectMeta, &c.ownerRef) if c.HostNetwork { svcDef.Spec.ClusterIP = v1.ClusterIPNone } diff --git a/pkg/operator/ceph/cluster/mon/spec.go b/pkg/operator/ceph/cluster/mon/spec.go index e12fc8b40..70f326369 100644 --- a/pkg/operator/ceph/cluster/mon/spec.go +++ b/pkg/operator/ceph/cluster/mon/spec.go @@ -59,7 +59,7 @@ func (c *Cluster) makeDeployment(monConfig *monConfig, hostname string) *apps.De k8sutil.AddRookVersionLabelToDeployment(d) cephv1.GetMonAnnotations(c.spec.Annotations).ApplyToObjectMeta(&d.ObjectMeta) opspec.AddCephVersionLabelToDeployment(c.clusterInfo.CephVersion, d) - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &d.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&d.ObjectMeta, &c.ownerRef) pod := c.makeMonPod(monConfig, hostname) replicaCount := int32(1) diff --git a/pkg/operator/ceph/cluster/osd/spec.go b/pkg/operator/ceph/cluster/osd/spec.go index bd5db0ca4..a191d3c8e 100644 --- a/pkg/operator/ceph/cluster/osd/spec.go +++ b/pkg/operator/ceph/cluster/osd/spec.go @@ -76,7 +76,7 @@ func (c *Cluster) makeJob(nodeName string, devices []rookalpha.Device, } k8sutil.AddRookVersionLabelToJob(job) opspec.AddCephVersionLabelToJob(c.clusterInfo.CephVersion, job) - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &job.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&job.ObjectMeta, &c.ownerRef) return job, nil } @@ -332,7 +332,7 @@ func (c *Cluster) makeDeployment(nodeName string, selection rookalpha.Selection, c.annotations.ApplyToObjectMeta(&deployment.Spec.Template.ObjectMeta) opspec.AddCephVersionLabelToDeployment(c.clusterInfo.CephVersion, deployment) opspec.AddCephVersionLabelToDeployment(c.clusterInfo.CephVersion, deployment) - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &deployment.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&deployment.ObjectMeta, &c.ownerRef) c.placement.ApplyToPodSpec(&deployment.Spec.Template.Spec) return deployment, nil } diff --git a/pkg/operator/ceph/cluster/rbd/spec.go b/pkg/operator/ceph/cluster/rbd/spec.go index 588ba8ca6..c5ec8100c 100644 --- a/pkg/operator/ceph/cluster/rbd/spec.go +++ b/pkg/operator/ceph/cluster/rbd/spec.go @@ -64,7 +64,7 @@ func (m *Mirroring) makeDeployment(daemonConfig *daemonConfig) *apps.Deployment } k8sutil.AddRookVersionLabelToDeployment(d) opspec.AddCephVersionLabelToDeployment(m.ClusterInfo.CephVersion, d) - k8sutil.SetOwnerRef(m.context.Clientset, m.Namespace, &d.ObjectMeta, &m.ownerRef) + k8sutil.SetOwnerRef(&d.ObjectMeta, &m.ownerRef) return d } diff --git a/pkg/operator/ceph/config/keyring/store.go b/pkg/operator/ceph/config/keyring/store.go index 403bb1eb3..237a00612 100644 --- a/pkg/operator/ceph/config/keyring/store.go +++ b/pkg/operator/ceph/config/keyring/store.go @@ -96,7 +96,7 @@ func (k *SecretStore) CreateOrUpdate(resourceName, keyring string) error { }, Type: k8sutil.RookType, } - k8sutil.SetOwnerRef(k.context.Clientset, k.namespace, &secret.ObjectMeta, k.ownerRef) + k8sutil.SetOwnerRef(&secret.ObjectMeta, k.ownerRef) return k.createSecret(secret) } diff --git a/pkg/operator/ceph/config/store.go b/pkg/operator/ceph/config/store.go index 52cf05a33..aaf2a1021 100644 --- a/pkg/operator/ceph/config/store.go +++ b/pkg/operator/ceph/config/store.go @@ -197,7 +197,7 @@ func (s *Store) createOrUpdateMonHostSecrets(clusterInfo *cephconfig.ClusterInfo Type: k8sutil.RookType, } clientset := s.context.Clientset - k8sutil.SetOwnerRef(clientset, s.namespace, &secret.ObjectMeta, s.ownerRef) + k8sutil.SetOwnerRef(&secret.ObjectMeta, s.ownerRef) _, err := clientset.CoreV1().Secrets(s.namespace).Get(storeName, metav1.GetOptions{}) if err != nil { diff --git a/pkg/operator/ceph/config/store_test.go b/pkg/operator/ceph/config/store_test.go index aaba878db..c02edf693 100644 --- a/pkg/operator/ceph/config/store_test.go +++ b/pkg/operator/ceph/config/store_test.go @@ -153,7 +153,7 @@ func createOverrideMap(t *testing.T, Name: k8sutil.ConfigOverrideName, }, } - k8sutil.SetOwnerRef(context.Clientset, namespace, &cm.ObjectMeta, ownerRef) + k8sutil.SetOwnerRef(&cm.ObjectMeta, ownerRef) _, err := context.Clientset.CoreV1().ConfigMaps(namespace).Create(cm) assert.NoError(t, err) } @@ -167,7 +167,7 @@ func updateOverrideMap(t *testing.T, overrideText string, }, Data: map[string]string{k8sutil.ConfigOverrideVal: overrideText}, } - k8sutil.SetOwnerRef(context.Clientset, namespace, &cm.ObjectMeta, ownerRef) + k8sutil.SetOwnerRef(&cm.ObjectMeta, ownerRef) _, err := context.Clientset.CoreV1().ConfigMaps(namespace).Update(cm) assert.NoError(t, err) } diff --git a/pkg/operator/ceph/file/mds/spec.go b/pkg/operator/ceph/file/mds/spec.go index 03380dd74..110ab1384 100644 --- a/pkg/operator/ceph/file/mds/spec.go +++ b/pkg/operator/ceph/file/mds/spec.go @@ -80,7 +80,7 @@ func (c *Cluster) makeDeployment(mdsConfig *mdsConfig) *apps.Deployment { k8sutil.AddRookVersionLabelToDeployment(d) c.fs.Spec.MetadataServer.Annotations.ApplyToObjectMeta(&d.ObjectMeta) opspec.AddCephVersionLabelToDeployment(c.clusterInfo.CephVersion, d) - k8sutil.SetOwnerRefs(c.context.Clientset, c.fs.Namespace, &d.ObjectMeta, c.ownerRefs) + k8sutil.SetOwnerRefs(&d.ObjectMeta, c.ownerRefs) return d } diff --git a/pkg/operator/ceph/nfs/nfs.go b/pkg/operator/ceph/nfs/nfs.go index 5f1deed3b..c2de02853 100644 --- a/pkg/operator/ceph/nfs/nfs.go +++ b/pkg/operator/ceph/nfs/nfs.go @@ -170,7 +170,7 @@ func (c *CephNFSController) runGaneshaRadosGraceJob(n cephv1.CephNFS, name, acti }, }, } - k8sutil.SetOwnerRef(c.context.Clientset, n.Namespace, &job.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&job.ObjectMeta, &c.ownerRef) // run the job to detect the version if err := k8sutil.RunReplaceableJob(c.context.Clientset, job, false); err != nil { diff --git a/pkg/operator/ceph/nfs/spec.go b/pkg/operator/ceph/nfs/spec.go index 93648f6f0..f0c9aa126 100644 --- a/pkg/operator/ceph/nfs/spec.go +++ b/pkg/operator/ceph/nfs/spec.go @@ -58,7 +58,7 @@ func (c *CephNFSController) createCephNFSService(n cephv1.CephNFS, name string) }, }, } - k8sutil.SetOwnerRef(c.context.Clientset, n.Namespace, &svc.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&svc.ObjectMeta, &c.ownerRef) if c.hostNetwork { svc.Spec.ClusterIP = v1.ClusterIPNone } @@ -86,7 +86,7 @@ func (c *CephNFSController) makeDeployment(n cephv1.CephNFS, name, configName st }, } n.Spec.Server.Annotations.ApplyToObjectMeta(&deployment.ObjectMeta) - k8sutil.SetOwnerRef(c.context.Clientset, n.Namespace, &deployment.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&deployment.ObjectMeta, &c.ownerRef) configMapSource := &v1.ConfigMapVolumeSource{ LocalObjectReference: v1.LocalObjectReference{Name: configName}, Items: []v1.KeyToPath{{Key: "config", Path: "ganesha.conf"}}, diff --git a/pkg/operator/ceph/object/spec.go b/pkg/operator/ceph/object/spec.go index 0404382f4..1a1227701 100644 --- a/pkg/operator/ceph/object/spec.go +++ b/pkg/operator/ceph/object/spec.go @@ -51,7 +51,7 @@ func (c *clusterConfig) startDeployment(rgwConfig *rgwConfig) (*apps.Deployment, k8sutil.AddRookVersionLabelToDeployment(d) c.store.Spec.Gateway.Annotations.ApplyToObjectMeta(&d.ObjectMeta) opspec.AddCephVersionLabelToDeployment(c.clusterInfo.CephVersion, d) - k8sutil.SetOwnerRefs(c.context.Clientset, c.store.Namespace, &d.ObjectMeta, c.ownerRefs) + k8sutil.SetOwnerRefs(&d.ObjectMeta, c.ownerRefs) logger.Debugf("starting rgw deployment: %+v", d) deployment, err := c.context.Clientset.AppsV1().Deployments(c.store.Namespace).Get(d.Name, metav1.GetOptions{}) @@ -181,7 +181,7 @@ func (c *clusterConfig) startService() (string, error) { Selector: labels, }, } - k8sutil.SetOwnerRefs(c.context.Clientset, c.store.Namespace, &svc.ObjectMeta, c.ownerRefs) + k8sutil.SetOwnerRefs(&svc.ObjectMeta, c.ownerRefs) if c.hostNetwork { svc.Spec.ClusterIP = v1.ClusterIPNone } diff --git a/pkg/operator/ceph/object/user/controller.go b/pkg/operator/ceph/object/user/controller.go index a1731ccd1..467520a73 100644 --- a/pkg/operator/ceph/object/user/controller.go +++ b/pkg/operator/ceph/object/user/controller.go @@ -176,7 +176,7 @@ func (c *ObjectStoreUserController) createUser(context *clusterd.Context, u *cep StringData: secrets, Type: k8sutil.RookType, } - k8sutil.SetOwnerRef(context.Clientset, u.Namespace, &secret.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&secret.ObjectMeta, &c.ownerRef) _, err = context.Clientset.CoreV1().Secrets(u.Namespace).Create(secret) if err != nil { diff --git a/pkg/operator/cockroachdb/controller.go b/pkg/operator/cockroachdb/controller.go index ec5a75e63..fb0140993 100644 --- a/pkg/operator/cockroachdb/controller.go +++ b/pkg/operator/cockroachdb/controller.go @@ -215,7 +215,7 @@ func (c *ClusterController) createClientService(cluster *cluster) error { Ports: createServicePorts(httpPort, grpcPort), }, } - k8sutil.SetOwnerRef(c.context.Clientset, cluster.namespace, &clientService.ObjectMeta, &cluster.ownerRef) + k8sutil.SetOwnerRef(&clientService.ObjectMeta, &cluster.ownerRef) if _, err := c.context.Clientset.CoreV1().Services(cluster.namespace).Create(clientService); err != nil { if !errors.IsAlreadyExists(err) { @@ -265,7 +265,7 @@ func (c *ClusterController) createReplicaService(cluster *cluster) error { Ports: createServicePorts(httpPort, grpcPort), }, } - k8sutil.SetOwnerRef(c.context.Clientset, cluster.namespace, &replicaService.ObjectMeta, &cluster.ownerRef) + k8sutil.SetOwnerRef(&replicaService.ObjectMeta, &cluster.ownerRef) if _, err := c.context.Clientset.CoreV1().Services(cluster.namespace).Create(replicaService); err != nil { if !errors.IsAlreadyExists(err) { @@ -295,7 +295,7 @@ func (c *ClusterController) createPodDisruptionBudget(cluster *cluster) error { MaxUnavailable: &maxUnavailable, }, } - k8sutil.SetOwnerRef(c.context.Clientset, cluster.namespace, &pdb.ObjectMeta, &cluster.ownerRef) + k8sutil.SetOwnerRef(&pdb.ObjectMeta, &cluster.ownerRef) if _, err := c.context.Clientset.PolicyV1beta1().PodDisruptionBudgets(cluster.namespace).Create(pdb); err != nil { if !errors.IsAlreadyExists(err) { @@ -344,7 +344,7 @@ func (c *ClusterController) createStatefulSet(cluster *cluster) error { } cluster.annotations.ApplyToObjectMeta(&statefulSet.Spec.Template.ObjectMeta) cluster.annotations.ApplyToObjectMeta(&statefulSet.ObjectMeta) - k8sutil.SetOwnerRef(c.context.Clientset, cluster.namespace, &statefulSet.ObjectMeta, &cluster.ownerRef) + k8sutil.SetOwnerRef(&statefulSet.ObjectMeta, &cluster.ownerRef) if _, err := c.context.Clientset.AppsV1().StatefulSets(cluster.namespace).Create(statefulSet); err != nil { if !errors.IsAlreadyExists(err) { diff --git a/pkg/operator/edgefs/cluster/cluster.go b/pkg/operator/edgefs/cluster/cluster.go index da9900f69..dbb987950 100644 --- a/pkg/operator/edgefs/cluster/cluster.go +++ b/pkg/operator/edgefs/cluster/cluster.go @@ -90,7 +90,7 @@ func (c *cluster) createInstance(rookImage string) error { }, Data: placeholderConfig, } - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &cm.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&cm.ObjectMeta, &c.ownerRef) _, err := c.context.Clientset.CoreV1().ConfigMaps(c.Namespace).Create(cm) if err != nil && !errors.IsAlreadyExists(err) { return fmt.Errorf("failed to create override configmap %s. %+v", c.Namespace, err) diff --git a/pkg/operator/edgefs/cluster/configmap.go b/pkg/operator/edgefs/cluster/configmap.go index 1c06884f8..86d8aef87 100644 --- a/pkg/operator/edgefs/cluster/configmap.go +++ b/pkg/operator/edgefs/cluster/configmap.go @@ -166,7 +166,7 @@ func (c *cluster) createClusterConfigMap(nodes []rookalpha.Node, deploymentConfi Data: dataMap, } - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &configMap.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&configMap.ObjectMeta, &c.ownerRef) if _, err := c.context.Clientset.CoreV1().ConfigMaps(c.Namespace).Create(configMap); err != nil { if errors.IsAlreadyExists(err) { if _, err := c.context.Clientset.CoreV1().ConfigMaps(c.Namespace).Update(configMap); err != nil { diff --git a/pkg/operator/edgefs/cluster/mgr/mgr.go b/pkg/operator/edgefs/cluster/mgr/mgr.go index 4e05db9fa..fd0d710dd 100644 --- a/pkg/operator/edgefs/cluster/mgr/mgr.go +++ b/pkg/operator/edgefs/cluster/mgr/mgr.go @@ -192,7 +192,7 @@ func (c *Cluster) makeMgrService(name string) *v1.Service { }, } - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &svc.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&svc.ObjectMeta, &c.ownerRef) return svc } @@ -227,7 +227,7 @@ func (c *Cluster) makeRestapiService(name string) *v1.Service { }, } - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &svc.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&svc.ObjectMeta, &c.ownerRef) return svc } @@ -257,7 +257,7 @@ func (c *Cluster) makeUIService(name string) *v1.Service { }, } - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &svc.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&svc.ObjectMeta, &c.ownerRef) if c.dashboardSpec.LocalAddr != "" { ip := net.ParseIP(c.dashboardSpec.LocalAddr) @@ -352,7 +352,7 @@ func (c *Cluster) makeDeployment(name, clusterName, rookImage string, replicas i Replicas: &replicas, }, } - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &d.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&d.ObjectMeta, &c.ownerRef) c.annotations.ApplyToObjectMeta(&d.ObjectMeta) return d } diff --git a/pkg/operator/edgefs/cluster/prepare/prepare.go b/pkg/operator/edgefs/cluster/prepare/prepare.go index cb4797ffe..27f692f10 100644 --- a/pkg/operator/edgefs/cluster/prepare/prepare.go +++ b/pkg/operator/edgefs/cluster/prepare/prepare.go @@ -150,7 +150,7 @@ func (c *Cluster) makeJob(name, clusterName, rookImage string, nodeName string) }, Spec: batch.JobSpec{Template: podSpec}, } - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &ds.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&ds.ObjectMeta, &c.ownerRef) return ds } diff --git a/pkg/operator/edgefs/cluster/target/pod.go b/pkg/operator/edgefs/cluster/target/pod.go index bc241e041..a02d13e9f 100644 --- a/pkg/operator/edgefs/cluster/target/pod.go +++ b/pkg/operator/edgefs/cluster/target/pod.go @@ -514,7 +514,7 @@ func (c *Cluster) makeStatefulSet(replicas int32, rookImage string, dro edgefsv1 } } - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &statefulSet.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&statefulSet.ObjectMeta, &c.ownerRef) c.annotations.ApplyToObjectMeta(&statefulSet.ObjectMeta) c.annotations.ApplyToObjectMeta(&statefulSet.Spec.Template.ObjectMeta) c.placement.ApplyToPodSpec(&statefulSet.Spec.Template.Spec) @@ -556,7 +556,7 @@ func (c *Cluster) makeHeadlessService() (*v1.Service, error) { Ports: c.makeHeadlessServicePorts(udpTotemPortDefault), }, } - k8sutil.SetOwnerRef(c.context.Clientset, c.Namespace, &headlessService.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&headlessService.ObjectMeta, &c.ownerRef) return headlessService, nil } diff --git a/pkg/operator/edgefs/iscsi/iscsi.go b/pkg/operator/edgefs/iscsi/iscsi.go index fe37b987d..f0f66a61e 100644 --- a/pkg/operator/edgefs/iscsi/iscsi.go +++ b/pkg/operator/edgefs/iscsi/iscsi.go @@ -119,7 +119,7 @@ func (c *ISCSIController) makeISCSIService(name, svcname, namespace string, iscs }, } - k8sutil.SetOwnerRef(c.context.Clientset, namespace, &svc.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&svc.ObjectMeta, &c.ownerRef) return svc } @@ -186,7 +186,7 @@ func (c *ISCSIController) makeDeployment(svcname, namespace, rookImage string, i Replicas: &instancesCount, }, } - k8sutil.SetOwnerRef(c.context.Clientset, namespace, &d.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&d.ObjectMeta, &c.ownerRef) iscsiSpec.Annotations.ApplyToObjectMeta(&d.ObjectMeta) return d diff --git a/pkg/operator/edgefs/isgw/isgw.go b/pkg/operator/edgefs/isgw/isgw.go index a33499944..e9f245288 100644 --- a/pkg/operator/edgefs/isgw/isgw.go +++ b/pkg/operator/edgefs/isgw/isgw.go @@ -168,7 +168,7 @@ func (c *ISGWController) makeISGWService(name, svcname, namespace string, isgwSp svc.Spec.Ports = append(svc.Spec.Ports, v1.ServicePort{Name: "dfport", Port: int32(lport), Protocol: v1.ProtocolTCP}) } - k8sutil.SetOwnerRef(c.context.Clientset, namespace, &svc.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&svc.ObjectMeta, &c.ownerRef) return svc } @@ -234,7 +234,7 @@ func (c *ISGWController) makeDeployment(svcname, namespace, rookImage string, is Replicas: &instancesCount, }, } - k8sutil.SetOwnerRef(c.context.Clientset, namespace, &d.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&d.ObjectMeta, &c.ownerRef) return d } diff --git a/pkg/operator/edgefs/nfs/nfs.go b/pkg/operator/edgefs/nfs/nfs.go index 324a5e660..9777706b8 100644 --- a/pkg/operator/edgefs/nfs/nfs.go +++ b/pkg/operator/edgefs/nfs/nfs.go @@ -122,7 +122,7 @@ func (c *NFSController) makeNFSService(name, svcname, namespace string) *v1.Serv }, } - k8sutil.SetOwnerRef(c.context.Clientset, namespace, &svc.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&svc.ObjectMeta, &c.ownerRef) return svc } @@ -188,7 +188,7 @@ func (c *NFSController) makeDeployment(svcname, namespace, rookImage string, nfs Replicas: &nfsSpec.Instances, }, } - k8sutil.SetOwnerRef(c.context.Clientset, namespace, &d.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&d.ObjectMeta, &c.ownerRef) nfsSpec.Annotations.ApplyToObjectMeta(&d.ObjectMeta) return d } diff --git a/pkg/operator/edgefs/s3/s3.go b/pkg/operator/edgefs/s3/s3.go index 74f9888f3..65db37b5f 100644 --- a/pkg/operator/edgefs/s3/s3.go +++ b/pkg/operator/edgefs/s3/s3.go @@ -151,7 +151,7 @@ func (c *S3Controller) makeS3Service(name, svcname, namespace string, s3Spec edg }, } - k8sutil.SetOwnerRef(c.context.Clientset, namespace, &svc.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&svc.ObjectMeta, &c.ownerRef) return svc } @@ -239,7 +239,7 @@ func (c *S3Controller) makeDeployment(svcname, namespace, rookImage, imageArgs s Replicas: &s3Spec.Instances, }, } - k8sutil.SetOwnerRef(c.context.Clientset, namespace, &d.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&d.ObjectMeta, &c.ownerRef) s3Spec.Annotations.ApplyToObjectMeta(&d.ObjectMeta) return d } diff --git a/pkg/operator/edgefs/s3x/s3x.go b/pkg/operator/edgefs/s3x/s3x.go index 743827ee9..789ef0d45 100644 --- a/pkg/operator/edgefs/s3x/s3x.go +++ b/pkg/operator/edgefs/s3x/s3x.go @@ -127,7 +127,7 @@ func (c *S3XController) makeS3XService(name, svcname, namespace string, s3xSpec }, } - k8sutil.SetOwnerRef(c.context.Clientset, namespace, &svc.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&svc.ObjectMeta, &c.ownerRef) return svc } @@ -223,7 +223,7 @@ func (c *S3XController) makeDeployment(svcname, namespace, rookImage string, s3x Replicas: &s3xSpec.Instances, }, } - k8sutil.SetOwnerRef(c.context.Clientset, namespace, &d.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&d.ObjectMeta, &c.ownerRef) s3xSpec.Annotations.ApplyToObjectMeta(&d.ObjectMeta) return d } diff --git a/pkg/operator/edgefs/swift/swift.go b/pkg/operator/edgefs/swift/swift.go index ef4345dd9..bf388734e 100644 --- a/pkg/operator/edgefs/swift/swift.go +++ b/pkg/operator/edgefs/swift/swift.go @@ -139,7 +139,7 @@ func (c *SWIFTController) makeSWIFTService(name, svcname, namespace string, swif }, } - k8sutil.SetOwnerRef(c.context.Clientset, namespace, &svc.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&svc.ObjectMeta, &c.ownerRef) return svc } @@ -226,7 +226,7 @@ func (c *SWIFTController) makeDeployment(svcname, namespace, rookImage, imageArg Replicas: &swiftSpec.Instances, }, } - k8sutil.SetOwnerRef(c.context.Clientset, namespace, &d.ObjectMeta, &c.ownerRef) + k8sutil.SetOwnerRef(&d.ObjectMeta, &c.ownerRef) return d } diff --git a/pkg/operator/k8sutil/kvstore.go b/pkg/operator/k8sutil/kvstore.go index ef15e3d0d..eac5ea9ae 100644 --- a/pkg/operator/k8sutil/kvstore.go +++ b/pkg/operator/k8sutil/kvstore.go @@ -75,7 +75,7 @@ func (kv *ConfigMapKVStore) SetValueWithLabels(storeName, key, value string, lab if labels != nil { cm.Labels = labels } - SetOwnerRef(kv.clientset, kv.namespace, &cm.ObjectMeta, &kv.ownerRef) + SetOwnerRef(&cm.ObjectMeta, &kv.ownerRef) _, err = kv.clientset.CoreV1().ConfigMaps(kv.namespace).Create(cm) return err diff --git a/pkg/operator/k8sutil/resources.go b/pkg/operator/k8sutil/resources.go index 8f9c1dcf5..7612e6e84 100644 --- a/pkg/operator/k8sutil/resources.go +++ b/pkg/operator/k8sutil/resources.go @@ -20,14 +20,7 @@ package k8sutil // MergeResourceRequirements merges two resource requirements together (first overrides second values) import ( "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/kubernetes" -) - -var ( - skipSetOwnerRefEnv bool - testedSetOwnerRef bool ) func MergeResourceRequirements(first, second v1.ResourceRequirements) v1.ResourceRequirements { @@ -67,45 +60,13 @@ func MergeResourceRequirements(first, second v1.ResourceRequirements) v1.Resourc return first } -func SetOwnerRef(clientset kubernetes.Interface, namespace string, object *metav1.ObjectMeta, ownerRef *metav1.OwnerReference) { +func SetOwnerRef(object *metav1.ObjectMeta, ownerRef *metav1.OwnerReference) { if ownerRef == nil { return } - SetOwnerRefs(clientset, namespace, object, []metav1.OwnerReference{*ownerRef}) + SetOwnerRefs(object, []metav1.OwnerReference{*ownerRef}) } -func SetOwnerRefs(clientset kubernetes.Interface, namespace string, object *metav1.ObjectMeta, ownerRefs []metav1.OwnerReference) { - if !testedSetOwnerRef { - testSetOwnerRef(clientset, namespace, ownerRefs) - testedSetOwnerRef = true - } - if skipSetOwnerRefEnv { - return - } - - // We want to set the owner ref unless we detect if it needs to be skipped. - object.OwnerReferences = ownerRefs -} - -func testSetOwnerRef(clientset kubernetes.Interface, namespace string, ownerRefs []metav1.OwnerReference) { - // Confirm if we can create a resource with the ownerref set to the cluster CRD. - // Some versions of OpenShift may not have support for setting the ownerref to a CRD. - // See https://github.com/kubernetes/kubernetes/pull/62810 - cm := &v1.ConfigMap{ - ObjectMeta: metav1.ObjectMeta{ - Name: "rook-test-ownerref", - Namespace: namespace, - OwnerReferences: ownerRefs, - }, - Data: map[string]string{}, - } - _, err := clientset.CoreV1().ConfigMaps(namespace).Create(cm) - if err != nil && !errors.IsAlreadyExists(err) { - logger.Warningf("OwnerReferences will not be set on resources created by rook. failed to test that it can be set. %+v", err) - skipSetOwnerRefEnv = true - return - } - - logger.Infof("verified the ownerref can be set on resources") - skipSetOwnerRefEnv = false +func SetOwnerRefs(object *metav1.ObjectMeta, ownerRefs []metav1.OwnerReference) { + object.SetOwnerReferences(ownerRefs) } diff --git a/pkg/operator/k8sutil/resources_test.go b/pkg/operator/k8sutil/resources_test.go index e014d1c36..32414b45f 100644 --- a/pkg/operator/k8sutil/resources_test.go +++ b/pkg/operator/k8sutil/resources_test.go @@ -18,7 +18,6 @@ limitations under the License. package k8sutil import ( - "fmt" "testing" "github.com/stretchr/testify/assert" @@ -26,9 +25,6 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/kubernetes/fake" - k8stesting "k8s.io/client-go/testing" ) func TestMergeResourceRequirements(t *testing.T) { @@ -76,10 +72,6 @@ func TestMergeResourceRequirements(t *testing.T) { } func TestOwnerRefCheck(t *testing.T) { - skipSetOwnerRefEnv = false - testedSetOwnerRef = false - - clientset := fake.NewSimpleClientset() namespace := "ns" resource := &v1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ @@ -91,31 +83,7 @@ func TestOwnerRefCheck(t *testing.T) { ownerRef := &metav1.OwnerReference{Name: "myref"} // test that the ownerref is set - SetOwnerRef(clientset, namespace, &resource.ObjectMeta, ownerRef) - assert.True(t, testedSetOwnerRef) - assert.False(t, skipSetOwnerRefEnv) + SetOwnerRef(&resource.ObjectMeta, ownerRef) require.Equal(t, 1, len(resource.OwnerReferences)) assert.Equal(t, ownerRef.Name, resource.OwnerReferences[0].Name) - - // test that the ownerref configmap is already created - skipSetOwnerRefEnv = false - testedSetOwnerRef = false - resource.OwnerReferences = nil - SetOwnerRef(clientset, namespace, &resource.ObjectMeta, ownerRef) - assert.True(t, testedSetOwnerRef) - assert.False(t, skipSetOwnerRefEnv) - require.Equal(t, 1, len(resource.OwnerReferences)) - assert.Equal(t, ownerRef.Name, resource.OwnerReferences[0].Name) - - // test that the ownerref cannot be set - clientset.PrependReactor("create", "configmaps", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { - return true, nil, fmt.Errorf("mock failed to create configmap") - }) - skipSetOwnerRefEnv = false - testedSetOwnerRef = false - resource.OwnerReferences = nil - SetOwnerRef(clientset, namespace, &resource.ObjectMeta, ownerRef) - assert.True(t, testedSetOwnerRef) - assert.True(t, skipSetOwnerRefEnv) - require.Nil(t, resource.OwnerReferences) } diff --git a/pkg/operator/minio/controller.go b/pkg/operator/minio/controller.go index a8851a433..afc591d5d 100644 --- a/pkg/operator/minio/controller.go +++ b/pkg/operator/minio/controller.go @@ -106,7 +106,7 @@ func (c *Controller) makeMinioHeadlessService(name, namespace string, spec minio ClusterIP: v1.ClusterIPNone, }, } - k8sutil.SetOwnerRef(c.context.Clientset, namespace, &svc.ObjectMeta, &ownerRef) + k8sutil.SetOwnerRef(&svc.ObjectMeta, &ownerRef) svc, err := c.context.Clientset.CoreV1().Services(namespace).Create(svc) if err != nil && !k8serrors.IsAlreadyExists(err) { @@ -296,7 +296,7 @@ func (c *Controller) makeMinioStatefulSet(name, namespace string, spec miniov1al }, } annotations.ApplyToObjectMeta(&sts.ObjectMeta) - k8sutil.SetOwnerRef(c.context.Clientset, namespace, &sts.ObjectMeta, &ownerRef) + k8sutil.SetOwnerRef(&sts.ObjectMeta, &ownerRef) sts, err = c.context.Clientset.AppsV1().StatefulSets(namespace).Create(sts) if err != nil && !k8serrors.IsAlreadyExists(err) { return nil, fmt.Errorf("failed to create minio statefulset. %+v", err)