Merge branch 'master' into deps/5a89a91-3b3d888

.custom_sources.yml

@@ -22,6 +22,9 @@ gitlab-pages:
 gitlab-exporter:
   remote: "git@dev.gitlab.org:gitlab-org/gitlab-exporter.git"
   alternative: "https://gitlab.com/gitlab-org/gitlab-exporter.git"
+gitlab-kas:
+  remote: "git@dev.gitlab.org:gitlab/gitlab-agent.git"
+  alternative: "https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent.git"
 docker-distribution-pruner:
   remote: "git@dev.gitlab.org:gitlab/docker-distribution-pruner.git"
   alternative: "https://gitlab.com/gitlab-org/docker-distribution-pruner.git"

.gitlab-ci.yml

@@ -50,7 +50,7 @@ variables:
   # will use images from that registry and not depend on GitLab.com
   BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
   PUBLIC_BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
-  BUILDER_IMAGE_REVISION: "0.0.72"
+  BUILDER_IMAGE_REVISION: "0.0.73"
   # The registry to pull the assets image from
   ASSET_REGISTRY: "${CI_REGISTRY}"
   ASSET_SYNC_EXISTING_REMOTE_FILES: "keep"
@@ -64,7 +64,7 @@ variables:
   AUTO_DEPLOY_TAG_REGEX: '^\d+\.\d+\.\d+\+[^ ]{7,}\.[^ ]{7,}$'
   # Default environment for auto-deploy
   AUTO_DEPLOY_ENVIRONMENT: 'pre'
-  MAX_PACKAGE_SIZE_MB: "850"
+  MAX_PACKAGE_SIZE_MB: "860"
   OMNIBUS_GITLAB_MIRROR_ID: "14588374"
 ### For services that need a docker daemon
@@ -161,7 +161,7 @@ include:
 .notify:
   before_script:
-    - apk update && apk add git curl bash
+    - apk add --no-cache curl
   image: "alpine"
   stage: notification_fail

.gitlab/merge_request_templates/General Change.md

@@ -18,7 +18,7 @@ For anything in this list which will not be completed, please provide a reason i
 - [ ] Merge Request Title, and Description are up to date, accurate, and descriptive
 - [ ] MR targeting the appropriate branch
 - [ ] MR has a green pipeline on GitLab.com
-- [ ] Pipeline is green on dev.gitlab.org if the change is touching anything besides documentation or internal cookbooks
+- [ ] Pipeline is green on the [dev.gitlab.org](https://dev.gitlab.org/gitlab/omnibus-gitlab/-/pipelines) mirror for this branch if the change is touching anything besides documentation or internal cookbooks
 - [ ] `trigger-package` has a green pipeline running against latest commit
 ### Expected (please provide an explanation if not completing)

.markdownlint.json

@@ -45,9 +45,11 @@
       "Debian",
       "DevOps",
       "Docker",
+      "DockerSlim",
       "Elasticsearch",
       "Facebook",
       "fastlane",
+      "fluent-plugin-redis-slowlog",
       "GDK",
       "Geo",
       "Git LFS",

CHANGELOG.md

@@ -3,6 +3,24 @@
 The latest version of this file can be found at the master branch of the
 omnibus-gitlab repository.
+## 13.4.4 (2020-10-15)
+
+### Fixed (1 change)
+
+- Force install PrettyTable 0.7. !4628
+
+
+## 13.4.3 (2020-10-06)
+
+- No changes.
+
+## 13.4.2 (2020-10-01)
+
+### Security (1 change)
+
+- Add config for remove unaccepted member invites cron worker.
+
+
 ## 13.4.1 (2020-09-24)
 - No changes.

GITLAB_KAS_VERSION

+0.0.6

Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 require_relative "lib/gitlab/version"
-omnibus_gem_version = Gitlab::Version.new('omnibus', "7.0.10.01")
+omnibus_gem_version = Gitlab::Version.new('omnibus', "7.0.10.02")
 # Note that omnibus is from a fork with additional gitlab changes.  You can
 # check what they are with the following comparison link:
@@ -21,7 +21,7 @@ omnibus_gem_version = Gitlab::Version.new('omnibus', "7.0.10.01")
 #    definitions in `config/software`.  You can find them quickly with:
 #      grep "gem 'install " config/software/*
 gem 'omnibus', git: omnibus_gem_version.remote, tag: omnibus_gem_version.print(false)
-gem 'chef', '~> 15.12.22'
+gem 'chef', '~> 15.14.0'
 gem 'ohai', '~> 15.12.0'
 gem 'package_cloud'
 gem 'rainbow', '~> 2.2' # This is used by gitlab-ctl and the chef formatter

Gemfile.lock

 GIT
   remote: https://dev.gitlab.org/gitlab/omnibus.git
-  revision: 81221aa3b263e717f5fcb57959aa9c8425126d29
-  tag: 7.0.10.01
+  revision: c33184c00a1774f8350f0f1d8cbce35b99a82fd1
+  tag: 7.0.10.02
   specs:
     omnibus (7.0.10)
       aws-sdk-s3 (~> 1)
@@ -47,12 +47,12 @@ GEM
     binding_ninja (0.2.3)
     builder (3.2.4)
     byebug (9.0.5)
-    chef (15.12.22)
+    chef (15.14.0)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.12.22)
-      chef-utils (= 15.12.22)
+      chef-config (= 15.14.0)
+      chef-utils (= 15.14.0)
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
@@ -92,16 +92,16 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
       paint (>= 1, < 3)
       solve (> 2.0, < 5.0)
