Remove the redundant and inconsistent configurations (#1323)

Signed-off-by: Tao He <linzhu.ht@alibaba-inc.com>
v6d-io · Apr 20, 2023 · fd83d42 · fd83d42
1 parent 1b00df4
commit fd83d42
Show file tree

Hide file tree

Showing 39 changed files with 384 additions and 486 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -1,5 +1,5 @@
 # only run for releases
-only_if: $CIRRUS_TAG == 'v*' && $CIRRUS_PR == ''
+only_if: $CIRRUS_TAG != ''
 
 macosx_arm64_wheel_task:
   macos_instance:

diff --git a/.github/workflows/vineyard-operator.yaml b/.github/workflows/vineyard-operator.yaml
@@ -139,8 +139,8 @@ jobs:
       - name: Upload latest docker image
         if: ${{ matrix.job == 'release' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && github.repository == 'v6d-io/v6d' }}
         run: |
-          make -C k8s docker-build-push-multi-arch REGISTRY=$REGISTRY VERSION=${{ steps.tag.outputs.TAG }}
-          make -C k8s docker-build-push-multi-arch REGISTRY=$REGISTRY VERSION=latest
+          make -C k8s docker-build-push-multi-arch REGISTRY=${{ env.REGISTRY }} VERSION=${{ steps.tag.outputs.TAG }}
+          make -C k8s docker-build-push-multi-arch REGISTRY=${{ env.REGISTRY }} VERSION=latest
 
       - name: Generate the python and vineyardd image for tests
         if: ${{ matrix.job != 'release' }}

diff --git a/charts/vineyard-operator/README.md b/charts/vineyard-operator/README.md
@@ -49,11 +49,10 @@ kind: Vineyardd
 metadata:
   name: vineyardd-sample
 spec:
-  image: vineyardcloudnative/vineyardd:latest
   replicas: 3
-  imagePullPolicy: IfNotPresent
-  etcd:
-    replicas: 3
+  vineyard:
+    image: vineyardcloudnative/vineyardd:latest
+    imagePullPolicy: IfNotPresent
 EOF
 ```
 

diff --git a/charts/vineyard-operator/templates/sidecar-crd.yaml b/charts/vineyard-operator/templates/sidecar-crd.yaml
@@ -46,7 +46,10 @@ spec:
             type: object
           spec:
             properties:
-              metricConfig:
+              etcdReplicas:
+                default: 3
+                type: integer
+              metric:
                 default:
                   enable: false
                   image: vineyardcloudnative/vineyard-grok-exporter:latest
@@ -71,23 +74,17 @@ spec:
               service:
                 default:
                   port: 9600
-                  selector: rpc.vineyardd.v6d.io/rpc=vineyard-rpc
                   type: ClusterIP
                 properties:
                   port:
                     default: 9600
                     type: integer
-                  selector:
-                    default: rpc.vineyardd.v6d.io/rpc=vineyard-rpc
-                    type: string
                   type:
                     default: ClusterIP
                     type: string
                 type: object
-              vineyardConfig:
+              vineyard:
                 default:
-                  etcdEndpoint: http://etcd-for-vineyard:2379
-                  etcdPrefix: /vineyard
                   image: vineyardcloudnative/vineyardd:latest
                   imagePullPolicy: IfNotPresent
                   size: 256Mi
@@ -159,12 +156,6 @@ spec:
                       - name
                       type: object
                     type: array
-                  etcdEndpoint:
-                    default: http://etcd-for-vineyard:2379
-                    type: string
-                  etcdPrefix:
-                    default: /vineyard
-                    type: string
                   image:
                     default: vineyardcloudnative/vineyardd:latest
                     type: string
@@ -177,7 +168,7 @@ spec:
                   socket:
                     default: /var/run/vineyard-kubernetes/{{.Namespace}}/{{.Name}}
                     type: string
-                  spillConfig:
+                  spill:
                     properties:
                       name:
                         default: ""

diff --git a/charts/vineyard-operator/templates/vineyardd-crd.yaml b/charts/vineyard-operator/templates/vineyardd-crd.yaml
@@ -46,15 +46,10 @@ spec:
             type: object
           spec:
             properties:
-              etcd:
-                default:
-                  replicas: 3
-                properties:
-                  replicas:
-                    default: 3
-                    type: integer
-                type: object
-              metricConfig:
+              etcdReplicas:
+                default: 3
+                type: integer
+              metric:
                 default:
                   enable: false
                   image: vineyardcloudnative/vineyard-grok-exporter:latest
@@ -70,7 +65,7 @@ spec:
                     default: IfNotPresent
                     type: string
                 type: object
-              pluginConfig:
+              pluginImage:
                 default:
                   backupImage: ghcr.io/v6d-io/v6d/backup-job
                   daskRepartitionImage: ghcr.io/v6d-io/v6d/dask-repartition
@@ -100,23 +95,17 @@ spec:
               service:
                 default:
                   port: 9600
-                  selector: rpc.vineyardd.v6d.io/rpc=vineyard-rpc
                   type: ClusterIP
                 properties:
                   port:
                     default: 9600
                     type: integer
-                  selector:
-                    default: rpc.vineyardd.v6d.io/rpc=vineyard-rpc
-                    type: string
                   type:
                     default: ClusterIP
                     type: string
                 type: object
-              vineyardConfig:
+              vineyard:
                 default:
-                  etcdEndpoint: http://etcd-for-vineyard:2379
-                  etcdPrefix: /vineyard
                   image: vineyardcloudnative/vineyardd:latest
                   imagePullPolicy: IfNotPresent
                   size: 256Mi
@@ -188,12 +177,6 @@ spec:
                       - name
                       type: object
                     type: array
-                  etcdEndpoint:
-                    default: http://etcd-for-vineyard:2379
-                    type: string
-                  etcdPrefix:
-                    default: /vineyard
-                    type: string
                   image:
                     default: vineyardcloudnative/vineyardd:latest
                     type: string
@@ -206,7 +189,7 @@ spec:
                   socket:
                     default: /var/run/vineyard-kubernetes/{{ "{{.Namespace}}/{{.Name}}" }}
                     type: string
-                  spillConfig:
+                  spill:
                     properties:
                       name:
                         default: ""

diff --git a/docs/notes/cloud-native/deploy-kubernetes.rst b/docs/notes/cloud-native/deploy-kubernetes.rst
@@ -26,7 +26,7 @@ Option #1: Install from helm chart (recommended)
 
     $ helm repo add vineyard https://vineyard.oss-ap-southeast-1.aliyuncs.com/charts/
     $ helm repo update
-    $ helm install vineyard-operator vineyard/vineyard-operator
+    $ helm install vineyard-operator vineyard/vineyard-operator -n vineyard-system --create-namespace
 
 Wait for the vineyard operator until ready.
 
@@ -46,12 +46,13 @@ Option #2: Install form source code
       $ cd k8s
       $ make -C k8s docker-build
 
-   With `kind`_, you need to first import the image into the kind cluster (otherwise you
-   need to push the image to your registry first):
+   .. caution::
 
-   .. code:: bash
+      With `kind`_, you need to first import the image into the kind cluster:
+
+      .. code:: bash
 
-      $ kind load docker-image vineyardcloudnative/vineyard-operator:latest
+          $ kind load docker-image vineyardcloudnative/vineyard-operator:latest
 
 3. Install the cert-manager
 
@@ -113,14 +114,11 @@ replicas:
       # don't use default namespace
       namespace: vineyard-system
     spec:
-      replicas: 2
-      etcd:
-        replicas: 3
       service:
         type: ClusterIP
         port: 9600
-      vineyardConfig:
-        image: ghcr.io/v6d-io/v6d/vineyardd:alpine-latest
+      vineyard:
+        image: vineyardcloudnative/vineyardd:alpine-latest
         imagePullPolicy: IfNotPresent
     EOF