From ad7f0b6bfe4da1e3eed426dd2a08164604ba2ec8 Mon Sep 17 00:00:00 2001 From: Mitchell Nielsen Date: Thu, 2 Sep 2021 18:24:08 -0500 Subject: [PATCH 1/3] Fix link to s3-compatible connection settings Fixes the link to the s3-compatible connection settings page. --- examples/objectstorage/rails.s3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/objectstorage/rails.s3.yaml b/examples/objectstorage/rails.s3.yaml index 83ad0a1e1d..22f7063937 100644 --- a/examples/objectstorage/rails.s3.yaml +++ b/examples/objectstorage/rails.s3.yaml @@ -9,7 +9,7 @@ region: us-east-1 aws_access_key_id: BOGUS_ACCESS_KEY aws_secret_access_key: BOGUS_SECRET_KEY # The below settings are for S3 compatible endpoints -# See https://docs.gitlab.com/ee/administration/job_artifacts.html#s3-compatible-connection-settings +# See https://docs.gitlab.com/ee/administration/object_storage.html#s3-compatible-connection-settings # aws_signature_version: 4 # host: storage.example.com # endpoint: "https://minio.example.com:9000" -- GitLab From a75f27f0c5bf73e53521b9bb5e99e1132c44522d Mon Sep 17 00:00:00 2001 From: Mitchell Nielsen Date: Thu, 2 Sep 2021 18:24:51 -0500 Subject: [PATCH 2/3] Uncomment `path_style` and set it to `true` Previously, `path_style` was left commented out and set to `false`. This aligns with what is suggested in https://docs.gitlab.com/ee/administration/object_storage.html#s3-compatible-connection-settings. However, leaving this as `false` seems to cause errors like: > getaddrinfo: Name or service not known (SocketError) There are a couple of issues that mention the fix is to set this to `true`: - https://gitlab.com/gitlab-org/gitlab/-/issues/231375 - https://gitlab.com/gitlab-org/gitlab/-/issues/5590 This solution also worked when testing https://gitlab.com/gitlab-org/cloud-native/gitlab-operator/-/merge_requests/214. --- examples/objectstorage/rails.s3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/objectstorage/rails.s3.yaml b/examples/objectstorage/rails.s3.yaml index 22f7063937..b445f5dec1 100644 --- a/examples/objectstorage/rails.s3.yaml +++ b/examples/objectstorage/rails.s3.yaml @@ -13,4 +13,4 @@ aws_secret_access_key: BOGUS_SECRET_KEY # aws_signature_version: 4 # host: storage.example.com # endpoint: "https://minio.example.com:9000" -# path_style: false +path_style: true -- GitLab From 0f9d8a59c03cd2e78a13162737a1b5a151e3bb1b Mon Sep 17 00:00:00 2001 From: Mitchell Nielsen Date: Fri, 3 Sep 2021 15:31:54 -0500 Subject: [PATCH 3/3] Revert "Uncomment `path_style` and set it to `true`" This reverts commit a75f27f0c5bf73e53521b9bb5e99e1132c44522d. --- examples/objectstorage/rails.s3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/objectstorage/rails.s3.yaml b/examples/objectstorage/rails.s3.yaml index b445f5dec1..22f7063937 100644 --- a/examples/objectstorage/rails.s3.yaml +++ b/examples/objectstorage/rails.s3.yaml @@ -13,4 +13,4 @@ aws_secret_access_key: BOGUS_SECRET_KEY # aws_signature_version: 4 # host: storage.example.com # endpoint: "https://minio.example.com:9000" -path_style: true +# path_style: false -- GitLab