-    chef-config (15.12.22)
+    chef-config (15.14.0)
       addressable
-      chef-utils (= 15.12.22)
+      chef-utils (= 15.14.0)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
     chef-sugar (5.1.9)
-    chef-utils (15.12.22)
-    chef-zero (15.0.0)
+    chef-utils (15.14.0)
+    chef-zero (15.0.3)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 5.0)
       mixlib-log (>= 2.0, < 4.0)
@@ -141,7 +141,7 @@ GEM
     fauxhai-ng (8.2.0)
       net-ssh
     ffi (1.13.1)
-    ffi-libarchive (1.0.3)
+    ffi-libarchive (1.0.4)
       ffi (~> 1.0)
     ffi-yajl (2.3.3)
       libyajl2 (~> 1.2)
@@ -225,7 +225,7 @@ GEM
     minitar (0.9)
     mixlib-archive (1.0.5)
       mixlib-log
-    mixlib-authentication (3.0.6)
+    mixlib-authentication (3.0.7)
     mixlib-cli (2.1.6)
     mixlib-config (3.0.6)
       tomlrb
@@ -367,15 +367,16 @@ GEM
     toml-rb (2.0.1)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.3.0)
-    train-core (3.3.6)
+    train-core (3.3.24)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 4.0)
       net-ssh (>= 2.9, < 7.0)
-    train-winrm (0.2.6)
+    train-winrm (0.2.11)
       winrm (~> 2.0)
+      winrm-elevated (~> 1.2.2)
       winrm-fs (~> 1.0)
     tty-box (0.5.0)
       pastel (~> 0.7.2)
@@ -416,7 +417,11 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-fs (1.3.4)
+    winrm-elevated (1.2.2)
+      erubi (~> 1.8)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    winrm-fs (1.3.5)
       erubi (~> 1.8)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 2.0)
@@ -430,7 +435,7 @@ PLATFORMS
 DEPENDENCIES
   byebug
-  chef (~> 15.12.22)
+  chef (~> 15.14.0)
   chefspec
   docker-api
   fantaskspec

changelogs/unreleased/3970-docker-assets-download-package-should-fail-when-package-is-not-found.yml

+---
+title: Error during docker build on package download failure
+merge_request: 4641
+author:
+type: fixed

changelogs/unreleased/4019-version-manifest-information.yml

+---
+title: Specify display_version for sofware without proper version string
+merge_request: 4622
+author:
+type: added

changelogs/unreleased/4589.yml

+---
+title: Explicitly set group for repositories_storages and improve manage-storage-directories tests
+merge_request: 4589
+author: Ben Bodenmiller (@bbodenmiller)
+type: other

changelogs/unreleased/4594.yml

+---
+title: Remove EE only note for packages in gitlab.yml.erb
+merge_request: 4594
+author: Ben Bodenmiller (@bbodenmiller)
+type: fixed

changelogs/unreleased/5384-poc-allow-promotion-task-to-alter-geo-node-configuration.yml

+---
+title: Allow promotion task to alter Geo node configuration
+merge_request: 4609
+author:
+type: added

changelogs/unreleased/5423-patroni-pg-upgrade-fix.yml

+---
+title: Configure pg-upgrade to work with patroni service
+merge_request: 4529
+author:
+type: fixed

changelogs/unreleased/5570-puma-socket-configuration-option-needs-to-also-reconfigure-workhorse.yml

+---
+title: Update workhorse auth socket when puma uses custom socket
+merge_request: 4620
+author:
+type: fixed

changelogs/unreleased/5610-migrations-can-silently-fail-during-deployments.yml

+---
+title: Exit non-zero during upgrade if reconfigure fails
+merge_request: 4591
+author:
+type: fixed

changelogs/unreleased/5614-centos-6-deprecation.yml

+---
+title: Add deprecation warning for CentOS 6
+merge_request: 4596
+author:
+type: deprecated

changelogs/unreleased/5662-support-revert-pg-upgrade-for-patroni-cluster-nodes.yml

+---
+title: Support revert-pg-upgrade for Patroni cluster nodes
+merge_request: 4611
+author:
+type: added

changelogs/unreleased/5664-geo-upgrade-disk-space-check.yml

+---
+title: Support geo data dir for pg-upgrade
+merge_request: 4603
+author:
+type: fixed

changelogs/unreleased/5672-consolidated-form-for-object-storage-does-not-work-in-docker-install-of-gitlab.yml

+---
+title: Fix onsolidated form object storage configuration template
+merge_request: 4656
+author:
+type: fixed