Merge.

Signed-off-by: SighingSnow <1263750383@qq.com>

.github/build-docs.sh

@@ -12,7 +12,7 @@ pip3 install -r requirements-setup.txt -r requirements.txt -r requirements-dev.t
 pip3 install black isort flake8
 
 # build vineyard_client_python
-mkdir build
+mkdir -p build
 pushd build
 cmake .. -DCMAKE_BUILD_TYPE=Debug \
          -DBUILD_SHARED_LIBS=ON \

.github/workflows/vineyard-operator.yaml

@@ -297,11 +297,8 @@ jobs:
       - name: Leave a message for logs URL
         if: ${{ failure() }}
         run: |
-          if [[ -n ${{ github.event.pull_request.head.sha }} ]]; then
-              short_sha=$(git rev-parse --short ${{ github.event.pull_request.head.sha }})
-          else
-              short_sha=$(git rev-parse --short ${{ github.event.push.head.sha }})
-          fi
+          sha=${{ github.event.pull_request.head.sha || github.sha }}
+          short_sha=$(git rev-parse --short $sha)
           case ${{ matrix.job }} in
             e2e-tests-spill)
               signed_url_key=0707

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.3)
 
 set(VINEYARD_MAJOR_VERSION 0)
 set(VINEYARD_MINOR_VERSION 17)
-set(VINEYARD_PATCH_VERSION 1)
+set(VINEYARD_PATCH_VERSION 3)
 set(VINEYARD_VERSION ${VINEYARD_MAJOR_VERSION}.${VINEYARD_MINOR_VERSION}.${VINEYARD_PATCH_VERSION})
 
 message(STATUS "Configuring and building vineyard version '${VINEYARD_VERSION}'.")

MAINTAINERS.md

