Skip to content

Commit

Permalink
update restore process (#216)
Browse files Browse the repository at this point in the history
  • Loading branch information
@MegaByte875
MegaByte875 authored Jul 20, 2023
1 parent 6c4b8d0 commit 0ba7829
Show file tree
Hide file tree
Showing 13 changed files with 147 additions and 187 deletions.
21 changes: 21 additions & 0 deletions apis/apps/v1alpha1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

176 changes: 59 additions & 117 deletions config/crd/bases/apps.nebula-graph.io_nebulaclusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,44 @@ spec:
type: array
type: object
type: object
agent:
properties:
image:
type: string
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
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
type: object
requests:
additionalProperties:
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
type: object
type: object
version:
type: string
type: object
enableBR:
type: boolean
enablePVReclaim:
Expand Down Expand Up @@ -11139,51 +11177,21 @@ spec:
type: array
graphd:
properties:
conditions:
items:
properties:
lastTransitionTime:
format: date-time
type: string
message:
maxLength: 32768
type: string
observedGeneration:
format: int64
minimum: 0
type: integer
reason:
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
enum:
- "True"
- "False"
- Unknown
type: string
type:
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- lastTransitionTime
- message
- reason
- status
- type
type: object
type: array
phase:
type: string
version:
type: string
workload:
properties:
availableReplicas:
format: int32
type: integer
collisionCount:
format: int32
type: integer
currentReplicas:
format: int32
type: integer
currentRevision:
type: string
observedGeneration:
Expand All @@ -11197,9 +11205,6 @@ spec:
type: integer
updateRevision:
type: string
updatedReadyReplicas:
format: int32
type: integer
updatedReplicas:
format: int32
type: integer
Expand All @@ -11211,51 +11216,21 @@ spec:
type: object
metad:
properties:
conditions:
items:
properties:
lastTransitionTime:
format: date-time
type: string
message:
maxLength: 32768
type: string
observedGeneration:
format: int64
minimum: 0
type: integer
reason:
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
enum:
- "True"
- "False"
- Unknown
type: string
type:
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- lastTransitionTime
- message
- reason
- status
- type
type: object
type: array
phase:
type: string
version:
type: string
workload:
properties:
availableReplicas:
format: int32
type: integer
collisionCount:
format: int32
type: integer
currentReplicas:
format: int32
type: integer
currentRevision:
type: string
observedGeneration:
Expand All @@ -11269,9 +11244,6 @@ spec:
type: integer
updateRevision:
type: string
updatedReadyReplicas:
format: int32
type: integer
updatedReplicas:
format: int32
type: integer
Expand All @@ -11281,49 +11253,16 @@ spec:
- updatedReplicas
type: object
type: object
observedGeneration:
format: int64
type: integer
storaged:
properties:
balancedSpaces:
items:
format: int32
type: integer
type: array
conditions:
items:
properties:
lastTransitionTime:
format: date-time
type: string
message:
maxLength: 32768
type: string
observedGeneration:
format: int64
minimum: 0
type: integer
reason:
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
enum:
- "True"
- "False"
- Unknown
type: string
type:
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- lastTransitionTime
- message
- reason
- status
- type
type: object
type: array
hostsAdded:
type: boolean
lastBalanceJob:
Expand All @@ -11341,9 +11280,15 @@ spec:
type: string
workload:
properties:
availableReplicas:
format: int32
type: integer
collisionCount:
format: int32
type: integer
currentReplicas:
format: int32
type: integer
currentRevision:
type: string
observedGeneration:
Expand All @@ -11357,9 +11302,6 @@ spec:
type: integer
updateRevision:
type: string
updatedReadyReplicas:
format: int32
type: integer
updatedReplicas:
format: int32
type: integer
Expand Down
4 changes: 2 additions & 2 deletions config/samples/full-backup-job.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ metadata:
name: nebula-full-backup
spec:
parallelism: 1
ttlSecondsAfterFinished: 60
ttlSecondsAfterFinished: 600
template:
spec:
restartPolicy: OnFailure
containers:
- image: vesoft/br-ent:v3.4.0
- image: vesoft/br-ent:v3.5.0
imagePullPolicy: Always
name: backup
command:
Expand Down
8 changes: 4 additions & 4 deletions config/samples/incremental-backup-job.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ metadata:
name: aws-s3-secret
type: Opaque
data:
access-key: QVNJQVE0WFlSWFE1TlhVMlczNlUK
secret-key: ZFJ6OEdNcDdxenMwVGFGdExVM2RpYkk4b2hHRWRSamgvNTdzWkg3Ugo=
access-key: <ACCESS_KEY>
secret-key: <SECRET_KEY>
---
apiVersion: batch/v1
kind: Job
metadata:
name: nebula-incr-backup
spec:
parallelism: 1
ttlSecondsAfterFinished: 60
ttlSecondsAfterFinished: 600
template:
spec:
restartPolicy: OnFailure
containers:
- image: vesoft/br-ent:v3.4.0
- image: vesoft/br-ent:v3.5.0
imagePullPolicy: Always
name: backup
command:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/restore-pod.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
name: nebula-restore
spec:
containers:
- image: vesoft/br-ent:v3.4.0
- image: vesoft/br-ent:v3.5.0
imagePullPolicy: Always
name: restore
command:
Expand Down
4 changes: 2 additions & 2 deletions doc/user/br_guide.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ metadata:
name: aws-s3-secret
type: Opaque
data:
access-key: QVNJQVE0WFlSXFE1TlhVMlczNlUK
secret-key: ZFJ6OEdNcDdxenMwVGFGdFxVM2RpYkk4b2hHRWRSamgvNTdzWkg3Ugo=
access-key: <ACCESS_KEY>
secret-key: <SECRET_KEY>
---
apiVersion: apps.nebula-graph.io/v1alpha1
kind: NebulaRestore
Expand Down
10 changes: 5 additions & 5 deletions doc/user/ssl_guide.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,19 +83,19 @@ sslCerts:
# Name of the server cert secret
serverSecret: "server-cert"
# The key to server PEM encoded public key certificate, default name is tls.crt
serverPublicKey: ""
serverCert: ""
# The key to server private key associated with given certificate, default name is tls.key
serverPrivateKey: ""
serverKey: ""
# Name of the client cert secret
clientSecret: "client-cert"
# The key to server PEM encoded public key certificate, default name is tls.crt
clientPublicKey: ""
clientCert: ""
# The key to client private key associated with given certificate, default name is tls.key
clientPrivateKey: ""
clientKey: ""
# Name of the CA cert secret
caSecret: "ca-cert"
# The key to CA PEM encoded public key certificate, default name is ca.crt
caPublicKey: ""
caCert: ""
# InsecureSkipVerify controls whether a client verifies the server's certificate chain and host name
insecureSkipVerify: false
```
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ require (
k8s.io/client-go v0.26.5
k8s.io/code-generator v0.26.5
k8s.io/klog/v2 v2.90.1
k8s.io/kube-scheduler v0.0.0
k8s.io/kubectl v0.0.0
k8s.io/kube-scheduler v0.26.5
k8s.io/kubectl v0.26.5
k8s.io/kubernetes v1.26.5
k8s.io/utils v0.0.0-20230209194617-a36077c30491
sigs.k8s.io/controller-runtime v0.14.6
Expand Down
Loading

0 comments on commit 0ba7829

Please sign in to comment.