update operator chart CRDs (#455)

vesoft-inc · Feb 27, 2024 · 5d6c593 · 5d6c593
1 parent d9f5d39
commit 5d6c593
Show file tree

Hide file tree

Showing 10 changed files with 5,751 additions and 7 deletions.
diff --git a/Dockerfile.multiarch b/Dockerfile.multiarch
@@ -24,6 +24,8 @@ RUN mv ./kubectl /usr/local/bin
 ADD charts/nebula-operator/crds/nebulaautoscalers.yaml /tmp/nebula-operator/nebulaautoscalers.yaml
 ADD charts/nebula-operator/crds/nebulaclusters.yaml /tmp/nebula-operator/nebulaclusters.yaml
 ADD charts/nebula-operator/crds/nebularestores.yaml /tmp/nebula-operator/nebularestores.yaml
+ADD charts/nebula-operator/crds/nebulabackups.yaml /tmp/nebula-operator/nebulabackups.yaml
+ADD charts/nebula-operator/crds/nebulacronbackups.yaml /tmp/nebula-operator/nebulacronbackups.yaml
 
 ADD bin/${TARGETPLATFORM}/controller-manager /usr/local/bin/controller-manager
 ADD bin/${TARGETPLATFORM}/autoscaler /usr/local/bin/autoscaler

diff --git a/charts/nebula-cluster/templates/nebula-cluster.yaml b/charts/nebula-cluster/templates/nebula-cluster.yaml
@@ -288,6 +288,14 @@ spec:
     image: {{ .Values.nebula.agent.image }}
     version: {{ .Values.nebula.agent.version }}
     resources: {{ toYaml .Values.nebula.agent.resources | nindent 6 }}
+    {{- with .Values.nebula.agent.env }}
+    env:
+    {{ toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.nebula.agent.volumeMounts }}
+    volumeMounts:
+    {{- toYaml . | nindent 6 }}
+    {{- end }}
   console:
     username: {{ .Values.nebula.console.username }}
     password: {{ .Values.nebula.console.password }}

diff --git a/charts/nebula-cluster/values.yaml b/charts/nebula-cluster/values.yaml
@@ -141,6 +141,8 @@ nebula:
       limits:
         cpu: "200m"
         memory: "256Mi"
+    env: []
+    volumeMounts: []
 
   console:
     username: root

diff --git a/charts/nebula-operator/crds/nebulabackups.yaml b/charts/nebula-operator/crds/nebulabackups.yaml
diff --git a/charts/nebula-operator/crds/nebulaclusters.yaml b/charts/nebula-operator/crds/nebulaclusters.yaml
@@ -429,6 +429,70 @@ spec:
                 type: object
               agent:
                 properties:
+                  env:
+                    items:
+                      properties:
+                        name:
+                          type: string
+                        value:
+                          type: string
+                        valueFrom:
+                          properties:
+                            configMapKeyRef:
+                              properties:
+                                key:
+                                  type: string
+                                name:
+                                  type: string
+                                optional:
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            fieldRef:
+                              properties:
+                                apiVersion:
+                                  type: string
+                                fieldPath:
+                                  type: string
+                              required:
+                              - fieldPath
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            resourceFieldRef:
+                              properties:
+                                containerName:
+                                  type: string
+                                divisor:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                resource:
+                                  type: string
+                              required:
+                              - resource
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secretKeyRef:
+                              properties:
+                                key:
+                                  type: string
+                                name:
+                                  type: string
+                                optional:
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                      required:
+                      - name
+                      type: object
+                    type: array
                   image:
                     type: string
                   resources:
@@ -463,7 +527,28 @@ spec:
                         type: object
                     type: object
                   version:
+                    default: latest
                     type: string
+                  volumeMounts:
+                    items:
+                      properties:
+                        mountPath:
+                          type: string
+                        mountPropagation:
+                          type: string
+                        name:
+                          type: string
+                        readOnly:
+                          type: boolean
+                        subPath:
+                          type: string
+                        subPathExpr:
+                          type: string
+                      required:
+                      - mountPath
+                      - name
+                      type: object
+                    type: array
                 type: object
               alpineImage:
                 type: string
@@ -3199,7 +3284,6 @@ spec:
                 - image
                 type: object
               failoverPeriod:
-                default: 5m
                 type: string
               graphd:
                 properties:
@@ -8827,6 +8911,8 @@ spec:
                   serverKey:
                     default: tls.key
                     type: string
+                  serverName:
+                    type: string
                   serverSecret:
                     type: string
                 type: object