@@ -16,6 +16,7 @@ maintainers are listed in the [GOVERNANCE.md](GOVERNANCE.md) file.
 | Siyuan Zhang | [siyuan0322](https://github.com/siyuan0322)     | Alibaba     | [siyuanzhang.zsy@alibaba-inc.com](mailto:siyuanzhang.zsy@alibaba-inc.com) |
 | Diwen Zhu    | [andydiwenzhu](https://github.com/andydiwenzhu) | Alibaba     | [diwen.zdw@alibaba-inc.com](mailto:diwen.zdw@alibaba-inc.com)             |
 | Shumin Yuan  | [vegetableysm](https://github.com/vegetableysm) | Alibaba     | [yuanshumin.ysm@alibaba-inc.com](mailto:yuanshumin.ysm@alibaba-inc.com)   |
+| Denghao Li  | [lidh15](https://github.com/lidh15)              | PingAn Tech | [lidhrandom@gmail.com](mailto:lidhrandom@gmail.com)                       |
 
 ## Project Committers
 

charts/vineyard-operator/Chart.yaml

@@ -24,12 +24,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.17.1
+version: 0.17.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.17.1
+appVersion: 0.17.3
 
 dependencies:
   - name: cert-manager

charts/vineyard-operator/templates/csidriver-crd.yaml

@@ -0,0 +1,115 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: csidrivers.k8s.v6d.io
+  annotations:
+    cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "vineyard-operator.fullname"
+      . }}-serving-cert'
+    controller-gen.kubebuilder.io/version: v0.11.0
+  labels:
+  {{- include "vineyard-operator.labels" . | nindent 4 }}
+spec:
+  conversion:
+    strategy: Webhook
+    webhook:
+      clientConfig:
+        service:
+          name: webhook-service
+          namespace: '{{ .Release.Namespace }}'
+          path: /convert
+      conversionReviewVersions:
+      - v1
+  group: k8s.v6d.io
+  names:
+    kind: CSIDriver
+    listKind: CSIDriverList
+    plural: csidrivers
+    singular: csidriver
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            type: string
+          kind:
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              clusters:
+                items:
+                  properties:
+                    name:
+                      default: ""
+                      type: string
+                    namespace:
+                      default: ""
+                      type: string
+                  type: object
+                type: array
+              enableToleration:
+                default: false
+                type: boolean
+              enableVerboseLog:
+                default: false
+                type: boolean
+              image:
+                default: vineyardcloudnative/vineyard-operator
+                type: string
+              imagePullPolicy:
+                default: IfNotPresent
+                type: string
+              sidecar:
+                default:
+                  attacherImage: registry.k8s.io/sig-storage/csi-attacher:v4.0.0
+                  enableTopology: false
+                  imagePullPolicy: Always
+                  livenessProbeImage: registry.k8s.io/sig-storage/livenessprobe:v2.8.0
+                  nodeRegistrarImage: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.0
+                  provisionerImage: registry.k8s.io/sig-storage/csi-provisioner:v3.3.0
+                properties:
+                  attacherImage:
+                    default: registry.k8s.io/sig-storage/csi-attacher:v4.0.0
+                    type: string
+                  enableTopology:
+                    default: false
+                    type: boolean
+                  imagePullPolicy:
+                    default: Always
+                    type: string
+                  livenessProbeImage:
+                    default: registry.k8s.io/sig-storage/livenessprobe:v2.8.0
+                    type: string
+                  nodeRegistrarImage:
+                    default: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.0
+                    type: string
+                  provisionerImage:
+                    default: registry.k8s.io/sig-storage/csi-provisioner:v3.3.0
+                    type: string
+                type: object
+              storageClassName:
+                default: vineyard-csi
+                type: string
+              volumeBindingMode:
+                default: WaitForFirstConsumer
+                type: string
+            type: object
+          status:
+            properties:
+              state:
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

charts/vineyard-operator/templates/deployment.yaml

@@ -11,6 +11,7 @@ metadata:
   name: {{ include "vineyard-operator.fullname" . }}-controller-manager
   labels:
     control-plane: controller-manager
+    k8s.v6d.io/instance: vineyard-operator
   {{- include "vineyard-operator.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.controllerManager.replicas }}
@@ -30,6 +31,7 @@ spec:
       containers:
       - args:
         - manager
+        - --verbose
         command:
         - /vineyardctl
         env:

charts/vineyard-operator/templates/manager-rbac.yaml

@@ -23,6 +23,14 @@ rules:
   verbs:
   - create
   - patch
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - ""
   resources:
@@ -34,6 +42,13 @@ rules:
   - list
   - patch
   - update
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - persistentvolumeclaims/finalizers
+  verbs:
+  - patch
 - apiGroups:
   - ""
   resources:
@@ -45,6 +60,13 @@ rules:
   - list
   - patch
   - update
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - persistentvolumes/finalizers
+  verbs:
+  - patch
 - apiGroups:
   - ""
   resources:
@@ -90,6 +112,16 @@ rules:
   - delete
   - get
   - update
+- apiGroups:
+  - apps
+  resources:
+  - daemonsets
+  verbs:
+  - create
+  - get
+  - list
+  - update
+  - watch
 - apiGroups:
   - apps
   resources:
@@ -127,6 +159,14 @@ rules:
   - get
   - list
   - update
+- apiGroups:
+  - csi.storage.k8s.io
+  resources:
+  - csinodeinfos
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - k8s.v6d.io
   resources:
@@ -147,6 +187,32 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - k8s.v6d.io
+  resources:
+  - csidrivers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - k8s.v6d.io
+  resources:
+  - csidrivers/finalizers
+  verbs:
+  - update
+- apiGroups:
+  - k8s.v6d.io
+  resources:
+  - csidrivers/status
+  verbs:
+  - get
+  - patch
+  - update
 - apiGroups:
   - k8s.v6d.io
   resources:
@@ -285,6 +351,74 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - snapshot.storage.k8s.io
+  resources:
+  - volumesnapshotclasses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - snapshot.storage.k8s.io
+  resources:
+  - volumesnapshotcontents
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - update
+  - watch
+- apiGroups:
+  - snapshot.storage.k8s.io
+  resources:
+  - volumesnapshots
+  verbs:
+  - get
+  - list
+  - update
+  - watch
+- apiGroups:
+  - storage.k8s.io
+  resources:
+  - csinodes
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - storage.k8s.io
+  resources:
+  - storageclasses
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - storage.k8s.io
+  resources:
+  - volumeattachments
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - storage.k8s.io
+  resources:
+  - volumeattachments/status
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/vineyard-operator/templates/recover-crd.yaml

@@ -3,10 +3,22 @@ kind: CustomResourceDefinition
 metadata:
   name: recovers.k8s.v6d.io
   annotations:
+    cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "vineyard-operator.fullname"
+      . }}-serving-cert'
     controller-gen.kubebuilder.io/version: v0.11.0
   labels:
   {{- include "vineyard-operator.labels" . | nindent 4 }}
 spec:
+  conversion:
+    strategy: Webhook
+    webhook:
+      clientConfig:
+        service:
+          name: webhook-service
+          namespace: '{{ .Release.Namespace }}'
+          path: /convert
+      conversionReviewVersions:
+      - v1
   group: k8s.v6d.io
   names:
     kind: Recover