Skip to content

Commit ffdfdda

Browse files
1gtmanisurrahman75
1gtm
and
anisurrahman75
authored
[cherry-pick] Add support Disabling TLS Certificate Verification for Secure S3 Storage (#1462) (#1475)
* Add support Disabling TLS Certificate Verification for Secure S3 Storage (#1462) /cherry-pick Signed-off-by: Anisur Rahman <anisur@appscode.com> * fix cherry-pick issue Signed-off-by: Anisur Rahman <anisur@appscode.com> --------- Signed-off-by: Anisur Rahman <anisur@appscode.com> Co-authored-by: Md. Anisur Rahman <54911684+anisurrahman75@users.noreply.github.com> Co-authored-by: Anisur Rahman <anisur@appscode.com>
1 parent d1d5985 commit ffdfdda

File tree

19 files changed

+162
-66
lines changed

19 files changed

+162
-66
lines changed

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
kubedb.dev/apimachinery v0.41.0
2020
kubedb.dev/db-client-go v0.0.11-0.20240208083800-50462091d436
2121
sigs.k8s.io/controller-runtime v0.17.0
22-
stash.appscode.dev/apimachinery v0.32.1-0.20240118085630-4c06ed8c04a7
22+
stash.appscode.dev/apimachinery v0.32.1-0.20240206075719-41610d0ce38f
2323
)
2424

2525
require (
@@ -98,7 +98,7 @@ require (
9898
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
9999
kmodules.xyz/apiversion v0.2.0 // indirect
100100
kmodules.xyz/monitoring-agent-api v0.29.0 // indirect
101-
kmodules.xyz/objectstore-api v0.29.0 // indirect
101+
kmodules.xyz/objectstore-api v0.29.1-0.20240205052451-a5cf0aa669f1 // indirect
102102
kmodules.xyz/prober v0.29.0 // indirect
103103
sigs.k8s.io/gateway-api v0.8.0 // indirect
104104
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
@@ -575,8 +575,8 @@ kmodules.xyz/custom-resources v0.29.1 h1:xiNylhs3ILRbcUhxxy306AOy9GMA4Mq7xFIptZK
575575
kmodules.xyz/custom-resources v0.29.1/go.mod h1:829zDY1EjaxPP52h1T73LZx/vgv8Pld9/uTT/ViZTc0=
576576
kmodules.xyz/monitoring-agent-api v0.29.0 h1:gpFl6OZrlMLb/ySMHdREI9EwGtnJ91oZBn9H1UFRwB4=
577577
kmodules.xyz/monitoring-agent-api v0.29.0/go.mod h1:iNbvaMTgVFOI5q2LJtGK91j4Dmjv4ZRiRdasGmWLKQI=
578-
kmodules.xyz/objectstore-api v0.29.0 h1:dK53fQXdoboyW/EyBBAMjykT8u7jstKrM1DS4RJvhEU=
579-
kmodules.xyz/objectstore-api v0.29.0/go.mod h1:Kxmv6F7Kd/7EoKX3X2xIzhHT++zlj2qdXLcp/8avUYI=
578+
kmodules.xyz/objectstore-api v0.29.1-0.20240205052451-a5cf0aa669f1 h1:k66vcGkx9SNka0tfmbeBiEgwj1E2+EKJHxnifOUsroA=
579+
kmodules.xyz/objectstore-api v0.29.1-0.20240205052451-a5cf0aa669f1/go.mod h1:Kxmv6F7Kd/7EoKX3X2xIzhHT++zlj2qdXLcp/8avUYI=
580580
kmodules.xyz/offshoot-api v0.29.0 h1:GHLhxxT9jU1N8+FvOCCeJNyU5g0duYS46UGrs6AHNLY=
581581
kmodules.xyz/offshoot-api v0.29.0/go.mod h1:5NxhBblXoDHWStx9HCDJR2KFTwYjEZ7i1Id3jelIunw=
582582
kmodules.xyz/prober v0.29.0 h1:Ex7m4F9rH7uWNNJlLgP63ROOM+nUATJkC2L5OQ7nwMg=
@@ -594,5 +594,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+s
594594
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
595595
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
596596
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
597-
stash.appscode.dev/apimachinery v0.32.1-0.20240118085630-4c06ed8c04a7 h1:Z1PXS2SjVX4J4Owv7HjJ7R/LOgnl3UQG9uhSfDBg2Zs=
598-
stash.appscode.dev/apimachinery v0.32.1-0.20240118085630-4c06ed8c04a7/go.mod h1:hTslVqyx20fF2i2s/m0rqXD+pZwnI2oG3k5zPzsDnXQ=
597+
stash.appscode.dev/apimachinery v0.32.1-0.20240206075719-41610d0ce38f h1:0B35Biy3T5cNWlfMKr2LPgDaXv6C7IeDBYHOeqBaLko=
598+
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
@@ -134,6 +134,7 @@ func NewCmdBackup() *cobra.Command {
134134
cmd.Flags().StringVar(&opt.setupOptions.Provider, "provider", opt.setupOptions.Provider, "Backend provider (i.e. gcs, s3, azure etc)")
135135
cmd.Flags().StringVar(&opt.setupOptions.Bucket, "bucket", opt.setupOptions.Bucket, "Name of the cloud bucket/container (keep empty for local backend)")
136136
cmd.Flags().StringVar(&opt.setupOptions.Endpoint, "endpoint", opt.setupOptions.Endpoint, "Endpoint for s3/s3 compatible backend or REST server URL")
137+
cmd.Flags().BoolVar(&opt.setupOptions.InsecureTLS, "insecure-tls", opt.setupOptions.InsecureTLS, "InsecureTLS for TLS secure s3/s3 compatible backend")
137138
cmd.Flags().StringVar(&opt.setupOptions.Region, "region", opt.setupOptions.Region, "Region for s3/s3 compatible backend")
138139
cmd.Flags().StringVar(&opt.setupOptions.Path, "path", opt.setupOptions.Path, "Directory inside the bucket where backup will be stored")
139140
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
@@ -123,6 +123,7 @@ func NewCmdRestore() *cobra.Command {
123123
cmd.Flags().StringVar(&opt.setupOptions.Provider, "provider", opt.setupOptions.Provider, "Backend provider (i.e. gcs, s3, azure etc)")
124124
cmd.Flags().StringVar(&opt.setupOptions.Bucket, "bucket", opt.setupOptions.Bucket, "Name of the cloud bucket/container (keep empty for local backend)")
125125
cmd.Flags().StringVar(&opt.setupOptions.Endpoint, "endpoint", opt.setupOptions.Endpoint, "Endpoint for s3/s3 compatible backend or REST server URL")
126+
cmd.Flags().BoolVar(&opt.setupOptions.InsecureTLS, "insecure-tls", opt.setupOptions.InsecureTLS, "InsecureTLS for TLS secure s3/s3 compatible backend")
126127
cmd.Flags().StringVar(&opt.setupOptions.Region, "region", opt.setupOptions.Region, "Region for s3/s3 compatible backend")
127128
cmd.Flags().StringVar(&opt.setupOptions.Path, "path", opt.setupOptions.Path, "Directory inside the bucket where backup will be stored")
128129
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
@@ -738,7 +738,7 @@ kmodules.xyz/custom-resources/crds
738738
# kmodules.xyz/monitoring-agent-api v0.29.0
739739
## explicit; go 1.21.5
740740
kmodules.xyz/monitoring-agent-api/api/v1
741-
# kmodules.xyz/objectstore-api v0.29.0
741+
# kmodules.xyz/objectstore-api v0.29.1-0.20240205052451-a5cf0aa669f1
742742
## explicit; go 1.21
743743
kmodules.xyz/objectstore-api/api/v1
744744
# kmodules.xyz/offshoot-api v0.29.0
@@ -823,7 +823,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
823823
## explicit; go 1.12
824824
sigs.k8s.io/yaml
825825
sigs.k8s.io/yaml/goyaml.v2
826-
# stash.appscode.dev/apimachinery v0.32.1-0.20240118085630-4c06ed8c04a7
826+
# stash.appscode.dev/apimachinery v0.32.1-0.20240206075719-41610d0ce38f
827827
## explicit; go 1.21.5
828828
stash.appscode.dev/apimachinery/apis
829829
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)