multicluster: support inject / recover on remote cluster (chaos-mesh#…

…3453) * add remotecluster type Signed-off-by: YangKeao <[email protected]> * add the infrastructure to operate multiple clusters Signed-off-by: YangKeao <[email protected]> * remove clientset Signed-off-by: YangKeao <[email protected]> * modify changelog Signed-off-by: YangKeao <[email protected]> * add license to the remote-cluster.yaml Signed-off-by: YangKeao <[email protected]> * fix Wrapf arguments Signed-off-by: YangKeao <[email protected]> * make check Signed-off-by: YangKeao <[email protected]> * make the lock private Signed-off-by: YangKeao <[email protected]> * chore: helm chart integration and basic interface Signed-off-by: STRRL <[email protected]> * apply remote chaos Signed-off-by: FingerLeader <[email protected]> * chore: complete the implementation of ReleaseService Signed-off-by: STRRL <[email protected]> * chore: update changelog Signed-off-by: STRRL <[email protected]> * install chaos mesh Signed-off-by: YangKeao <[email protected]> * add CHANGELOG Signed-off-by: YangKeao <[email protected]> * inject successfully Signed-off-by: YangKeao <[email protected]> * clear finalizer successfully Signed-off-by: YangKeao <[email protected]> * add more logs Signed-off-by: YangKeao <[email protected]> * chore: helm chart integration and basic interface Signed-off-by: STRRL <[email protected]> * chore: complete the implementation of ReleaseService Signed-off-by: STRRL <[email protected]> * chore: update changelog Signed-off-by: STRRL <[email protected]> * chore: fix make check Signed-off-by: STRRL <[email protected]> * chore: update lincense checker config file Signed-off-by: STRRL <[email protected]> * test: mark examples of helm as integration test Signed-off-by: STRRL <[email protected]> * add condition initialization for remote cluster Signed-off-by: YangKeao <[email protected]> * upgrade chaosmesh release version to 2.4.1 Signed-off-by: YangKeao <[email protected]> * upgrade chaosmesh release version to 2.4.1 Signed-off-by: YangKeao <[email protected]> * upgrade chaosmesh release version to 2.4.1 Signed-off-by: YangKeao <[email protected]> * fix CI Signed-off-by: cwen0 <[email protected]> * fix revive checks Signed-off-by: cwen0 <[email protected]> * Run make check to format code Signed-off-by: cwen0 <[email protected]> * fix comment controller Signed-off-by: cwen0 <[email protected]> * update changelog Signed-off-by: cwen0 <[email protected]> Signed-off-by: YangKeao <[email protected]> Signed-off-by: STRRL <[email protected]> Signed-off-by: FingerLeader <[email protected]> Signed-off-by: cwen0 <[email protected]> Co-authored-by: STRRL <[email protected]> Co-authored-by: FingerLeader <[email protected]> Co-authored-by: cwen0 <[email protected]>
FingerLeader · Nov 20, 2022 · ecbaf49 · ecbaf49
1 parent e26351d
commit ecbaf49
Show file tree

Hide file tree

