Skip to content

Commit

Permalink
[CHANGE] Rename options to tlsOptions
Browse files Browse the repository at this point in the history 
Signed-off-by: Pooya Azarpour <pooya_azarpour@yahoo.com>
  • Loading branch information
@poyaz
poyaz committed Apr 8, 2024
1 parent 9b4216a commit 01cb120
Show file tree
Hide file tree
Showing 31 changed files with 259 additions and 280 deletions.
4 changes: 2 additions & 2 deletions api/v1/backend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type (
B2 *B2Spec `json:"b2,omitempty"`
Rest *RestServerSpec `json:"rest,omitempty"`

Options *BackendOpts `json:"options,omitempty"`
TLSOptions *TLSOptions `json:"tlsOptions,omitempty"`
VolumeMounts *[]corev1.VolumeMount `json:"volumeMounts,omitempty"`
}

Expand Down Expand Up @@ -283,7 +283,7 @@ func (in *RestServerSpec) String() string {
return fmt.Sprintf("rest:%s://%s:%s@%s", protocol, "$(USER)", "$(PASSWORD)", url)
}

type BackendOpts struct {
type TLSOptions struct {
CACert string `json:"caCert,omitempty"`
ClientCert string `json:"clientCert,omitempty"`
ClientKey string `json:"clientKey,omitempty"`
Expand Down
8 changes: 1 addition & 7 deletions api/v1/restore_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ type RestoreSpec struct {
type RestoreMethod struct {
S3 *S3Spec `json:"s3,omitempty"`
Folder *FolderRestore `json:"folder,omitempty"`
Options *RestoreOpts `json:"options,omitempty"`
TLSOptions *TLSOptions `json:"tlsOptions,omitempty"`
VolumeMounts *[]corev1.VolumeMount `json:"volumeMounts,omitempty"`
}

Expand Down Expand Up @@ -147,9 +147,3 @@ func init() {
var (
RestoreKind = reflect.TypeOf(Restore{}).Name()
)

type RestoreOpts struct {
CACert string `json:"caCert,omitempty"`
ClientCert string `json:"clientCert,omitempty"`
ClientKey string `json:"clientKey,omitempty"`
}
57 changes: 21 additions & 36 deletions api/v1/zz_generated.deepcopy.go
View file

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

36 changes: 18 additions & 18 deletions config/crd/apiextensions.k8s.io/v1/k8up.io_archives.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,15 +252,6 @@ spec:
mountPath:
type: string
type: object
options:
properties:
caCert:
type: string
clientCert:
type: string
clientKey:
type: string
type: object
repoPasswordSecretRef:
description: RepoPasswordSecretRef references a secret key to
look up the restic repository password
Expand Down Expand Up @@ -386,6 +377,15 @@ spec:
path:
type: string
type: object
tlsOptions:
properties:
caCert:
type: string
clientCert:
type: string
clientKey:
type: string
type: object
volumeMounts:
items:
description: VolumeMount describes a mounting of a Volume within
Expand Down Expand Up @@ -694,15 +694,6 @@ spec:
required:
- claimName
type: object
options:
properties:
caCert:
type: string
clientCert:
type: string
clientKey:
type: string
type: object
s3:
properties:
accessKeyIDSecretRef:
Expand Down Expand Up @@ -752,6 +743,15 @@ spec:
type: object
x-kubernetes-map-type: atomic
type: object
tlsOptions:
properties:
caCert:
type: string
clientCert:
type: string
clientKey:
type: string
type: object
volumeMounts:
items:
description: VolumeMount describes a mounting of a Volume within
Expand Down
18 changes: 9 additions & 9 deletions config/crd/apiextensions.k8s.io/v1/k8up.io_backups.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,15 +259,6 @@ spec:
mountPath:
type: string
type: object
options:
properties:
caCert:
type: string
clientCert:
type: string
clientKey:
type: string
type: object
repoPasswordSecretRef:
description: RepoPasswordSecretRef references a secret key to
look up the restic repository password
Expand Down Expand Up @@ -393,6 +384,15 @@ spec:
path:
type: string
type: object
tlsOptions:
properties:
caCert:
type: string
clientCert:
type: string
clientKey:
type: string
type: object
volumeMounts:
items:
description: VolumeMount describes a mounting of a Volume within
Expand Down
18 changes: 9 additions & 9 deletions config/crd/apiextensions.k8s.io/v1/k8up.io_checks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,15 +254,6 @@ spec:
mountPath:
type: string
type: object
options:
properties:
caCert:
type: string
clientCert:
type: string
clientKey:
type: string
type: object
repoPasswordSecretRef:
description: RepoPasswordSecretRef references a secret key to
look up the restic repository password
Expand Down Expand Up @@ -388,6 +379,15 @@ spec:
path:
type: string
type: object
tlsOptions:
properties:
caCert:
type: string
clientCert:
type: string
clientKey:
type: string
type: object
volumeMounts:
items:
description: VolumeMount describes a mounting of a Volume within
Expand Down
18 changes: 9 additions & 9 deletions config/crd/apiextensions.k8s.io/v1/k8up.io_prunes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,15 +254,6 @@ spec:
mountPath:
type: string
type: object
options:
properties:
caCert:
type: string
clientCert:
type: string
clientKey:
type: string
type: object
repoPasswordSecretRef:
description: RepoPasswordSecretRef references a secret key to
look up the restic repository password
Expand Down Expand Up @@ -388,6 +379,15 @@ spec:
path:
type: string
type: object
tlsOptions:
properties:
caCert:
type: string
clientCert:
type: string
clientKey:
type: string
type: object
volumeMounts:
items:
description: VolumeMount describes a mounting of a Volume within
Expand Down
36 changes: 18 additions & 18 deletions config/crd/apiextensions.k8s.io/v1/k8up.io_restores.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,15 +254,6 @@ spec:
mountPath:
type: string
type: object
options:
properties:
caCert:
type: string
clientCert:
type: string
clientKey:
type: string
type: object
repoPasswordSecretRef:
description: RepoPasswordSecretRef references a secret key to
look up the restic repository password
Expand Down Expand Up @@ -388,6 +379,15 @@ spec:
path:
type: string
type: object
tlsOptions:
properties:
caCert:
type: string
clientCert:
type: string
clientKey:
type: string
type: object
volumeMounts:
items:
description: VolumeMount describes a mounting of a Volume within
Expand Down Expand Up @@ -696,15 +696,6 @@ spec:
required:
- claimName
type: object
options:
properties:
caCert:
type: string
clientCert:
type: string
clientKey:
type: string
type: object
s3:
properties:
accessKeyIDSecretRef:
Expand Down Expand Up @@ -754,6 +745,15 @@ spec:
type: object
x-kubernetes-map-type: atomic
type: object
tlsOptions:
properties:
caCert:
type: string
clientCert:
type: string
clientKey:
type: string
type: object
volumeMounts:
items:
description: VolumeMount describes a mounting of a Volume within
Expand Down
Loading

0 comments on commit 01cb120

Please sign in to comment.