diff --git a/charts/library/common-test/tests/volsync/replication_dest_spec_test.yaml b/charts/library/common-test/tests/volsync/replication_dest_spec_test.yaml index 85b1fe49500..3a653db94af 100644 --- a/charts/library/common-test/tests/volsync/replication_dest_spec_test.yaml +++ b/charts/library/common-test/tests/volsync/replication_dest_spec_test.yaml @@ -25,7 +25,7 @@ tests: credentials: &credentials mys3: type: s3 - url: http://some-url + url: https://s3.some-url bucket: some-bucket encrKey: some-key accessKey: some-access-key @@ -48,7 +48,7 @@ tests: AWS_ACCESS_KEY_ID: some-access-key AWS_SECRET_ACCESS_KEY: some-secret-key RESTIC_PASSWORD: some-key - RESTIC_REPOSITORY: s3:some-url/some-bucket/test-release-name/volsync/destbackup-volsync-mybackup1 + RESTIC_REPOSITORY: s3:s3.some-url/some-bucket/test-release-name/volsync/destbackup-volsync-mybackup1 - documentIndex: &replicationDestDoc 1 isKind: of: ReplicationDestination diff --git a/charts/library/common-test/tests/volsync/replication_src_spec_test.yaml b/charts/library/common-test/tests/volsync/replication_src_spec_test.yaml index 60185a7fc19..6290bbfb503 100644 --- a/charts/library/common-test/tests/volsync/replication_src_spec_test.yaml +++ b/charts/library/common-test/tests/volsync/replication_src_spec_test.yaml @@ -44,7 +44,7 @@ tests: AWS_ACCESS_KEY_ID: some-access-key AWS_SECRET_ACCESS_KEY: some-secret-key RESTIC_PASSWORD: some-key - RESTIC_REPOSITORY: s3:some-url/some-bucket/test-release-name/volsync/srcbackup-volsync-mybackup1 + RESTIC_REPOSITORY: s3:http://some-url/some-bucket/test-release-name/volsync/srcbackup-volsync-mybackup1 - documentIndex: &replicationDestDoc 1 isKind: of: ReplicationSource diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml index 8f4f19c5d4b..7e05db6695e 100644 --- a/charts/library/common/Chart.yaml +++ b/charts/library/common/Chart.yaml @@ -48,4 +48,4 @@ sources: - https://hub.docker.com/_/ - https://hub.docker.com/r/mikefarah/yq type: library -version: 25.2.3 +version: 25.2.4 diff --git a/charts/library/common/templates/spawner/_pvc.tpl b/charts/library/common/templates/spawner/_pvc.tpl index fc8af8c367d..b4b3b060b4d 100644 --- a/charts/library/common/templates/spawner/_pvc.tpl +++ b/charts/library/common/templates/spawner/_pvc.tpl @@ -102,7 +102,11 @@ {{- $credentials := get $.Values.credentials $volsync.credentials -}} - {{- $url := $credentials.url | replace "http://" "" | replace "https://" "" -}} + {{/* Only amazon needs the https:// trimmed, anything else requires it */}} + {{- $url := $credentials.url -}} + {{- if hasPrefix "https://s3." $url -}} + {{- $url = trimPrefix "https://" $url -}} + {{- end -}} {{- $baseRepo := printf "s3:%s/%s" $url $credentials.bucket -}} {{- $repoSuffix := printf "%s/volsync/%s-volsync-%s" $.Release.Name $objectData.shortName $volsyncData.name -}}