Skip to content

Commit 5d6c593

Browse files
authored
update operator chart CRDs (#455)
1 parent d9f5d39 commit 5d6c593

File tree

10 files changed

+5751
-7
lines changed

10 files changed

+5751
-7
lines changed

Diff for: Dockerfile.multiarch

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ RUN mv ./kubectl /usr/local/bin
2424
ADD charts/nebula-operator/crds/nebulaautoscalers.yaml /tmp/nebula-operator/nebulaautoscalers.yaml
2525
ADD charts/nebula-operator/crds/nebulaclusters.yaml /tmp/nebula-operator/nebulaclusters.yaml
2626
ADD charts/nebula-operator/crds/nebularestores.yaml /tmp/nebula-operator/nebularestores.yaml
27+
ADD charts/nebula-operator/crds/nebulabackups.yaml /tmp/nebula-operator/nebulabackups.yaml
28+
ADD charts/nebula-operator/crds/nebulacronbackups.yaml /tmp/nebula-operator/nebulacronbackups.yaml
2729

2830
ADD bin/${TARGETPLATFORM}/controller-manager /usr/local/bin/controller-manager
2931
ADD bin/${TARGETPLATFORM}/autoscaler /usr/local/bin/autoscaler

Diff for: charts/nebula-cluster/templates/nebula-cluster.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,14 @@ spec:
288288
image: {{ .Values.nebula.agent.image }}
289289
version: {{ .Values.nebula.agent.version }}
290290
resources: {{ toYaml .Values.nebula.agent.resources | nindent 6 }}
291+
{{- with .Values.nebula.agent.env }}
292+
env:
293+
{{ toYaml . | nindent 6 }}
294+
{{- end }}
295+
{{- with .Values.nebula.agent.volumeMounts }}
296+
volumeMounts:
297+
{{- toYaml . | nindent 6 }}
298+
{{- end }}
291299
console:
292300
username: {{ .Values.nebula.console.username }}
293301
password: {{ .Values.nebula.console.password }}

Diff for: charts/nebula-cluster/values.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ nebula:
141141
limits:
142142
cpu: "200m"
143143
memory: "256Mi"
144+
env: []
145+
volumeMounts: []
144146

145147
console:
146148
username: root

Diff for: charts/nebula-operator/crds/nebulabackups.yaml

+2,598
Large diffs are not rendered by default.

Diff for: charts/nebula-operator/crds/nebulaclusters.yaml

+87-1
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,70 @@ spec:
429429
type: object
430430
agent:
431431
properties:
432+
env:
433+
items:
434+
properties:
435+
name:
436+
type: string
437+
value:
438+
type: string
439+
valueFrom:
440+
properties:
441+
configMapKeyRef:
442+
properties:
443+
key:
444+
type: string
445+
name:
446+
type: string
447+
optional:
448+
type: boolean
449+
required:
450+
- key
451+
type: object
452+
x-kubernetes-map-type: atomic
453+
fieldRef:
454+
properties:
455+
apiVersion:
456+
type: string
457+
fieldPath:
458+
type: string
459+
required:
460+
- fieldPath
461+
type: object
462+
x-kubernetes-map-type: atomic
463+
resourceFieldRef:
464+
properties:
465+
containerName:
466+
type: string
467+
divisor:
468+
anyOf:
469+
- type: integer
470+
- type: string
471+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
472+
x-kubernetes-int-or-string: true
473+
resource:
474+
type: string
475+
required:
476+
- resource
477+
type: object
478+
x-kubernetes-map-type: atomic
479+
secretKeyRef:
480+
properties:
481+
key:
482+
type: string
483+
name:
484+
type: string
485+
optional:
486+
type: boolean
487+
required:
488+
- key
489+
type: object
490+
x-kubernetes-map-type: atomic
491+
type: object
492+
required:
493+
- name
494+
type: object
495+
type: array
432496
image:
433497
type: string
434498
resources:
@@ -463,7 +527,28 @@ spec:
463527
type: object
464528
type: object
465529
version:
530+
default: latest
466531
type: string
532+
volumeMounts:
533+
items:
534+
properties:
535+
mountPath:
536+
type: string
537+
mountPropagation:
538+
type: string
539+
name:
540+
type: string
541+
readOnly:
542+
type: boolean
543+
subPath:
544+
type: string
545+
subPathExpr:
546+
type: string
547+
required:
548+
- mountPath
549+
- name
550+
type: object
551+
type: array
467552
type: object
468553
alpineImage:
469554
type: string
@@ -3199,7 +3284,6 @@ spec:
31993284
- image
32003285
type: object
32013286
failoverPeriod:
3202-
default: 5m
32033287
type: string
32043288
graphd:
32053289
properties:
@@ -8827,6 +8911,8 @@ spec:
88278911
serverKey:
88288912
default: tls.key
88298913
type: string
8914+
serverName:
8915+
type: string
88308916
serverSecret:
88318917
type: string
88328918
type: object

0 commit comments

Comments
 (0)