Optimize chaosblade resource state flow in k8s experiments

Makefile

@@ -11,6 +11,9 @@ UNAME := $(shell uname)
 ifeq ($(BLADE_VERSION), )
 	BLADE_VERSION=0.6.0
 endif
+ifeq ($(BLADE_VENDOR), )
+	BLADE_VENDOR=community
+endif
 
 BUILD_TARGET=target
 BUILD_TARGET_DIR_NAME=chaosblade-$(BLADE_VERSION)
@@ -24,8 +27,12 @@ BUILD_TARGET_CACHE=$(BUILD_TARGET)/cache
 OS_YAML_FILE_NAME=chaosblade-k8s-spec-$(BLADE_VERSION).yaml
 OS_YAML_FILE_PATH=$(BUILD_TARGET_BIN)/$(OS_YAML_FILE_NAME)
 
+VERSION_PKG=github.com/chaosblade-io/chaosblade-operator/version
+GO_X_FLAGS=-X $(VERSION_PKG).Ver=$(BLADE_VERSION) -X $(VERSION_PKG).Vendor=$(BLADE_VENDOR)
+GO_FLAGS=-ldflags="$(GO_X_FLAGS)"
+
 ifeq ($(GOOS), linux)
-	GO_FLAGS=-ldflags="-linkmode external -extldflags -static"
+	GO_FLAGS=-ldflags="-linkmode external -extldflags -static $(GO_X_FLAGS)"
 endif
 
 build: pre_build build_yaml build_fuse 

deploy/helm/chaosblade-operator/Chart.yaml → deploy/helm/chaosblade-operator-for-v2/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
-appVersion: "0.5.1"
+appVersion: "0.6.0"
 description: ChaosBlade Operator
 name: chaosblade-operator
-version: 0.5.1
+version: 0.6.0
 home: https://github.com/chaosblade-io

deploy/helm/chaosblade-operator-for-v2/templates/deployment.yaml

