Sync config v15.0.0 : Remove direct_upload and background_upload

Also remove corresponding configuration parameters:
- GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD
- GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD
- GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD
- GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD
- GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD
- GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD
- GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD
- GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD

This is introduced with v15.0 release
See corresponding merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86905

Author: kkimurak

README.md

@@ -1026,14 +1026,6 @@ Enables Object Store for Artifacts that will be remote stored. Defaults to `fals
 
 Bucket name to store the artifacts. Defaults to `artifacts`
 
-##### `GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD`
-
-Set to true to enable direct upload of Artifacts without the need of local shared storage.  Defaults to `false`
-
-##### `GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD`
-
-Temporary option to limit automatic upload. Defaults to `false`
-
 ##### `GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD`
 
 Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false`
@@ -1102,10 +1094,6 @@ Enables Object Store for LFS that will be remote stored. Defaults to `false`
 
 Bucket name to store the LFS. Defaults to `lfs-object`
 
-##### `GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD`
-
-Temporary option to limit automatic upload. Defaults to `false`
-
 ##### `GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD`
 
 Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false`
@@ -1170,14 +1158,6 @@ Enables Object Store for Packages that will be remote stored. Defaults to `false
 
 Bucket name to store the packages. Defaults to `packages`
 
-##### `GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD`
-
-Set to true to enable direct upload of Packages without the need of local shared storage.  Defaults to `false`
-
-##### `GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD`
-
-Temporary option to limit automatic upload. Defaults to `false`
-
 ##### `GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD`
 
 Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false`
@@ -1294,10 +1274,6 @@ Enables Object Store for UPLOADS that will be remote stored. Defaults to `false`
 
 Bucket name to store the UPLOADS. Defaults to `uploads`
 
-##### `GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD`
-
-Temporary option to limit automatic upload. Defaults to `false`
-
 ##### `GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD`
 
 Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false`

assets/runtime/config/gitlabhq/gitlab.yml

@@ -266,8 +266,6 @@ production: &base
     object_store:
       enabled: {{GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED}}
       remote_directory: {{GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name
-      direct_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD}} # Set to true to enable direct upload of Artifacts without the need of local shared storage.
-      background_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true)
       proxy_download: {{GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
       connection:
         provider: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER}} # Only AWS supported at the moment
@@ -296,7 +294,6 @@ production: &base
     # object_store:
     #   enabled: false
     #   remote_directory: external-diffs
-    #   background_upload: false
     #   proxy_download: false
     #   connection:
     #     provider: AWS
@@ -312,8 +309,6 @@ production: &base
     object_store:
       enabled: {{GITLAB_LFS_OBJECT_STORE_ENABLED}}
       remote_directory: {{GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY}} # Bucket name
-      direct_upload: {{GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD}} # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false)
-      background_upload: {{GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true)
       proxy_download: {{GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
       connection:
         provider: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER}}
@@ -346,8 +341,6 @@ production: &base
     object_store:
       enabled: {{GITLAB_UPLOADS_OBJECT_STORE_ENABLED}}
       remote_directory: {{GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY}} # Bucket name
-      direct_upload: {{GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD}} # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false)
-      background_upload: {{GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true)
       proxy_download: {{GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
       connection:
         provider: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER}}
@@ -374,8 +367,6 @@ production: &base
     object_store:
       enabled: {{GITLAB_PACKAGES_OBJECT_STORE_ENABLED}}
       remote_directory: {{GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name
-      direct_upload: {{GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD}} # Set to true to enable direct upload of Packages without the need of local shared storage.
-      background_upload: {{GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true)
       proxy_download: {{GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
       connection:
         provider: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER}} # Only AWS supported at the moment
@@ -403,8 +394,6 @@ production: &base
     object_store:
       enabled: false
       remote_directory: dependency_proxy # The bucket name
-      # direct_upload: false # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false)
-      # background_upload: false # Temporary option to limit automatic upload (Default: true)
       # proxy_download: false # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
       connection:
         provider: AWS
@@ -1326,7 +1315,6 @@ test:
     object_store:
       enabled: false
       remote_directory: artifacts # The bucket name
-      background_upload: false
       connection:
         provider: AWS # Only AWS supported at the moment
         aws_access_key_id: AWS_ACCESS_KEY_ID

assets/runtime/env-defaults

@@ -128,8 +128,6 @@ GITLAB_ARTIFACTS_DIR="${GITLAB_ARTIFACTS_DIR:-$GITLAB_SHARED_DIR/artifacts}"
 
 GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED=${GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED:-false}
 GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY:-artifacts}
-GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD=${GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD:-false}
-GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD=${GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD:-false}
 GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD=${GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD:-false}
 GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER:-$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER}
 
@@ -154,8 +152,6 @@ GITLAB_PACKAGES_DIR="${GITLAB_PACKAGES_DIR:-$GITLAB_SHARED_DIR/packages}"
 
 GITLAB_PACKAGES_OBJECT_STORE_ENABLED=${GITLAB_PACKAGES_OBJECT_STORE_ENABLED:-false}
 GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY:-packages}
-GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD=${GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD:-false}
-GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD=${GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD:-false}
 GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD=${GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD:-false}
 GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER:-$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER}
 
@@ -204,8 +200,6 @@ GITLAB_LFS_OBJECTS_DIR="${GITLAB_LFS_OBJECTS_DIR:-$GITLAB_SHARED_DIR/lfs-objects
 
 GITLAB_LFS_OBJECT_STORE_ENABLED=${GITLAB_LFS_OBJECT_STORE_ENABLED:-false}
 GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY:-lfs-objects}
-GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD=${GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD:-false}
-GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD=${GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD:-false}
 GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD=${GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD:-false}
 GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER:-$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER}
 
@@ -229,8 +223,6 @@ GITLAB_UPLOADS_BASE_DIR="${GITLAB_UPLOADS_BASE_DIR:-uploads/-/system}"
 
 GITLAB_UPLOADS_OBJECT_STORE_ENABLED=${GITLAB_UPLOADS_OBJECT_STORE_ENABLED:-false}
 GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY:-uploads}
-GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD=${GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD:-false}
-GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD=${GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD:-false}
 GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD=${GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD:-false}
 GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER:-$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER}
 

assets/runtime/functions

@@ -1016,8 +1016,6 @@ gitlab_configure_artifacts() {
 
     update_template ${GITLAB_CONFIG} \
       GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY \
-      GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD \
-      GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD \
       GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD \
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER \
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \
@@ -1063,8 +1061,6 @@ gitlab_configure_packages() {
 
     update_template ${GITLAB_CONFIG} \
       GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY \
-      GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD \
-      GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD \
       GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD \
       GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER \
       GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \
@@ -1152,8 +1148,6 @@ gitlab_configure_lfs() {
 
     update_template ${GITLAB_CONFIG} \
       GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY \
-      GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD \
-      GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD \
       GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD \
       GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER \
       GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \
@@ -1198,8 +1192,6 @@ gitlab_configure_uploads() {
 
     update_template ${GITLAB_CONFIG} \
       GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY \
-      GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD \
-      GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD \
       GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD \
       GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER \
       GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \