From 7c0938ee3cd3d939791fac9bdf58bd2fabbac371 Mon Sep 17 00:00:00 2001 From: GreatLazyMan Date: Thu, 26 Oct 2023 15:09:54 +0800 Subject: [PATCH] title: create mcs releated crd Signed-off-by: GreatLazyMan --- hack/generate/generate.go | 36 ++- pkg/kosmosctl/install/install.go | 24 ++ pkg/kosmosctl/join/join.go | 38 ++- pkg/kosmosctl/manifest/manifest_crds.go | 296 ++++++++++++++++++++++++ 4 files changed, 391 insertions(+), 3 deletions(-) diff --git a/hack/generate/generate.go b/hack/generate/generate.go index 1e832344f..25c10ad23 100644 --- a/hack/generate/generate.go +++ b/hack/generate/generate.go @@ -28,8 +28,18 @@ func main() { fmt.Println("can not read file：", err) return } + serviceImportCRD, err := os.ReadFile(fmt.Sprintf("%s/deploy/crds/mcs/multicluster.x-k8s.io_serviceimports.yaml", projectpath.Root)) + if err != nil { + fmt.Println("can not read file：", err) + return + } + serviceExportCRD, err := os.ReadFile(fmt.Sprintf("%s/deploy/crds/mcs/multicluster.x-k8s.io_serviceexports.yaml", projectpath.Root)) + if err != nil { + fmt.Println("can not read file：", err) + return + } - filename := fmt.Sprintf("%s/pkg/clusterlinkctl/initmaster/ctlmaster/manifests_crd.go", projectpath.Root) + filename := fmt.Sprintf("%s/pkg/kosmosctl/manifest/manifest_crds.go", projectpath.Root) fset := token.NewFileSet() node, err := parser.ParseFile(fset, filename, nil, parser.ParseComments) if err != nil { @@ -73,6 +83,30 @@ func main() { return true }) + ast.Inspect(node, func(n ast.Node) bool { + if ident, ok := n.(*ast.Ident); ok && ident.Obj != nil && ident.Obj.Kind == ast.Con && ident.Obj.Name == "ServiceImport" { + valueSpec := ident.Obj.Decl.(*ast.ValueSpec) + valueSpec.Values[0] = &ast.BasicLit{ + Kind: token.STRING, + Value: fmt.Sprintf("`%s`", serviceImportCRD), + } + return false + } + return true + }) + + ast.Inspect(node, func(n ast.Node) bool { + if ident, ok := n.(*ast.Ident); ok && ident.Obj != nil && ident.Obj.Kind == ast.Con && ident.Obj.Name == "ServiceExport" { + valueSpec := ident.Obj.Decl.(*ast.ValueSpec) + valueSpec.Values[0] = &ast.BasicLit{ + Kind: token.STRING, + Value: fmt.Sprintf("`%s`", serviceExportCRD), + } + return false + } + return true + }) + var buf bytes.Buffer err = format.Node(&buf, fset, node) if err != nil { diff --git a/pkg/kosmosctl/install/install.go b/pkg/kosmosctl/install/install.go index 9d331f64f..cce8a50e8 100644 --- a/pkg/kosmosctl/install/install.go +++ b/pkg/kosmosctl/install/install.go @@ -342,6 +342,30 @@ func (o *CommandInstallOptions) runClustertree() error { } klog.Info("Create CRD " + clustertreeKnode.Name + " successful.") + serviceExport, err := util.GenerateCustomResourceDefinition(manifest.ServiceExport, nil) + if err != nil { + return err + } + _, err = o.ExtensionsClient.ApiextensionsV1().CustomResourceDefinitions().Create(context.Background(), serviceExport, metav1.CreateOptions{}) + if err != nil { + if !apierrors.IsAlreadyExists(err) { + return fmt.Errorf("kosmosctl install clustertree run error, crd options failed: %v", err) + } + } + klog.Info("Create CRD " + serviceExport.Name + " successful.") + + serviceImport, err := util.GenerateCustomResourceDefinition(manifest.ServiceImport, nil) + if err != nil { + return err + } + _, err = o.ExtensionsClient.ApiextensionsV1().CustomResourceDefinitions().Create(context.Background(), serviceImport, metav1.CreateOptions{}) + if err != nil { + if !apierrors.IsAlreadyExists(err) { + return fmt.Errorf("kosmosctl install clustertree run error, crd options failed: %v", err) + } + } + klog.Info("Create CRD " + serviceImport.Name + " successful.") + klog.Info("Start creating kosmos-clustertree ConfigMap...") clustertreeConfigMap := &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ diff --git a/pkg/kosmosctl/join/join.go b/pkg/kosmosctl/join/join.go index 02273ed27..c8896f871 100644 --- a/pkg/kosmosctl/join/join.go +++ b/pkg/kosmosctl/join/join.go @@ -9,6 +9,7 @@ import ( "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" + extensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -56,8 +57,9 @@ type CommandJoinOptions struct { UseProxy string WaitTime int - Client kubernetes.Interface - DynamicClient *dynamic.DynamicClient + Client kubernetes.Interface + DynamicClient *dynamic.DynamicClient + ExtensionsClient extensionsclient.Interface } // NewCmdJoin join resource to Kosmos control plane. @@ -133,6 +135,12 @@ func (o *CommandJoinOptions) Complete(f ctlutil.Factory) error { if err != nil { return fmt.Errorf("kosmosctl join complete error, generate basic client failed: %v", err) } + o.ExtensionsClient, err = extensionsclient.NewForConfig(clusterConfig) + if err != nil { + return fmt.Errorf("kosmosctl join complete error, generate extensions client failed: %v", err) + } + } else { + return fmt.Errorf("kosmosctl join complete error, arg ClusterKubeConfig is required") } return nil @@ -316,6 +324,32 @@ func (o *CommandJoinOptions) runKnode() error { return fmt.Errorf("kosmosctl join run error, create knode failed: %s", err) } klog.Info("Knode: " + obj.GetName() + " has been created.") + + klog.Info("Attempting to create kosmos mcs CRDs...") + serviceExport, err := util.GenerateCustomResourceDefinition(manifest.ServiceExport, nil) + if err != nil { + return err + } + _, err = o.ExtensionsClient.ApiextensionsV1().CustomResourceDefinitions().Create(context.Background(), serviceExport, metav1.CreateOptions{}) + if err != nil { + if !apierrors.IsAlreadyExists(err) { + return fmt.Errorf("kosmosctl join run error, crd options failed: %v", err) + } + } + klog.Info("Create CRD " + serviceExport.Name + " successful.") + + serviceImport, err := util.GenerateCustomResourceDefinition(manifest.ServiceImport, nil) + if err != nil { + return err + } + _, err = o.ExtensionsClient.ApiextensionsV1().CustomResourceDefinitions().Create(context.Background(), serviceImport, metav1.CreateOptions{}) + if err != nil { + if !apierrors.IsAlreadyExists(err) { + return fmt.Errorf("kosmosctl join run error, crd options failed: %v", err) + } + } + klog.Info("Create CRD " + serviceImport.Name + " successful.") + klog.Info("Knode [" + obj.GetName() + "] registration successful.") return nil diff --git a/pkg/kosmosctl/manifest/manifest_crds.go b/pkg/kosmosctl/manifest/manifest_crds.go index 6216a0f55..916d02c1a 100644 --- a/pkg/kosmosctl/manifest/manifest_crds.go +++ b/pkg/kosmosctl/manifest/manifest_crds.go @@ -471,6 +471,302 @@ spec: type: object served: true storage: true +` + ServiceImport = `# Copyright 2020 The Kubernetes 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. +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: serviceimports.multicluster.x-k8s.io +spec: + group: multicluster.x-k8s.io + scope: Namespaced + names: + plural: serviceimports + singular: serviceimport + kind: ServiceImport + shortNames: + - svcim + versions: + - name: v1alpha1 + served: true + storage: true + subresources: + status: {} + additionalPrinterColumns: + - name: Type + type: string + description: The type of this ServiceImport + jsonPath: .spec.type + - name: IP + type: string + description: The VIP for this ServiceImport + jsonPath: .spec.ips + - name: Age + type: date + jsonPath: .metadata.creationTimestamp + "schema": + "openAPIV3Schema": + description: ServiceImport describes a service imported from clusters in a + ClusterSet. + type: object + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: spec defines the behavior of a ServiceImport. + type: object + required: + - ports + - type + properties: + ips: + description: ip will be used as the VIP for this service when type + is ClusterSetIP. + type: array + maxItems: 1 + items: + type: string + ports: + type: array + items: + description: ServicePort represents the port on which the service + is exposed + type: object + required: + - port + properties: + appProtocol: + description: The application protocol for this port. This field + follows standard Kubernetes label syntax. Un-prefixed names + are reserved for IANA standard service names (as per RFC-6335 + and http://www.iana.org/assignments/service-names). Non-standard + protocols should use prefixed names such as mycompany.com/my-custom-protocol. + Field can be enabled with ServiceAppProtocol feature gate. + type: string + name: + description: The name of this port within the service. This + must be a DNS_LABEL. All ports within a ServiceSpec must have + unique names. When considering the endpoints for a Service, + this must match the 'name' field in the EndpointPort. Optional + if only one ServicePort is defined on this service. + type: string + port: + description: The port that will be exposed by this service. + type: integer + format: int32 + protocol: + description: The IP protocol for this port. Supports "TCP", + "UDP", and "SCTP". Default is TCP. + type: string + x-kubernetes-list-type: atomic + sessionAffinity: + description: 'Supports "ClientIP" and "None". Used to maintain session + affinity. Enable client IP based session affinity. Must be ClientIP + or None. Defaults to None. Ignored when type is Headless More info: + https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies' + type: string + sessionAffinityConfig: + description: sessionAffinityConfig contains session affinity configuration. + type: object + properties: + clientIP: + description: clientIP contains the configurations of Client IP + based session affinity. + type: object + properties: + timeoutSeconds: + description: timeoutSeconds specifies the seconds of ClientIP + type session sticky time. The value must be >0 && <=86400(for + 1 day) if ServiceAffinity == "ClientIP". Default value is + 10800(for 3 hours). + type: integer + format: int32 + type: + description: type defines the type of this service. Must be ClusterSetIP + or Headless. + type: string + enum: + - ClusterSetIP + - Headless + status: + description: status contains information about the exported services that + form the multi-cluster service referenced by this ServiceImport. + type: object + properties: + clusters: + description: clusters is the list of exporting clusters from which + this service was derived. + type: array + items: + description: ClusterStatus contains service configuration mapped + to a specific source cluster + type: object + required: + - cluster + properties: + cluster: + description: cluster is the name of the exporting cluster. Must + be a valid RFC-1123 DNS label. + type: string + x-kubernetes-list-map-keys: + - cluster + x-kubernetes-list-type: map +` + ServiceExport = `# Copyright 2020 The Kubernetes 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. +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: serviceexports.multicluster.x-k8s.io +spec: + group: multicluster.x-k8s.io + scope: Namespaced + names: + plural: serviceexports + singular: serviceexport + kind: ServiceExport + shortNames: + - svcex + versions: + - name: v1alpha1 + served: true + storage: true + subresources: + status: {} + additionalPrinterColumns: + - name: Age + type: date + jsonPath: .metadata.creationTimestamp + "schema": + "openAPIV3Schema": + description: ServiceExport declares that the Service with the same name and + namespace as this export should be consumable from other clusters. + type: object + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + status: + description: status describes the current state of an exported service. + Service configuration comes from the Service that had the same name + and namespace as this ServiceExport. Populated by the multi-cluster + service implementation's controller. + type: object + properties: + conditions: + type: array + items: + description: "Condition contains details for one aspect of the current + state of this API Resource. --- This struct is intended for direct + use as an array at the field path .status.conditions. For example, + type FooStatus struct{ // Represents the observations of a + foo's current state. // Known .status.conditions.type are: + \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type + \ // +patchStrategy=merge // +listType=map // +listMapKey=type + \ Conditions []metav1.Condition //json:\"conditions,omitempty\" + patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\" + \n // other fields }" + type: object + required: + - lastTransitionTime + - message + - reason + - status + - type + properties: + lastTransitionTime: + description: lastTransitionTime is the last time the condition + transitioned from one status to another. This should be when + the underlying condition changed. If that is not known, then + using the time when the API field changed is acceptable. + type: string + format: date-time + message: + description: message is a human readable message indicating + details about the transition. This may be an empty string. + type: string + maxLength: 32768 + observedGeneration: + description: observedGeneration represents the .metadata.generation + that the condition was set based upon. For instance, if .metadata.generation + is currently 12, but the .status.conditions[x].observedGeneration + is 9, the condition is out of date with respect to the current + state of the instance. + type: integer + format: int64 + minimum: 0 + reason: + description: reason contains a programmatic identifier indicating + the reason for the condition's last transition. Producers + of specific condition types may define expected values and + meanings for this field, and whether the values are considered + a guaranteed API. The value should be a CamelCase string. + This field may not be empty. + type: string + maxLength: 1024 + minLength: 1 + pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ + status: + description: status of the condition, one of True, False, Unknown. + type: string + enum: + - "True" + - "False" + - Unknown + type: + description: type of condition in CamelCase or in foo.example.com/CamelCase. + --- Many .condition.type values are consistent across resources + like Available, but because arbitrary conditions can be useful + (see .node.status.conditions), the ability to deconflict is + important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + type: string + maxLength: 316 + pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ + x-kubernetes-list-map-keys: + - type + x-kubernetes-list-type: map ` )