public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-07-29 00:19:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to new CRDs

Browse Source 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
Brad Davidson
2025-07-04 01:52:23 +00:00
committed by Brad Davidson
parent 338b9cc923
commit 7ab7865530
5 changed files with 30 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/crd/crds.go
View File

@@ -1,24 +0,0 @@
package crd
import (
v1 "github.com/k3s-io/api/k3s.cattle.io/v1"
"github.com/rancher/wrangler/v3/pkg/crd"
)
func List() []crd.CRD {
addon := v1.Addon{}
etcdSnapshotFile := v1.ETCDSnapshotFile{}
return []crd.CRD{
crd.NamespacedType("Addon.k3s.cattle.io/v1").
WithSchemaFromStruct(addon).
WithColumn("Source", ".spec.source").
WithColumn("Checksum", ".spec.checksum"),
crd.NonNamespacedType("ETCDSnapshotFile.k3s.cattle.io/v1").
WithSchemaFromStruct(etcdSnapshotFile).
WithColumn("SnapshotName", ".spec.snapshotName").
WithColumn("Node", ".spec.nodeName").
WithColumn("Location", ".spec.location").
WithColumn("Size", ".status.size").
WithColumn("CreationTime", ".status.creationTime"),
}
}

37
pkg/server/context.go
View File

@@ -2,11 +2,12 @@ package server
import (
"context"
"time"
k3scrds "github.com/k3s-io/api/pkg/crds"
"github.com/k3s-io/api/pkg/generated/controllers/k3s.cattle.io"
helmcrd "github.com/k3s-io/helm-controller/pkg/crd"
helmcrds "github.com/k3s-io/helm-controller/pkg/crds"
"github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io"
addoncrd "github.com/k3s-io/k3s/pkg/crd"
"github.com/k3s-io/k3s/pkg/util"
"github.com/k3s-io/k3s/pkg/version"
pkgerrors "github.com/pkg/errors"
@@ -17,6 +18,8 @@ import (
"github.com/rancher/wrangler/v3/pkg/generated/controllers/discovery"
"github.com/rancher/wrangler/v3/pkg/generated/controllers/rbac"
"github.com/rancher/wrangler/v3/pkg/start"
apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
@@ -76,21 +79,27 @@ func NewContext(ctx context.Context, config *Config, forServer bool) (*Context,
}, nil
}
type crdLister func() ([]*apiextv1.CustomResourceDefinition, error)
func registerCrds(ctx context.Context, config *Config, restConfig *rest.Config) error {
factory, err := crd.NewFactoryFromClient(restConfig)
listers := []crdLister{k3scrds.List}
if !config.ControlConfig.DisableHelmController {
listers = append(listers, helmcrds.List)
}
crds := []*apiextv1.CustomResourceDefinition{}
for _, list := range listers {
l, err := list()
if err != nil {
return err
}
crds = append(crds, l...)
}
client, err := clientset.NewForConfig(restConfig)
if err != nil {
return err
}
factory.BatchCreateCRDs(ctx, crds(config)...)
return factory.BatchWait()
}
func crds(config *Config) []crd.CRD {
defaultCrds := addoncrd.List()
if !config.ControlConfig.DisableHelmController {
defaultCrds = append(defaultCrds, helmcrd.List()...)
}
return defaultCrds
return crd.BatchCreateCRDs(ctx, client.ApiextensionsV1().CustomResourceDefinitions(), nil, time.Minute, crds)
}