github/k3k
1
0
Fork 0
mirror of https://github.com/rancher/k3k.git synced 2026-08-22 05:46:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added provider.cattle.io=k3k label to Clusters (#901)

Browse Source 
* added provider k3k label

* small change to check  build
This commit is contained in:
Enrico Candino
2026-06-12 16:12:38 +02:00
committed by GitHub
parent ff02eb5473
commit 651da42ef0
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.go
+1 -1
View File
@@ -86,7 +86,7 @@ func run(cmd *cobra.Command, args []string) error {
ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
defer stop()
logger.Info("Starting k3k - Version: " + buildinfo.Version)
logger.Info("Starting k3k - version: " + buildinfo.Version)
ctrlruntimelog.SetLogger(logger)
restConfig, err := clientcmd.BuildConfigFromFlags("", kubeconfig)
pkg/controller/cluster/cluster.go
+13 -1
View File
@@ -54,6 +54,9 @@ const (
SyncSourceLabelKey = "k3k.io/sync-source"
SyncSourceHostLabel = "host"
ProviderLabelKey = "provider.cattle.io"
ProviderLabelValue = "k3k"
defaultVirtualClusterCIDR = "10.52.0.0/16"
defaultVirtualServiceCIDR = "10.53.0.0/16"
defaultSharedClusterCIDR = "10.42.0.0/16"
@@ -303,7 +306,10 @@ func (c *ClusterReconciler) Reconcile(ctx context.Context, req reconcile.Request
}
// update Cluster if needed
if !equality.Semantic.DeepEqual(orig.Spec, cluster.Spec) {
needsSpecUpdate := !equality.Semantic.DeepEqual(orig.Spec, cluster.Spec)
needsLabelsUpdate := !equality.Semantic.DeepEqual(orig.Labels, cluster.Labels)
if needsSpecUpdate || needsLabelsUpdate {
log.Info("Updating Cluster")
if err := c.Client.Update(ctx, &cluster); err != nil {
@@ -324,6 +330,12 @@ func (c *ClusterReconciler) reconcileCluster(ctx context.Context, cluster *v1bet
func (c *ClusterReconciler) reconcile(ctx context.Context, cluster *v1beta1.Cluster) error {
log := ctrl.LoggerFrom(ctx)
if cluster.Labels == nil {
cluster.Labels = map[string]string{}
}
cluster.Labels[ProviderLabelKey] = ProviderLabelValue
var ns corev1.Namespace
if err := c.Client.Get(ctx, client.ObjectKey{Name: cluster.Namespace}, &ns); err != nil {
return err
tests/e2e/cluster_create_test.go
+18 -1
View File
@@ -3,6 +3,8 @@ package k3k_test
import (
"time"
"sigs.k8s.io/controller-runtime/pkg/client"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
fwk3k "github.com/rancher/k3k/tests/framework/k3k"
@@ -34,7 +36,9 @@ var _ = When("creating a shared mode cluster", Label(e2eTestLabel), Label(slowTe
It("creates nodes with the worker role", func() {
Eventually(func(g Gomega) {
nodes, err := virtualCluster.Client.CoreV1().Nodes().List(GinkgoT().Context(), metav1.ListOptions{})
ctx := GinkgoT().Context()
nodes, err := virtualCluster.Client.CoreV1().Nodes().List(ctx, metav1.ListOptions{})
g.Expect(err).To(Not(HaveOccurred()))
g.Expect(nodes.Items).To(HaveLen(1))
g.Expect(nodes.Items[0].Labels).To(HaveKeyWithValue("node-role.kubernetes.io/worker", "true"))
@@ -43,4 +47,17 @@ var _ = When("creating a shared mode cluster", Label(e2eTestLabel), Label(slowTe
WithPolling(time.Second).
Should(Succeed())
})
It("has the provider.cattle.io label set to k3k", func() {
Eventually(func(g Gomega) {
ctx := GinkgoT().Context()
key := client.ObjectKeyFromObject(virtualCluster.Cluster)
g.Expect(k8sClient.Get(ctx, key, virtualCluster.Cluster)).To(Succeed())
g.Expect(virtualCluster.Cluster.Labels).To(HaveKeyWithValue("provider.cattle.io", "k3k"))
}).
WithTimeout(time.Minute).
WithPolling(time.Second).
Should(Succeed())
})
})