Skip to content

Commit

Permalink
feat: create apiextensions-apiserver resource with file (#1776)
Browse files Browse the repository at this point in the history
Co-authored-by: binqiniu <binqiniu@tencent.com>
  • Loading branch information
bqniu and binqiniu authored Feb 28, 2022
1 parent 60d3d54 commit 7dbb653
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 0 deletions.
14 changes: 14 additions & 0 deletions pkg/util/apiclient/idempotency.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import (
corev1 "k8s.io/api/core/v1"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
rbac "k8s.io/api/rbac/v1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
Expand All @@ -47,6 +48,7 @@ import (
kubeaggregatorclientset "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
utilsnet "k8s.io/utils/net"
controllerutils "tkestack.io/tke/pkg/controller"
aaclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
)

// PlatformLabel represents the type of platform.tkestack.io related label.
Expand Down Expand Up @@ -430,6 +432,18 @@ func CreateOrUpdateAPIService(ctx context.Context, client kubeaggregatorclientse
return nil
}


// CreateOrUpdateCustomResourceDefinition creates a CustomResourceDefinition if the target resource doesn't exist. If the resource exists already, this function will update the resource instead.
func CreateOrUpdateCustomResourceDefinition(ctx context.Context, client aaclientset.Interface, crd *apiextensionsv1.CustomResourceDefinition) error {
if _, err := client.ApiextensionsV1().CustomResourceDefinitions().Create(ctx, crd, metav1.CreateOptions{}); err != nil {
// Note: We don't run .Update here afterwards as that's probably not required
if !apierrors.IsAlreadyExists(err) {
return errors.Wrap(err, "unable to create apiservice")
}
}
return nil
}

// CreateOrUpdateConfigMapFromFile like kubectl apply configmap --from-file
func CreateOrUpdateConfigMapFromFile(ctx context.Context, client clientset.Interface, cm *corev1.ConfigMap, pattern string) error {
matches, err := filepath.Glob(pattern)
Expand Down
69 changes: 69 additions & 0 deletions pkg/util/apiclient/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ import (
apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
kubeaggregator "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
"tkestack.io/tke/pkg/util/template"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
aaclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
)

type object struct {
Expand All @@ -49,11 +51,13 @@ type object struct {
var (
handlers map[string]func(context.Context, kubernetes.Interface, []byte) error
kaHandlers map[string]func(context.Context, kubeaggregator.Interface, []byte) error
aaHandlers map[string]func(context.Context, aaclientset.Interface, []byte) error
)

func init() {
handlers = make(map[string]func(context.Context, kubernetes.Interface, []byte) error)
kaHandlers = make(map[string]func(context.Context, kubeaggregator.Interface, []byte) error)
aaHandlers = make(map[string]func(context.Context, aaclientset.Interface, []byte) error)

// apiregistration
kaHandlers["APIService"] = func(ctx context.Context, client kubeaggregator.Interface, data []byte) error {
Expand All @@ -68,6 +72,19 @@ func init() {
return nil
}

//add CustomResourceDefinition
aaHandlers["CustomResourceDefinition"] = func(ctx context.Context, client aaclientset.Interface, data []byte) error {
obj := new(apiextensionsv1.CustomResourceDefinition)
if err := kuberuntime.DecodeInto(clientsetscheme.Codecs.UniversalDecoder(), data, obj); err != nil {
return errors.Wrapf(err, "unable to decode %s", reflect.TypeOf(obj).String())
}
err := CreateOrUpdateCustomResourceDefinition(ctx, client, obj)
if err != nil {
return err
}
return nil
}

// core
handlers["ConfigMap"] = func(ctx context.Context, client kubernetes.Interface, data []byte) error {
obj := new(corev1.ConfigMap)
Expand Down Expand Up @@ -406,3 +423,55 @@ func CreateKAResourceWithFile(ctx context.Context, client kubernetes.Interface,

return nil
}



// CreateAsResourceWithFile create k8s and apiextensions-apiserver resource with file
func CreateAsResourceWithFile(ctx context.Context, client kubernetes.Interface, aaClient aaclientset.Interface, filename string, option interface{}) error {
var (
data []byte
err error
)
if option != nil {
data, err = template.ParseFile(filename, option)
} else {
data, err = ioutil.ReadFile(filename)
}
if err != nil {
return err
}

items := strings.Split(string(data), "\n---")
for _, item := range items {
objBytes := []byte(item)
obj := new(object)
err := yaml.Unmarshal(objBytes, obj)
if err != nil {
return err
}
if obj.Kind == "" {
continue
}
if obj.Kind == "CustomResourceDefinition" {
f, ok := aaHandlers[obj.Kind]
if !ok {
return errors.Errorf("unsupport kind %q", obj.Kind)
}
err = f(ctx, aaClient, objBytes)
if err != nil {
return err
}
} else {
f, ok := handlers[obj.Kind]
if !ok {
return errors.Errorf("unsupport kind %q", obj.Kind)
}
err = f(ctx, client, objBytes)
if err != nil {
return err
}
}
}

return nil
}

0 comments on commit 7dbb653

Please sign in to comment.