Support to add the volume, volume mount and privileged for vineyardd …

…CRD (v6d-io#1671) Signed-off-by: Ye Cao <[email protected]>
sighingnow · Dec 19, 2023 · 79a5a46 · 79a5a46
1 parent e5e096e
commit 79a5a46
Show file tree

Hide file tree

Showing 35 changed files with 3,906 additions and 186 deletions.
diff --git a/charts/vineyard-operator/Chart.yaml b/charts/vineyard-operator/Chart.yaml
@@ -34,5 +34,5 @@ appVersion: 0.19.1
 dependencies:
  - name: cert-manager
  repository: https://charts.jetstack.io
- version: v1.9.1
+ version: v1.8.0
  condition: cert-manager.enabled
diff --git a/charts/vineyard-operator/templates/backup-crd.yaml b/charts/vineyard-operator/templates/backup-crd.yaml
@@ -5,7 +5,7 @@ metadata:
  annotations:
  cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "vineyard-operator.fullname"
  . }}-serving-cert'
- controller-gen.kubebuilder.io/version: v0.11.0
+ controller-gen.kubebuilder.io/version: v0.8.0
  labels:
  {{- include "vineyard-operator.labels" . | nindent 4 }}
 spec:
@@ -67,7 +67,6 @@ spec:
  - kind
  - name
  type: object
- x-kubernetes-map-type: atomic
  dataSourceRef:
  properties:
  apiGroup:
@@ -80,7 +79,6 @@ spec:
  - kind
  - name
  type: object
- x-kubernetes-map-type: atomic
  resources:
  properties:
  limits:
@@ -123,7 +121,6 @@ spec:
  type: string
  type: object
  type: object
- x-kubernetes-map-type: atomic
  storageClassName:
  type: string
  volumeMode:
@@ -210,7 +207,6 @@ spec:
  namespace:
  type: string
  type: object
- x-kubernetes-map-type: atomic
  user:
  type: string
  required:
@@ -229,7 +225,6 @@ spec:
  namespace:
  type: string
  type: object
- x-kubernetes-map-type: atomic
  volumeID:
  type: string
  required:
@@ -252,7 +247,6 @@ spec:
  uid:
  type: string
  type: object
- x-kubernetes-map-type: granular
  csi:
  properties:
  controllerExpandSecretRef:
@@ -262,43 +256,31 @@ spec:
  namespace:
  type: string
  type: object
- x-kubernetes-map-type: atomic
  controllerPublishSecretRef:
  properties:
  name:
  type: string
  namespace:
  type: string
  type: object
- x-kubernetes-map-type: atomic
  driver:
  type: string
  fsType:
  type: string
- nodeExpandSecretRef:
- properties:
- name:
- type: string
- namespace:
- type: string
- type: object
- x-kubernetes-map-type: atomic
  nodePublishSecretRef:
  properties:
  name:
  type: string
  namespace:
  type: string
  type: object
- x-kubernetes-map-type: atomic
  nodeStageSecretRef:
  properties:
  name:
  type: string
  namespace:
  type: string
  type: object
- x-kubernetes-map-type: atomic
  readOnly:
  type: boolean
  volumeAttributes:
@@ -348,7 +330,6 @@ spec:
  namespace:
  type: string
  type: object
- x-kubernetes-map-type: atomic
  required:
  - driver
  type: object
@@ -426,7 +407,6 @@ spec:
  namespace:
  type: string
  type: object
- x-kubernetes-map-type: atomic
  targetPortal:
  type: string
  required:
@@ -499,12 +479,10 @@ spec:
  type: object
  type: array
  type: object
- x-kubernetes-map-type: atomic
  type: array
  required:
  - nodeSelectorTerms
  type: object
- x-kubernetes-map-type: atomic
  type: object
  persistentVolumeReclaimPolicy:
  type: string
@@ -569,7 +547,6 @@ spec:
  namespace:
  type: string
  type: object
- x-kubernetes-map-type: atomic
  user:
  type: string
  required:
@@ -593,7 +570,6 @@ spec:
  namespace:
  type: string
  type: object
- x-kubernetes-map-type: atomic
  sslEnabled:
  type: boolean
  storageMode:
@@ -634,7 +610,6 @@ spec:
  uid:
  type: string
  type: object
- x-kubernetes-map-type: atomic
  volumeName:
  type: string
  volumeNamespace:

diff --git a/charts/vineyard-operator/templates/csidriver-crd.yaml b/charts/vineyard-operator/templates/csidriver-crd.yaml
@@ -5,7 +5,7 @@ metadata:
  annotations:
  cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "vineyard-operator.fullname"
  . }}-serving-cert'
- controller-gen.kubebuilder.io/version: v0.11.0
+ controller-gen.kubebuilder.io/version: v0.8.0
  labels:
  {{- include "vineyard-operator.labels" . | nindent 4 }}
 spec:

diff --git a/charts/vineyard-operator/templates/globalobject-crd.yaml b/charts/vineyard-operator/templates/globalobject-crd.yaml
@@ -5,7 +5,7 @@ metadata:
  annotations:
  cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "vineyard-operator.fullname"
  . }}-serving-cert'
- controller-gen.kubebuilder.io/version: v0.11.0
+ controller-gen.kubebuilder.io/version: v0.8.0
  labels:
  {{- include "vineyard-operator.labels" . | nindent 4 }}
 spec:

diff --git a/charts/vineyard-operator/templates/localobject-crd.yaml b/charts/vineyard-operator/templates/localobject-crd.yaml
@@ -5,7 +5,7 @@ metadata:
  annotations:
  cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "vineyard-operator.fullname"
  . }}-serving-cert'
- controller-gen.kubebuilder.io/version: v0.11.0
+ controller-gen.kubebuilder.io/version: v0.8.0
  labels:
  {{- include "vineyard-operator.labels" . | nindent 4 }}
 spec:

diff --git a/charts/vineyard-operator/templates/operation-crd.yaml b/charts/vineyard-operator/templates/operation-crd.yaml
@@ -5,7 +5,7 @@ metadata:
  annotations:
  cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "vineyard-operator.fullname"
  . }}-serving-cert'
- controller-gen.kubebuilder.io/version: v0.11.0
+ controller-gen.kubebuilder.io/version: v0.8.0
  labels:
  {{- include "vineyard-operator.labels" . | nindent 4 }}
 spec:

diff --git a/charts/vineyard-operator/templates/recover-crd.yaml b/charts/vineyard-operator/templates/recover-crd.yaml
@@ -5,7 +5,7 @@ metadata:
  annotations:
  cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "vineyard-operator.fullname"
  . }}-serving-cert'
- controller-gen.kubebuilder.io/version: v0.11.0
+ controller-gen.kubebuilder.io/version: v0.8.0
  labels:
  {{- include "vineyard-operator.labels" . | nindent 4 }}
 spec: