Skip to content

Commit ee274af

Browse files
1gtm1gtm
authored
Add support Disabling TLS Certificate Verification for Secure S3 Storage (#1242) (#1249)
Signed-off-by: Anisur Rahman <anisur@appscode.com>
1 parent f9c2bb7 commit ee274af

File tree

19 files changed

+177
-60
lines changed

19 files changed

+177
-60
lines changed

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
kmodules.xyz/client-go v0.29.4
1717
kmodules.xyz/custom-resources v0.29.0
1818
kmodules.xyz/offshoot-api v0.29.0
19-
stash.appscode.dev/apimachinery v0.32.1-0.20240101013736-ef308633d8b2
19+
stash.appscode.dev/apimachinery v0.32.1-0.20240206075719-41610d0ce38f
2020
)
2121

2222
require (
@@ -83,7 +83,7 @@ require (
8383
k8s.io/kube-openapi v0.0.0-20231129212854-f0671cc7e66a // indirect
8484
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
8585
kmodules.xyz/apiversion v0.2.0 // indirect
86-
kmodules.xyz/objectstore-api v0.29.0 // indirect
86+
kmodules.xyz/objectstore-api v0.29.1-0.20240205052451-a5cf0aa669f1 // indirect
8787
kmodules.xyz/prober v0.29.0 // indirect
8888
sigs.k8s.io/controller-runtime v0.16.3 // indirect
8989
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -543,8 +543,8 @@ kmodules.xyz/client-go v0.29.4 h1:WW4vlYtzLc9JXrJjcFuJO4DX/kIZ5ia7QtDyhNDUwfI=
543543
kmodules.xyz/client-go v0.29.4/go.mod h1:xWlS/1zWkx1sIKCAkzULy9570mHZYi2exDECEoP1ek4=
544544
kmodules.xyz/custom-resources v0.29.0 h1:RaDM2+wSVXiwIvLqmkTVYpwoH83AC8wruXe2p2rOZNY=
545545
kmodules.xyz/custom-resources v0.29.0/go.mod h1:MzZyXtxdg1PDxGk3RTTO1Xv3KiVqZnIonSwmxVbagOY=
546-
kmodules.xyz/objectstore-api v0.29.0 h1:dK53fQXdoboyW/EyBBAMjykT8u7jstKrM1DS4RJvhEU=
547-
kmodules.xyz/objectstore-api v0.29.0/go.mod h1:Kxmv6F7Kd/7EoKX3X2xIzhHT++zlj2qdXLcp/8avUYI=
546+
kmodules.xyz/objectstore-api v0.29.1-0.20240205052451-a5cf0aa669f1 h1:k66vcGkx9SNka0tfmbeBiEgwj1E2+EKJHxnifOUsroA=
547+
kmodules.xyz/objectstore-api v0.29.1-0.20240205052451-a5cf0aa669f1/go.mod h1:Kxmv6F7Kd/7EoKX3X2xIzhHT++zlj2qdXLcp/8avUYI=
548548
kmodules.xyz/offshoot-api v0.29.0 h1:GHLhxxT9jU1N8+FvOCCeJNyU5g0duYS46UGrs6AHNLY=
549549
kmodules.xyz/offshoot-api v0.29.0/go.mod h1:5NxhBblXoDHWStx9HCDJR2KFTwYjEZ7i1Id3jelIunw=
550550
kmodules.xyz/prober v0.29.0 h1:Ex7m4F9rH7uWNNJlLgP63ROOM+nUATJkC2L5OQ7nwMg=
@@ -556,5 +556,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+s
556556
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
557557
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
558558
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
559-
stash.appscode.dev/apimachinery v0.32.1-0.20240101013736-ef308633d8b2 h1:dePrbjp7o57sKe33K1ppaWQK/Ely4QgxmCcab0sDOpY=
560-
stash.appscode.dev/apimachinery v0.32.1-0.20240101013736-ef308633d8b2/go.mod h1:hTslVqyx20fF2i2s/m0rqXD+pZwnI2oG3k5zPzsDnXQ=
559+
stash.appscode.dev/apimachinery v0.32.1-0.20240206075719-41610d0ce38f h1:0B35Biy3T5cNWlfMKr2LPgDaXv6C7IeDBYHOeqBaLko=
560+
stash.appscode.dev/apimachinery v0.32.1-0.20240206075719-41610d0ce38f/go.mod h1:5ZunLyvEChKp4LpPJq8mTKQss3bsT93S/Tqu9BRvQTA=

‎pkg/backup.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ func NewCmdBackup() *cobra.Command {
129129
cmd.Flags().StringVar(&opt.setupOptions.Provider, "provider", opt.setupOptions.Provider, "Backend provider (i.e. gcs, s3, azure etc)")
130130
cmd.Flags().StringVar(&opt.setupOptions.Bucket, "bucket", opt.setupOptions.Bucket, "Name of the cloud bucket/container (keep empty for local backend)")
131131
cmd.Flags().StringVar(&opt.setupOptions.Endpoint, "endpoint", opt.setupOptions.Endpoint, "Endpoint for s3/s3 compatible backend or REST server URL")
132+
cmd.Flags().BoolVar(&opt.setupOptions.InsecureTLS, "insecure-tls", opt.setupOptions.InsecureTLS, "InsecureTLS for TLS secure s3/s3 compatible backend")
132133
cmd.Flags().StringVar(&opt.setupOptions.Region, "region", opt.setupOptions.Region, "Region for s3/s3 compatible backend")
133134
cmd.Flags().StringVar(&opt.setupOptions.Path, "path", opt.setupOptions.Path, "Directory inside the bucket where backup will be stored")
134135
cmd.Flags().StringVar(&opt.setupOptions.ScratchDir, "scratch-dir", opt.setupOptions.ScratchDir, "Temporary directory")

‎pkg/restore.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ func NewCmdRestore() *cobra.Command {
120120
cmd.Flags().StringVar(&opt.setupOptions.Provider, "provider", opt.setupOptions.Provider, "Backend provider (i.e. gcs, s3, azure etc)")
121121
cmd.Flags().StringVar(&opt.setupOptions.Bucket, "bucket", opt.setupOptions.Bucket, "Name of the cloud bucket/container (keep empty for local backend)")
122122
cmd.Flags().StringVar(&opt.setupOptions.Endpoint, "endpoint", opt.setupOptions.Endpoint, "Endpoint for s3/s3 compatible backend or REST server URL")
123+
cmd.Flags().BoolVar(&opt.setupOptions.InsecureTLS, "insecure-tls", opt.setupOptions.InsecureTLS, "InsecureTLS for TLS secure s3/s3 compatible backend")
123124
cmd.Flags().StringVar(&opt.setupOptions.Region, "region", opt.setupOptions.Region, "Region for s3/s3 compatible backend")
124125
cmd.Flags().StringVar(&opt.setupOptions.Path, "path", opt.setupOptions.Path, "Directory inside the bucket where backup will be stored")
125126
cmd.Flags().StringVar(&opt.setupOptions.ScratchDir, "scratch-dir", opt.setupOptions.ScratchDir, "Temporary directory")

‎vendor/kmodules.xyz/objectstore-api/api/v1/generated.pb.go

Lines changed: 78 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/kmodules.xyz/objectstore-api/api/v1/generated.proto

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/kmodules.xyz/objectstore-api/api/v1/openapi_generated.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/kmodules.xyz/objectstore-api/api/v1/types.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,11 @@ type LocalSpec struct {
9898
}
9999

100100
type S3Spec struct {
101-
Endpoint string `json:"endpoint" protobuf:"bytes,1,opt,name=endpoint"`
102-
Bucket string `json:"bucket" protobuf:"bytes,2,opt,name=bucket"`
103-
Prefix string `json:"prefix,omitempty" protobuf:"bytes,3,opt,name=prefix"`
104-
Region string `json:"region,omitempty" protobuf:"bytes,4,opt,name=region"`
101+
Endpoint string `json:"endpoint" protobuf:"bytes,1,opt,name=endpoint"`
102+
Bucket string `json:"bucket" protobuf:"bytes,2,opt,name=bucket"`
103+
Prefix string `json:"prefix,omitempty" protobuf:"bytes,3,opt,name=prefix"`
104+
Region string `json:"region,omitempty" protobuf:"bytes,4,opt,name=region"`
105+
InsecureTLS bool `json:"insecureTLS,omitempty" protobuf:"varint,5,opt,name=insecureTLS"`
105106
}
106107

107108
type GCSSpec struct {

‎vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ kmodules.xyz/custom-resources/client/clientset/versioned/typed/appcatalog/v1alph
671671
kmodules.xyz/custom-resources/client/clientset/versioned/typed/auditor/v1alpha1
672672
kmodules.xyz/custom-resources/client/clientset/versioned/typed/metrics/v1alpha1
673673
kmodules.xyz/custom-resources/crds
674-
# kmodules.xyz/objectstore-api v0.29.0
674+
# kmodules.xyz/objectstore-api v0.29.1-0.20240205052451-a5cf0aa669f1
675675
## explicit; go 1.21
676676
kmodules.xyz/objectstore-api/api/v1
677677
# kmodules.xyz/offshoot-api v0.29.0
@@ -701,7 +701,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
701701
## explicit; go 1.12
702702
sigs.k8s.io/yaml
703703
sigs.k8s.io/yaml/goyaml.v2
704-
# stash.appscode.dev/apimachinery v0.32.1-0.20240101013736-ef308633d8b2
704+
# stash.appscode.dev/apimachinery v0.32.1-0.20240206075719-41610d0ce38f
705705
## explicit; go 1.21.5
706706
stash.appscode.dev/apimachinery/apis
707707
stash.appscode.dev/apimachinery/apis/repositories

‎vendor/stash.appscode.dev/apimachinery/apis/constants.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ const (
7878
RepositoryPrefix = "REPOSITORY_PREFIX"
7979
RepositoryEndpoint = "REPOSITORY_ENDPOINT"
8080
RepositoryRegion = "REPOSITORY_REGION"
81+
RepositoryInsecureTLS = "REPOSITORY_INSECURE_TLS"
8182

8283
Hostname = "HOSTNAME"
8384
SourceHostname = "SOURCE_HOSTNAME"

0 commit comments

Comments
 (0)