Merge branch 'az-loss' into release-07-07-23

Author: rekfuki-f3

README.md

@@ -36,6 +36,59 @@ See the following demo video for a quick view of Chaos Mesh:
 
 [![Watch the video](./static/demo.gif)](https://www.youtube.com/watch?v=ifZEwdJO868)
 
+##  Form3-specific instructions
+
+### Build CRDs
+
+After changing/adding a go struct that corresponds to a [CRD structure](https://github.com/form3tech/chaos-mesh/blob/nv-gk-az-loss/api/v1alpha1/awsazchaos_types.go)
+
+Run 
+```sh
+make generate  && make yaml
+```
+This will create new CRDS for the new custom Chaos,  and update existing schedules and workflows accordingly to accomodate the new custom chaos.
+
+### Build docker images and helm charts
+
+In order to build new docker images and helm charts containing your custom CRD (and its controller code) 
+
+Run
+
+```sh
+make all
+# AWS_ACCOUNT_ID and region which hosts the ECR where you want to push the docker image to
+AWS_ACCOUNT_ID="AWS_ACCOUNT_ID_HERE"
+AWS_REGION="AWS_REGION_HERE"
+TAG="YOUR_BUILD_TAG_HERE"
+
+# `make all` creates docker images with the latest tag and point to ghcr repo. We need to tag them properly to prepare the push to AMAZON ECR
+docker tag ghcr.io/chaos-mesh/chaos-daemon:latest  $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/chaos-mesh/chaos-daemon:$TAG
+docker tag ghcr.io/chaos-mesh/chaos-dashboard:latest  $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/chaos-mesh/chaos-dashboard:$TAG
+docker tag ghcr.io/chaos-mesh/chaos-mesh:latest   $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/chaos-mesh/chaos-mesh:$TAG
+
+## Authenticate to the ECR docker repo using https://github.com/form3tech/docker-build-scripts/blob/master/scripts/docker-ecr-login.sh
+docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/chaos-mesh/chaos-daemon:$TAG
+docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/chaos-mesh/chaos-dashboard:$TAG
+docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/chaos-mesh/chaos-mesh:$TAG
+
+
+# package the helm charts
+cd helm
+helm package chaos-mesh --version $TAG --app-version $TAG 
+
+## Authenticate to the ECR helm repo 
+ECR_URL= $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com
+export HELM_EXPERIMENTAL_OCI=1;aws ecr get-login-password --region $(AWS_REGION) | \
+helm registry login --username AWS --password-stdin $(ECR_URL)
+
+# Push the chart
+helm push chaos-mesh-$TAG.tgz oci://$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/charts.tech.form3/
+```
+
+
+
+
+
 ## Chaos Operator
 
 Chaos Operator injects chaos into the applications and Kubernetes infrastructure in a manageable way, which provides easy, custom definitions for chaos experiments and automatic orchestration. There are three components at play:
@@ -160,4 +213,4 @@ Chaos Mesh is licensed under the Apache License, Version 2.0. See [LICENSE](./LI
 
 ## Trademark
 
-Chaos Mesh is a trademark of The Linux Foundation. All rights reserved.
+Chaos Mesh is a trademark of The Linux Foundation. All rights reserved.

api/v1alpha1/awsazchaos_types.go

@@ -0,0 +1,77 @@
+package v1alpha1
+
+import (
+	"encoding/json"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +kubebuilder:object:root=true
+// +kubebuilder:printcolumn:name="duration",type=string,JSONPath=`.spec.duration`
+// +chaos-mesh:experiment
+
+// AWSAzChaos is the Schema for the helloworldchaos API
+type AWSAzChaos struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   AWSAzChaosSpec   `json:"spec"`
+	Status AWSAzChaosStatus `json:"status,omitempty"`
+}
+
+var (
+	_ InnerObjectWithCustomStatus = (*AWSAzChaos)(nil)
+	_ InnerObjectWithSelector     = (*AWSAzChaos)(nil)
+	_ InnerObject                 = (*AWSAzChaos)(nil)
+)
+
+// AWSAzChaosSpec is the content of the specification for a AWSAzChaos
+type AWSAzChaosSpec struct {
+	// ContainerSelector specifies target
+	AWSAZSelector `json:",inline"`
+
+	// Duration represents the duration of the chaos action
+	// +optional
+	Duration *string `json:"duration,omitempty"`
+
+	// RemoteCluster represents the remote cluster where the chaos will be deployed
+	// +optional
+	RemoteCluster string `json:"remoteCluster,omitempty"`
+}
+
+// AWSAzChaosStatus represents the status of a HelloWorldChaos
+type AWSAzChaosStatus struct {
+	ChaosStatus `json:",inline"`
+	// SubnetToACL represents the connection between a subnet and its Network ACL
+	SubnetToACL map[string]string `json:"subnetToACL,omitempty"`
+}
+
+type AWSAZSelector struct {
+	// TODO: it would be better to split them into multiple different selector and implementation
+	// but to keep the minimal modification on current implementation, it hasn't been splited.
+
+	// AWSRegion defines the region of aws.
+	Stack string `json:"stack"`
+
+	// AvailabilityZone indicates the Availability zone to be taken down
+	AvailabilityZone string `json:"az"`
+}
+
+// GetSelectorSpecs is a getter for selectors
+func (obj *AWSAzChaos) GetSelectorSpecs() map[string]interface{} {
+	return map[string]interface{}{
+		".": &obj.Spec.AWSAZSelector,
+	}
+}
+
+func (obj *AWSAZSelector) Id() string {
+	// TODO: handle the error here
+	// or ignore it is enough ?
+	json, _ := json.Marshal(obj)
+
+	return string(json)
+}
+
+func (obj *AWSAzChaos) GetCustomStatus() interface{} {
+	return &obj.Status.SubnetToACL
+}

api/v1alpha1/awschaos_types.go

@@ -36,8 +36,10 @@ type AWSChaos struct {
 	Status AWSChaosStatus `json:"status,omitempty"`
 }
 
-var _ InnerObjectWithSelector = (*AWSChaos)(nil)
-var _ InnerObject = (*AWSChaos)(nil)
+var (
+	_ InnerObjectWithSelector = (*AWSChaos)(nil)
+	_ InnerObject             = (*AWSChaos)(nil)
+)
 
 // AWSChaosAction represents the chaos action about aws.
 type AWSChaosAction string