@@ -0,0 +1,45 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: chaosblade-operator
+  namespace: {{ .Release.Namespace }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      name: chaosblade-operator
+  template:
+    metadata:
+      labels:
+        name: chaosblade-operator
+        part-of: chaosblade
+    spec:
+      serviceAccountName: chaosblade
+      containers:
+        - name: chaosblade-operator
+          image: {{ .Values.operator.repository }}:{{ .Values.operator.version }}
+          command: ["chaosblade-operator"]
+          args:
+          {{- if .Values.env.zapLevel }}
+          - '--zap-level={{ .Values.env.zapLevel }}'
+          {{- end }}
+          {{- if .Values.blade.version }}
+          - '--blade-version={{ .Values.blade.version }}'
+          {{- end }}
+          {{- if .Values.blade.repository }}
+          - '--image-repo={{ .Values.blade.repository }}'
+          {{- end }}
+          {{- if .Values.blade.pullPolicy }}
+          - '--pull-policy={{ .Values.blade.pullPolicy }}'
+          {{- end }}
+          - '--namespace={{ .Release.Namespace }}'
+          imagePullPolicy: {{ .Values.operator.pullPolicy }}
+          env:
+            - name: WATCH_NAMESPACE
+              value: ""
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: OPERATOR_NAME
+              value: "chaosblade-operator"

deploy/helm/chaosblade-operator/values.yaml → deploy/helm/chaosblade-operator-for-v2/values.yaml

@@ -13,14 +13,14 @@ rbac:
 # chaosblade-operator
 operator:
   repository: "registry.cn-hangzhou.aliyuncs.com/chaosblade/chaosblade-operator"
-  version: 0.5.1
+  version: 0.6.0
   # image.pullPolicy: must be Always|IfNotPresent|Never
   pullPolicy: IfNotPresent
 
 # chaosblade-tool
 blade:
   repository: registry.cn-hangzhou.aliyuncs.com/chaosblade/chaosblade-tool
-  version: 0.5.0
+  version: 0.6.0
   # image.pullPolicy: must be Always|IfNotPresent|Never
   pullPolicy: IfNotPresent
 

deploy/helm/chaosblade-operator-for-v3/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
-appVersion: "0.5.1"
+appVersion: "0.6.0"
 description: ChaosBlade Operator
 name: chaosblade-operator
-version: 0.5.1
+version: 0.6.0
 home: https://github.com/chaosblade-io

deploy/helm/chaosblade-operator-for-v3/templates/crds/crd.yaml → deploy/helm/chaosblade-operator-for-v3/crds/crd.yaml

@@ -2,8 +2,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: chaosblades.chaosblade.io
-  annotations:
-    helm.sh/hook-delete-policy: before-hook-creation
 spec:
   group: chaosblade.io
   names:
@@ -60,8 +58,8 @@ spec:
                             type: string
                           type: array
                       required:
-                      - name
-                      - value
+                        - name
+                        - value
                       type: object
                     type: array
                   scope:
@@ -72,13 +70,13 @@ spec:
                     description: Target is the experiment target, such as cpu, network
                     type: string
                 required:
-                - scope
-                - target
-                - action
+                  - scope
+                  - target
+                  - action
                 type: object
               type: array
           required:
-          - experiments
+            - experiments
           type: object
         status:
           properties:
@@ -121,9 +119,9 @@ spec:
                           description: resource uid
                           type: string
                       required:
-                      - state
-                      - kind
-                      - success
+                        - state
+                        - kind
+                        - success
                       type: object
                     type: array
                   scope:
@@ -138,22 +136,22 @@ spec:
                   target:
                     type: string
                 required:
-                - scope
-                - target
-                - action
-                - success
-                - state
+                  - scope
+                  - target
+                  - action
+                  - success
+                  - state
                 type: object
               type: array
             phase:
               description: Phase indicates the state of the experiment   Initial ->
                 Running -> Updating -> Destroying -> Destroyed
               type: string
           required:
-          - expStatuses
+            - expStatuses
           type: object
   version: v1alpha1
   versions:
-  - name: v1alpha1
-    served: true
-    storage: true
+    - name: v1alpha1
+      served: true
+      storage: true

deploy/helm/chaosblade-operator-for-v3/templates/deployment.yaml

@@ -1,66 +1,3 @@
-apiVersion: extensions/v1beta1
-kind: DaemonSet
-metadata:
-  name: chaosblade-tool
-  namespace: {{ .Release.Namespace }}
-spec:
-  minReadySeconds: 5
-  selector:
-    matchLabels:
-      app: chaosblade-tool
-  template:
-    metadata:
-      labels:
-        app: chaosblade-tool
-        part-of: chaosblade
-      name: chaosblade-tool
-    spec:
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-              - matchExpressions:
-                  - key: type
-                    operator: NotIn
-                    values:
-                      - virtual-kubelet
-      containers:
-        - image: {{ .Values.blade.repository }}:{{ .Values.blade.version }}
-          imagePullPolicy: {{ .Values.blade.pullPolicy }}
-          name: chaosblade-tool
-          securityContext:
-            privileged: true
-          volumeMounts:
-            - mountPath: /var/run/docker.sock
-              name: docker-socket
-            - mountPath: /opt/chaosblade/chaosblade.dat
-              name: chaosblade-db-volume
-            - mountPath: /etc/hosts
-              name: hosts
-      dnsPolicy: ClusterFirstWithHostNet
-      hostNetwork: true
-      hostPID: true
-      restartPolicy: Always
-      schedulerName: default-scheduler
-      securityContext: {}
-      terminationGracePeriodSeconds: 30
-      tolerations:
-        - effect: NoSchedule
-          operator: Exists
-      volumes:
-        - hostPath:
-            path: /var/run/docker.sock
-          name: docker-socket
-        - hostPath:
-            path: /var/run/chaosblade.dat
-            type: FileOrCreate
-          name: chaosblade-db-volume
-        - hostPath:
-            path: /etc/hosts
-          name: hosts
-  updateStrategy:
-    type: RollingUpdate
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:

deploy/helm/chaosblade-operator-for-v3/values.yaml

@@ -13,14 +13,14 @@ rbac:
 # chaosblade-operator
 operator:
   repository: "registry.cn-hangzhou.aliyuncs.com/chaosblade/chaosblade-operator"
-  version: 0.5.1
+  version: 0.6.0
   # image.pullPolicy: must be Always|IfNotPresent|Never
   pullPolicy: IfNotPresent
 
 # chaosblade-tool
 blade:
   repository: registry.cn-hangzhou.aliyuncs.com/chaosblade/chaosblade-tool
-  version: 0.5.0
+  version: 0.6.0
   # image.pullPolicy: must be Always|IfNotPresent|Never
   pullPolicy: IfNotPresent
 

deploy/olm/Makefile

@@ -1,6 +1,6 @@
 .PHONY: build clean
 
-BLADE_VERSION=0.5.1
+BLADE_VERSION=0.6.0
 
 # Build [OLM](https://github.com/operator-framework/operator-lifecycle-manager)
 build: