Add caCertFilePath field for BackupPolicy

Signed-off-by: kouki <[email protected]>
cybozu-go · Oct 19, 2023 · cd0042d · cd0042d
1 parent 054ca9c
commit cd0042d
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 0 deletions.
diff --git a/api/v1beta1/job_types.go b/api/v1beta1/job_types.go
@@ -207,4 +207,7 @@ type BucketConfig struct {
  // +kubebuilder:default=s3
  // +optional
  BackendType string `json:"backendType,omitempty"`
+
+ // +optional
+ CaCertFilePath string `json:"caCertFilePath,omitempty"`
 }
diff --git a/api/v1beta1/zz_generated.conversion.go b/api/v1beta1/zz_generated.conversion.go
diff --git a/api/v1beta2/job_types.go b/api/v1beta2/job_types.go
@@ -190,6 +190,9 @@ type BucketConfig struct {
  // +kubebuilder:default=s3
  // +optional
  BackendType string `json:"backendType,omitempty"`
+
+ // +optional
+ CaCertFilePath string `json:"caCertFilePath,omitempty"`
 }
 
 // AffinityApplyConfiguration is the type defined to implement the DeepCopy method.

diff --git a/charts/moco/templates/generated/crds/moco_crds.yaml b/charts/moco/templates/generated/crds/moco_crds.yaml
@@ -421,6 +421,8 @@ spec:
  description: The name of the bucket
  minLength: 1
  type: string
+ caCertFilePath:
+ type: string
  endpointURL:
  description: The API endpoint URL.
  pattern: ^https?://.*
@@ -2434,6 +2436,8 @@ spec:
  description: The name of the bucket
  minLength: 1
  type: string
+ caCertFilePath:
+ type: string
  endpointURL:
  description: The API endpoint URL.
  pattern: ^https?://.*
@@ -7686,6 +7690,8 @@ spec:
  description: The name of the bucket
  minLength: 1
  type: string
+ caCertFilePath:
+ type: string
  endpointURL:
  description: The API endpoint URL.
  pattern: ^https?://.*
@@ -13553,6 +13559,8 @@ spec:
  description: The name of the bucket
  minLength: 1
  type: string
+ caCertFilePath:
+ type: string
  endpointURL:
  description: The API endpoint URL.
  pattern: ^https?://.*

diff --git a/config/crd/bases/moco.cybozu.com_backuppolicies.yaml b/config/crd/bases/moco.cybozu.com_backuppolicies.yaml
@@ -461,6 +461,8 @@ spec:
  description: The name of the bucket
  minLength: 1
  type: string
+ caCertFilePath:
+ type: string
  endpointURL:
  description: The API endpoint URL.
  pattern: ^https?://.*
@@ -2631,6 +2633,8 @@ spec:
  description: The name of the bucket
  minLength: 1
  type: string
+ caCertFilePath:
+ type: string
  endpointURL:
  description: The API endpoint URL.
  pattern: ^https?://.*

diff --git a/config/crd/bases/moco.cybozu.com_mysqlclusters.yaml b/config/crd/bases/moco.cybozu.com_mysqlclusters.yaml
@@ -3998,6 +3998,8 @@ spec:
  description: The name of the bucket
  minLength: 1
  type: string
+ caCertFilePath:
+ type: string
  endpointURL:
  description: The API endpoint URL.
  pattern: ^https?://.*
@@ -10412,6 +10414,8 @@ spec:
  description: The name of the bucket
  minLength: 1
  type: string
+ caCertFilePath:
+ type: string
  endpointURL:
  description: The API endpoint URL.
  pattern: ^https?://.*

diff --git a/...ests/apiextensions.k8s.io_v1_customresourcedefinition_backuppolicies.moco.cybozu.com.yaml b/...ests/apiextensions.k8s.io_v1_customresourcedefinition_backuppolicies.moco.cybozu.com.yaml
@@ -460,6 +460,8 @@ spec:
  description: The name of the bucket
  minLength: 1
  type: string
+ caCertFilePath:
+ type: string
  endpointURL:
  description: The API endpoint URL.
  pattern: ^https?://.*
@@ -2630,6 +2632,8 @@ spec:
  description: The name of the bucket
  minLength: 1
  type: string
+ caCertFilePath:
+ type: string
  endpointURL:
  description: The API endpoint URL.
  pattern: ^https?://.*

diff --git a/...tests/apiextensions.k8s.io_v1_customresourcedefinition_mysqlclusters.moco.cybozu.com.yaml b/...tests/apiextensions.k8s.io_v1_customresourcedefinition_mysqlclusters.moco.cybozu.com.yaml
@@ -4008,6 +4008,8 @@ spec:
  description: The name of the bucket
  minLength: 1
  type: string
+ caCertFilePath:
+ type: string
  endpointURL:
  description: The API endpoint URL.
  pattern: ^https?://.*
@@ -10422,6 +10424,8 @@ spec:
  description: The name of the bucket
  minLength: 1
  type: string
+ caCertFilePath:
+ type: string
  endpointURL:
  description: The API endpoint URL.
  pattern: ^https?://.*

diff --git a/controllers/mysqlcluster_controller.go b/controllers/mysqlcluster_controller.go
@@ -1112,6 +1112,9 @@ func bucketArgs(bc mocov1beta2.BucketConfig) []string {
  if bc.BackendType != "" {
  args = append(args, "--backend-type="+bc.BackendType)
  }
+ if bc.CaCertFilePath != "" {
+ args = append(args, "--ca-cert-file-path="+bc.CaCertFilePath)
+ }
 
  return append(args, bc.BucketName)
 }

diff --git a/docs/crd_backuppolicy_v1beta1.md b/docs/crd_backuppolicy_v1beta1.md
@@ -60,6 +60,7 @@ BucketConfig is a set of parameter to access an object storage bucket.
 | endpointURL | The API endpoint URL. Set this for non-S3 object storages. | string | false |
 | usePathStyle | Allows you to enable the client to use path-style addressing, i.e., https?://ENDPOINT/BUCKET/KEY. By default, a virtual-host addressing is used (https?://BUCKET.ENDPOINT/KEY). | bool | false |
 | backendType | BackendType is an identifier for the object storage to be used. | string | false |
+| caCertFilePath | | string | false |
 
 [Back to Custom Resources](#custom-resources)
 

diff --git a/docs/crd_backuppolicy_v1beta2.md b/docs/crd_backuppolicy_v1beta2.md
@@ -60,6 +60,7 @@ BucketConfig is a set of parameter to access an object storage bucket.
 | endpointURL | The API endpoint URL. Set this for non-S3 object storages. | string | false |
 | usePathStyle | Allows you to enable the client to use path-style addressing, i.e., https?://ENDPOINT/BUCKET/KEY. By default, a virtual-host addressing is used (https?://BUCKET.ENDPOINT/KEY). | bool | false |
 | backendType | BackendType is an identifier for the object storage to be used. | string | false |
+| caCertFilePath | | string | false |
 
 [Back to Custom Resources](#custom-resources)
 

diff --git a/docs/crd_mysqlcluster_v1beta1.md b/docs/crd_mysqlcluster_v1beta1.md
@@ -181,6 +181,7 @@ BucketConfig is a set of parameter to access an object storage bucket.
 | endpointURL | The API endpoint URL. Set this for non-S3 object storages. | string | false |
 | usePathStyle | Allows you to enable the client to use path-style addressing, i.e., https?://ENDPOINT/BUCKET/KEY. By default, a virtual-host addressing is used (https?://BUCKET.ENDPOINT/KEY). | bool | false |
 | backendType | BackendType is an identifier for the object storage to be used. | string | false |
+| caCertFilePath | | string | false |
 
 [Back to Custom Resources](#custom-resources)
 

diff --git a/docs/crd_mysqlcluster_v1beta2.md b/docs/crd_mysqlcluster_v1beta2.md
@@ -195,6 +195,7 @@ BucketConfig is a set of parameter to access an object storage bucket.
 | endpointURL | The API endpoint URL. Set this for non-S3 object storages. | string | false |
 | usePathStyle | Allows you to enable the client to use path-style addressing, i.e., https?://ENDPOINT/BUCKET/KEY. By default, a virtual-host addressing is used (https?://BUCKET.ENDPOINT/KEY). | bool | false |
 | backendType | BackendType is an identifier for the object storage to be used. | string | false |
+| caCertFilePath | | string | false |
 
 [Back to Custom Resources](#custom-resources)