Showing 68 changed files with 3,219 additions and 4 deletions.
diff --git a/.github/workflows/upload_image.yml b/.github/workflows/upload_image.yml
@@ -182,7 +182,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.18"
+          go-version: "1.19.3"
 
       - name: Install bom
         run: go install sigs.k8s.io/bom/cmd/bom@latest

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ For more information and how-to, see [RFC: Keep A Changelog](https://github.com/
 - Add features about integration with helm to install Chaos Mesh in remote cluster [#3384](https://github.com/chaos-mesh/chaos-mesh/pull/3384)
 - Add new CI "Manually Sign Container Images" to sign existing container images [#3708](https://github.com/chaos-mesh/chaos-mesh/pull/3708)
 - Install and uninstall chaos mesh in remote cluster through `RemoteCluster` resource [#3414](https://github.com/chaos-mesh/chaos-mesh/pull/3414)
+- MultiCluster: support inject / recover on remote cluster [#3453](https://github.com/chaos-mesh/chaos-mesh/pull/3453)
 
 ### Changed
 

diff --git a/api/v1alpha1/awschaos_types.go b/api/v1alpha1/awschaos_types.go
@@ -68,6 +68,10 @@ type AWSChaosSpec struct {
 	SecretName *string `json:"secretName,omitempty" webhook:",nilable"`
 
 	AWSSelector `json:",inline"`
+
+	// RemoteCluster represents the remote cluster where the chaos will be deployed
+	// +optional
+	RemoteCluster string `json:"remoteCluster,omitempty"`
 }
 
 // AWSChaosStatus represents the status of an AWSChaos

diff --git a/api/v1alpha1/azurechaos_types.go b/api/v1alpha1/azurechaos_types.go
@@ -94,6 +94,10 @@ type AzureSelector struct {
 	// SecretName defines the name of kubernetes secret. It is used for Azure credentials.
 	// +optional
 	SecretName *string `json:"secretName,omitempty"`
+
+	// RemoteCluster represents the remote cluster where the chaos will be deployed
+	// +optional
+	RemoteCluster string `json:"remoteCluster,omitempty"`
 }
 
 func (obj *AzureChaos) GetSelectorSpecs() map[string]interface{} {

diff --git a/api/v1alpha1/blockchaos_types.go b/api/v1alpha1/blockchaos_types.go
@@ -53,6 +53,10 @@ type BlockChaosSpec struct {
 	// Duration represents the duration of the chaos action.
 	// +optional
 	Duration *string `json:"duration,omitempty" webhook:"Duration"`
+
+	// RemoteCluster represents the remote cluster where the chaos will be deployed
+	// +optional
+	RemoteCluster string `json:"remoteCluster,omitempty"`
 }
 
 // BlockDelaySpec describes the block delay specification

diff --git a/api/v1alpha1/common_types.go b/api/v1alpha1/common_types.go
@@ -177,3 +177,9 @@ type WebhookObject interface {
 	webhook.Validator
 	webhook.Defaulter
 }
+
+// +kubebuilder:object:generate=false
+type RemoteObject interface {
+	StatefulObject
+	GetRemoteCluster() string
+}
diff --git a/api/v1alpha1/dnschaos_type.go b/api/v1alpha1/dnschaos_type.go
@@ -79,6 +79,10 @@ type DNSChaosSpec struct {
 	// 		will take effect on "google.com", "github.com" and "chaos-mesh.org"
 	// +optional
 	DomainNamePatterns []string `json:"patterns,omitempty"`
+
+	// RemoteCluster represents the remote cluster where the chaos will be deployed
+	// +optional
+	RemoteCluster string `json:"remoteCluster,omitempty"`
 }
 
 // DNSChaosStatus defines the observed state of DNSChaos

diff --git a/api/v1alpha1/gcpchaos_types.go b/api/v1alpha1/gcpchaos_types.go
@@ -69,6 +69,10 @@ type GCPChaosSpec struct {
 	SecretName *string `json:"secretName,omitempty"`
 
 	GCPSelector `json:",inline"`
+
+	// RemoteCluster represents the remote cluster where the chaos will be deployed
+	// +optional
+	RemoteCluster string `json:"remoteCluster,omitempty"`
 }
 
 type GCPSelector struct {

diff --git a/api/v1alpha1/httpchaos_types.go b/api/v1alpha1/httpchaos_types.go
@@ -73,6 +73,10 @@ type HTTPChaosSpec struct {
 	// Duration represents the duration of the chaos action.
 	// +optional
 	Duration *string `json:"duration,omitempty" webhook:"Duration"`
+
+	// RemoteCluster represents the remote cluster where the chaos will be deployed
+	// +optional
+	RemoteCluster string `json:"remoteCluster,omitempty"`
 }
 
 type HTTPChaosStatus struct {

diff --git a/api/v1alpha1/iochaos_types.go b/api/v1alpha1/iochaos_types.go
@@ -100,6 +100,10 @@ type IOChaosSpec struct {
 	// Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
 	// +optional
 	Duration *string `json:"duration,omitempty" webhook:"Duration"`
+
+	// RemoteCluster represents the remote cluster where the chaos will be deployed
+	// +optional
+	RemoteCluster string `json:"remoteCluster,omitempty"`
 }
 
 // IOChaosStatus defines the observed state of IOChaos

diff --git a/api/v1alpha1/jvmchaos_types.go b/api/v1alpha1/jvmchaos_types.go
@@ -35,6 +35,10 @@ type JVMChaosSpec struct {
 	// JVMParameter represents the detail about jvm chaos action definition
 	// +optional
 	JVMParameter `json:",inline"`
+
+	// RemoteCluster represents the remote cluster where the chaos will be deployed
+	// +optional
+	RemoteCluster string `json:"remoteCluster,omitempty"`
 }
 
 // JVMChaosAction represents the chaos action about jvm

diff --git a/api/v1alpha1/kernelchaos_types.go b/api/v1alpha1/kernelchaos_types.go
@@ -48,6 +48,10 @@ type KernelChaosSpec struct {
 
 	// Duration represents the duration of the chaos action
 	Duration *string `json:"duration,omitempty" webhook:"Duration"`
+
+	// RemoteCluster represents the remote cluster where the chaos will be deployed
+	// +optional
+	RemoteCluster string `json:"remoteCluster,omitempty"`
 }
 
 // FailKernRequest defines the injection conditions

diff --git a/api/v1alpha1/networkchaos_types.go b/api/v1alpha1/networkchaos_types.go
@@ -124,6 +124,10 @@ type NetworkChaosSpec struct {
 	// ExternalTargets represents network targets outside k8s
 	// +optional
 	ExternalTargets []string `json:"externalTargets,omitempty"`
+
+	// RemoteCluster represents the remote cluster where the chaos will be deployed
+	// +optional
+	RemoteCluster string `json:"remoteCluster,omitempty"`
 }
 
 // NetworkChaosStatus defines the observed state of NetworkChaos

diff --git a/api/v1alpha1/physical_machine_chaos_types.go b/api/v1alpha1/physical_machine_chaos_types.go
@@ -99,6 +99,10 @@ type PhysicalMachineChaosSpec struct {
 	// Duration represents the duration of the chaos action
 	// +optional
 	Duration *string `json:"duration,omitempty" webhook:"Duration"`
+
+	// RemoteCluster represents the remote cluster where the chaos will be deployed
+	// +optional
+	RemoteCluster string `json:"remoteCluster,omitempty"`
 }
 
 // PhysicalMachineChaosStatus defines the observed state of PhysicalMachineChaos

diff --git a/api/v1alpha1/podchaos_types.go b/api/v1alpha1/podchaos_types.go
@@ -76,6 +76,10 @@ type PodChaosSpec struct {
 	// +optional
 	// +kubebuilder:validation:Minimum=0
 	GracePeriod int64 `json:"gracePeriod,omitempty"`
+
+	// RemoteCluster represents the remote cluster where the chaos will be deployed
+	// +optional
+	RemoteCluster string `json:"remoteCluster,omitempty"`
 }
 
 // PodChaosStatus represents the current status of the chaos experiment about pods.

diff --git a/api/v1alpha1/stresschaos_types.go b/api/v1alpha1/stresschaos_types.go
@@ -66,6 +66,10 @@ type StressChaosSpec struct {
 	// Duration represents the duration of the chaos action
 	// +optional
 	Duration *string `json:"duration,omitempty" webhook:"Duration"`
+
+	// RemoteCluster represents the remote cluster where the chaos will be deployed
+	// +optional
+	RemoteCluster string `json:"remoteCluster,omitempty"`
 }
 
 // StressChaosStatus defines the observed state of StressChaos

diff --git a/api/v1alpha1/timechaos_types.go b/api/v1alpha1/timechaos_types.go
@@ -56,6 +56,10 @@ type TimeChaosSpec struct {
 
 	// Duration represents the duration of the chaos action
 	Duration *string `json:"duration,omitempty"`
+
+	// RemoteCluster represents the remote cluster where the chaos will be deployed
+	// +optional
+	RemoteCluster string `json:"remoteCluster,omitempty"`
 }
 
 // TimeChaosStatus defines the observed state of TimeChaos

diff --git a/api/v1alpha1/zz_generated.chaosmesh.go b/api/v1alpha1/zz_generated.chaosmesh.go
diff --git a/cmd/chaos-builder/impl.go b/cmd/chaos-builder/impl.go
@@ -78,6 +78,11 @@ func (in *{{.Type}}) GetStatus() *ChaosStatus {
 	return &in.Status.ChaosStatus
 }
 
+// GetRemoteCluster returns the remoteCluster
+func (in *{{.Type}}) GetRemoteCluster() string {
+	return in.Spec.RemoteCluster
+}
+
 // GetSpecAndMetaString returns a string including the meta and spec field of this chaos object.
 func (in *{{.Type}}) GetSpecAndMetaString() (string, error) {
 	spec, err := json.Marshal(in.Spec)

diff --git a/config/crd/bases/chaos-mesh.org_awschaos.yaml b/config/crd/bases/chaos-mesh.org_awschaos.yaml
@@ -68,6 +68,10 @@ spec:
                 description: Endpoint indicates the endpoint of the aws server. Just
                   used it in test now.
                 type: string
+              remoteCluster:
+                description: RemoteCluster represents the remote cluster where the
+                  chaos will be deployed
+                type: string
               secretName:
                 description: SecretName defines the name of kubernetes secret.
                 type: string

diff --git a/config/crd/bases/chaos-mesh.org_azurechaos.yaml b/config/crd/bases/chaos-mesh.org_azurechaos.yaml
@@ -62,6 +62,10 @@ spec:
                 description: LUN indicates the Logical Unit Number of the data disk.
                   Needed in disk-detach.
                 type: integer
+              remoteCluster:
+                description: RemoteCluster represents the remote cluster where the
+                  chaos will be deployed
+                type: string
               resourceGroupName:
                 description: ResourceGroupName defines the name of ResourceGroup
                 type: string

diff --git a/config/crd/bases/chaos-mesh.org_blockchaos.yaml b/config/crd/bases/chaos-mesh.org_blockchaos.yaml
@@ -80,6 +80,10 @@ spec:
                 - fixed-percent
                 - random-max-percent
                 type: string
+              remoteCluster:
+                description: RemoteCluster represents the remote cluster where the
+                  chaos will be deployed
+                type: string
               selector:
                 description: Selector is used to select pods that are used to inject
                   chaos action.