change cache mode default hostpath

goodrain · Feb 28, 2021 · 39cab90 · 39cab90
1 parent 4e9ee1e
commit 39cab90
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/commit-ci-build.yml b/.github/workflows/commit-ci-build.yml
@@ -2,7 +2,7 @@ name: commit-ci-build
 
 on:
   push:
-    branches: [master, V5.3]
+    branches: [master]
 
 jobs:
   build:
@@ -31,6 +31,6 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: true
-          tags: registry.cn-hangzhou.aliyuncs.com/goodrain/rainbond-operator:v2.0.0
+          tags: registry.cn-hangzhou.aliyuncs.com/goodrain/rainbond-operator:v2.0.0-dev
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/release-ci-build.yml b/.github/workflows/release-ci-build.yml
@@ -2,7 +2,8 @@ name: release-ci-build
 
 on:
   release:
-    branches: [master, V5.3]
+    branches: [master]
+  workflow_dispatch:
 
 jobs:
   build:

diff --git a/controllers/handler/chaos.go b/controllers/handler/chaos.go
@@ -150,8 +150,9 @@ func (c *chaos) deployment() client.Object {
 		{
 			Name: "cache",
 			VolumeSource: corev1.VolumeSource{
-				PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{
-					ClaimName: constants.CachePVC,
+				HostPath: &corev1.HostPathVolumeSource{
+					Path: "/cache",
+					Type: k8sutil.HostPath(corev1.HostPathDirectoryOrCreate),
 				},
 			},
 		},
@@ -164,6 +165,7 @@ func (c *chaos) deployment() client.Object {
 		"--pvc-cache-name=" + constants.CachePVC,
 		"--rbd-namespace=" + c.component.Namespace,
 		"--rbd-repo=" + ResourceProxyName,
+		"--cache-mode=hostpath",
 	}
 
 	if c.etcdSecret != nil {
@@ -191,6 +193,14 @@ func (c *chaos) deployment() client.Object {
 				},
 			},
 		},
+		{
+			Name: "HOST_IP",
+			ValueFrom: &corev1.EnvVarSource{
+				FieldRef: &corev1.ObjectFieldSelector{
+					FieldPath: "spec.nodeName",
+				},
+			},
+		},
 		{
 			Name:  "SOURCE_DIR",
 			Value: "/cache/source",