-
Notifications
You must be signed in to change notification settings - Fork 391
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
🌱 Replicating SyncTarget-related rbac and logicalclusters objects #2933
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
/* | ||
Copyright 2023 The KCP Authors. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package replicateclusterrole | ||
|
||
import ( | ||
kcprbacinformers "github.com/kcp-dev/client-go/informers/rbac/v1" | ||
kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" | ||
"github.com/kcp-dev/logicalcluster/v3" | ||
|
||
rbacv1 "k8s.io/api/rbac/v1" | ||
"k8s.io/kube-openapi/pkg/util/sets" | ||
|
||
"github.com/kcp-dev/kcp/pkg/reconciler/cache/labelclusterroles" | ||
"github.com/kcp-dev/kcp/sdk/apis/workload" | ||
) | ||
|
||
const ( | ||
ControllerName = "kcp-workloads-replicate-clusterrole" | ||
) | ||
|
||
// NewController returns a new controller for labelling ClusterRole that should be replicated. | ||
func NewController( | ||
kubeClusterClient kcpkubernetesclientset.ClusterInterface, | ||
clusterRoleInformer kcprbacinformers.ClusterRoleClusterInformer, | ||
clusterRoleBindingInformer kcprbacinformers.ClusterRoleBindingClusterInformer, | ||
) labelclusterroles.Controller { | ||
return labelclusterroles.NewController( | ||
ControllerName, | ||
workload.GroupName, | ||
HasSyncRule, | ||
func(clusterName logicalcluster.Name, crb *rbacv1.ClusterRoleBinding) bool { return false }, | ||
kubeClusterClient, | ||
clusterRoleInformer, | ||
clusterRoleBindingInformer, | ||
) | ||
} | ||
|
||
func HasSyncRule(clusterName logicalcluster.Name, cr *rbacv1.ClusterRole) bool { | ||
for _, rule := range cr.Rules { | ||
apiGroups := sets.NewString(rule.APIGroups...) | ||
if !apiGroups.Has(workload.GroupName) && !apiGroups.Has("*") { | ||
continue | ||
} | ||
resources := sets.NewString(rule.Resources...) | ||
verbs := sets.NewString(rule.Verbs...) | ||
if (resources.Has("synctargets") || resources.Has("*")) && (verbs.Has("sync") || verbs.Has("*")) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. shouldn't we match on There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Well, in fact I came back to what @sttts had done for APIExports (quite similar use-case): https://github.com/kcp-dev/kcp/blob/main/pkg/reconciler/apis/replicateclusterrole/replicateclusterrole_controller.go#L58 That mainly covers all the CRs that would allow the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. OK, thanks for explaining. |
||
return true | ||
} | ||
} | ||
return false | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
/* | ||
Copyright 2023 The KCP Authors. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package replicateclusterrolebinding | ||
|
||
import ( | ||
kcprbacinformers "github.com/kcp-dev/client-go/informers/rbac/v1" | ||
kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" | ||
"github.com/kcp-dev/logicalcluster/v3" | ||
|
||
rbacv1 "k8s.io/api/rbac/v1" | ||
|
||
"github.com/kcp-dev/kcp/pkg/reconciler/cache/labelclusterrolebindings" | ||
"github.com/kcp-dev/kcp/pkg/reconciler/workload/replicateclusterrole" | ||
"github.com/kcp-dev/kcp/sdk/apis/workload" | ||
) | ||
|
||
const ( | ||
ControllerName = "kcp-workloads-replicate-clusterrolebinding" | ||
) | ||
|
||
// NewController returns a new controller for labelling ClusterRoleBinding that should be replicated. | ||
func NewController( | ||
kubeClusterClient kcpkubernetesclientset.ClusterInterface, | ||
clusterRoleBindingInformer kcprbacinformers.ClusterRoleBindingClusterInformer, | ||
clusterRoleInformer kcprbacinformers.ClusterRoleClusterInformer, | ||
) labelclusterrolebindings.Controller { | ||
return labelclusterrolebindings.NewController( | ||
ControllerName, | ||
workload.GroupName, | ||
replicateclusterrole.HasSyncRule, | ||
func(clusterName logicalcluster.Name, crb *rbacv1.ClusterRoleBinding) bool { return false }, | ||
kubeClusterClient, | ||
clusterRoleBindingInformer, | ||
clusterRoleInformer, | ||
) | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
/* | ||
Copyright 2023 The KCP Authors. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package replicatelogicalcluster | ||
|
||
import ( | ||
"fmt" | ||
|
||
kcpcache "github.com/kcp-dev/apimachinery/v2/pkg/cache" | ||
"github.com/kcp-dev/logicalcluster/v3" | ||
|
||
apierrors "k8s.io/apimachinery/pkg/api/errors" | ||
"k8s.io/apimachinery/pkg/util/runtime" | ||
"k8s.io/client-go/tools/cache" | ||
|
||
"github.com/kcp-dev/kcp/pkg/reconciler/cache/labellogicalcluster" | ||
"github.com/kcp-dev/kcp/pkg/reconciler/cache/replication" | ||
corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" | ||
"github.com/kcp-dev/kcp/sdk/apis/workload" | ||
workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" | ||
kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" | ||
corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" | ||
workloadv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/workload/v1alpha1" | ||
) | ||
|
||
const ( | ||
ControllerName = "kcp-workload-replicate-logicalcluster" | ||
) | ||
|
||
// NewController returns a new controller for labelling LogicalClusters that should be replicated. | ||
|
||
func NewController( | ||
kcpClusterClient kcpclientset.ClusterInterface, | ||
logicalClusterInformer corev1alpha1informers.LogicalClusterClusterInformer, | ||
syncTargetInformer workloadv1alpha1informers.SyncTargetClusterInformer, | ||
) labellogicalcluster.Controller { | ||
logicalClusterLister := logicalClusterInformer.Lister() | ||
syncTargetIndexer := syncTargetInformer.Informer().GetIndexer() | ||
|
||
c := labellogicalcluster.NewController( | ||
ControllerName, | ||
workload.GroupName, | ||
func(cluster *corev1alpha1.LogicalCluster) bool { | ||
// If there are any SyncTargets for this logical cluster, then the LogicalCluster object should be replicated. | ||
keys, err := syncTargetIndexer.IndexKeys(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(logicalcluster.From(cluster))) | ||
if err != nil { | ||
runtime.HandleError(fmt.Errorf("failed to list SyncTargets: %v", err)) | ||
return false | ||
} | ||
return len(keys) > 0 | ||
}, | ||
kcpClusterClient, | ||
logicalClusterInformer, | ||
) | ||
|
||
// enqueue the logical cluster every time the APIExport changes | ||
enqueueSyncTarget := func(obj interface{}) { | ||
if tombstone, ok := obj.(cache.DeletedFinalStateUnknown); ok { | ||
obj = tombstone.Obj | ||
} | ||
|
||
syncTarget, ok := obj.(*workloadv1alpha1.SyncTarget) | ||
if !ok { | ||
runtime.HandleError(fmt.Errorf("unexpected object type: %T", obj)) | ||
return | ||
} | ||
|
||
cluster, err := logicalClusterLister.Cluster(logicalcluster.From(syncTarget)).Get(corev1alpha1.LogicalClusterName) | ||
if err != nil && !apierrors.IsNotFound(err) { | ||
runtime.HandleError(fmt.Errorf("failed to get logical cluster: %v", err)) | ||
return | ||
} else if apierrors.IsNotFound(err) { | ||
return | ||
} | ||
|
||
c.EnqueueLogicalCluster(cluster, "reason", "SyncTarget changed", "synctarget", syncTarget.Name) | ||
} | ||
|
||
syncTargetInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ | ||
FilterFunc: replication.IsNoSystemClusterName, | ||
Handler: cache.ResourceEventHandlerFuncs{ | ||
AddFunc: func(obj interface{}) { | ||
enqueueSyncTarget(obj) | ||
}, | ||
DeleteFunc: func(obj interface{}) { | ||
enqueueSyncTarget(obj) | ||
}, | ||
}, | ||
}) | ||
|
||
return c | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shouldn't we match on
APIGroups: []string{"workload.kcp.io"}
only?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, in fact I came back to what @sttts had done for APIExports (quite similar use-case): https://github.com/kcp-dev/kcp/blob/main/pkg/reconciler/apis/replicateclusterrole/replicateclusterrole_controller.go#L58
That mainly covers all the CRs that would allow the
sync
verb forsynctargets
resources