Skip to content

Commit

Permalink
* Support to add volume and volume mounts to the vineyardd CRD.
Browse files Browse the repository at this point in the history 
* Support to add the privileged to the vineyard deployment.

Signed-off-by: Ye Cao <[email protected]>
  • Loading branch information
@dashanji
dashanji committed Dec 18, 2023
1 parent 40f7d9d commit 0a4f4ca
Show file tree
Hide file tree
Showing 16 changed files with 824 additions and 96 deletions.
19 changes: 1 addition & 18 deletions charts/vineyard-operator/templates/backup-crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -67,7 +67,6 @@ spec:
- kind
- name
type: object
x-kubernetes-map-type: atomic
dataSourceRef:
properties:
apiGroup:
Expand All @@ -80,7 +79,6 @@ spec:
- kind
- name
type: object
x-kubernetes-map-type: atomic
resources:
properties:
limits:
Expand Down Expand Up @@ -123,7 +121,6 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
storageClassName:
type: string
volumeMode:
Expand Down Expand Up @@ -210,7 +207,6 @@ spec:
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
user:
type: string
required:
Expand All @@ -229,7 +225,6 @@ spec:
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
volumeID:
type: string
required:
Expand Down Expand Up @@ -262,15 +257,13 @@ 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:
Expand All @@ -282,23 +275,20 @@ spec:
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:
Expand Down Expand Up @@ -348,7 +338,6 @@ spec:
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
required:
- driver
type: object
Expand Down Expand Up @@ -426,7 +415,6 @@ spec:
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
targetPortal:
type: string
required:
Expand Down Expand Up @@ -499,12 +487,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
Expand Down Expand Up @@ -569,7 +555,6 @@ spec:
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
user:
type: string
required:
Expand All @@ -593,7 +578,6 @@ spec:
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
sslEnabled:
type: boolean
storageMode:
Expand Down Expand Up @@ -634,7 +618,6 @@ spec:
uid:
type: string
type: object
x-kubernetes-map-type: atomic
volumeName:
type: string
volumeNamespace:
Expand Down
2 changes: 1 addition & 1 deletion charts/vineyard-operator/templates/csidriver-crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion charts/vineyard-operator/templates/globalobject-crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion charts/vineyard-operator/templates/localobject-crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion charts/vineyard-operator/templates/operation-crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion charts/vineyard-operator/templates/recover-crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
23 changes: 1 addition & 22 deletions charts/vineyard-operator/templates/sidecar-crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -114,7 +114,6 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
fieldRef:
properties:
apiVersion:
Expand All @@ -124,7 +123,6 @@ spec:
required:
- fieldPath
type: object
x-kubernetes-map-type: atomic
resourceFieldRef:
properties:
containerName:
Expand All @@ -140,7 +138,6 @@ spec:
required:
- resource
type: object
x-kubernetes-map-type: atomic
secretKeyRef:
properties:
key:
Expand All @@ -152,7 +149,6 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
required:
- name
Expand Down Expand Up @@ -201,7 +197,6 @@ spec:
- kind
- name
type: object
x-kubernetes-map-type: atomic
dataSourceRef:
properties:
apiGroup:
Expand All @@ -214,7 +209,6 @@ spec:
- kind
- name
type: object
x-kubernetes-map-type: atomic
resources:
properties:
limits:
Expand Down Expand Up @@ -257,7 +251,6 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
storageClassName:
type: string
volumeMode:
Expand Down Expand Up @@ -344,7 +337,6 @@ spec:
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
user:
type: string
required:
Expand All @@ -363,7 +355,6 @@ spec:
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
volumeID:
type: string
required:
Expand Down Expand Up @@ -396,15 +387,13 @@ 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:
Expand All @@ -416,23 +405,20 @@ spec:
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:
Expand Down Expand Up @@ -482,7 +468,6 @@ spec:
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
required:
- driver
type: object
Expand Down Expand Up @@ -560,7 +545,6 @@ spec:
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
targetPortal:
type: string
required:
Expand Down Expand Up @@ -633,12 +617,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
Expand Down Expand Up @@ -703,7 +685,6 @@ spec:
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
user:
type: string
required:
Expand All @@ -727,7 +708,6 @@ spec:
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
sslEnabled:
type: boolean
storageMode:
Expand Down Expand Up @@ -768,7 +748,6 @@ spec:
uid:
type: string
type: object
x-kubernetes-map-type: atomic
volumeName:
type: string
volumeNamespace:
Expand Down
Loading

0 comments on commit 0a4f4ca

Please sign in to comment.