Add latest changes from gitlab-org/gitlab@13-3-stable-ee

9 files changed, 27 insertions, 7 deletions

diff --git a/app/models/clusters/applications/fluentd.rb b/app/models/clusters/applications/fluentd.rb
index 3fd6e870edc..c608d37be77 100644
--- a/app/models/clusters/applications/fluentd.rb
+++ b/app/models/clusters/applications/fluentd.rb
@@ -22,7 +22,11 @@ module Clusters
       validate :has_at_least_one_log_enabled?
 
       def chart
-        'stable/fluentd'
+        'fluentd/fluentd'
+      end
+
+      def repository
+        'https://gitlab-org.gitlab.io/cluster-integration/helm-stable-archive'
       end
 
       def install_command
diff --git a/app/models/clusters/applications/ingress.rb b/app/models/clusters/applications/ingress.rb
index 1d08f38a2f1..d5412714858 100644
--- a/app/models/clusters/applications/ingress.rb
+++ b/app/models/clusters/applications/ingress.rb
@@ -46,7 +46,11 @@ module Clusters
       end
 
       def chart
-        'stable/nginx-ingress'
+        "#{name}/nginx-ingress"
+      end
+
+      def repository
+        'https://gitlab-org.gitlab.io/cluster-integration/helm-stable-archive'
       end
 
       def values
@@ -60,6 +64,7 @@ module Clusters
       def install_command
         Gitlab::Kubernetes::Helm::InstallCommand.new(
           name: name,
+          repository: repository,
           version: VERSION,
           rbac: cluster.platform_kubernetes_rbac?,
           chart: chart,
diff --git a/app/models/clusters/applications/prometheus.rb b/app/models/clusters/applications/prometheus.rb
index 216bbbc1c5a..ae702a1ea7f 100644
--- a/app/models/clusters/applications/prometheus.rb
+++ b/app/models/clusters/applications/prometheus.rb
@@ -51,7 +51,11 @@ module Clusters
       end
 
       def chart
-        'stable/prometheus'
+        "#{name}/prometheus"
+      end
+
+      def repository
+        'https://gitlab-org.gitlab.io/cluster-integration/helm-stable-archive'
       end
 
       def service_name
@@ -65,6 +69,7 @@ module Clusters
       def install_command
         Gitlab::Kubernetes::Helm::InstallCommand.new(
           name: name,
+          repository: repository,
           version: VERSION,
           rbac: cluster.platform_kubernetes_rbac?,
           chart: chart,
@@ -76,6 +81,7 @@ module Clusters
       def patch_command(values)
         ::Gitlab::Kubernetes::Helm::PatchCommand.new(
           name: name,
+          repository: repository,
           version: version,
           rbac: cluster.platform_kubernetes_rbac?,
           chart: chart,
diff --git a/changelogs/unreleased/use_mirror_of_helm_stable_repo.yml b/changelogs/unreleased/use_mirror_of_helm_stable_repo.yml
new file mode 100644
index 00000000000..479ed48ce89
--- /dev/null
+++ b/changelogs/unreleased/use_mirror_of_helm_stable_repo.yml
@@ -0,0 +1,5 @@
+---
+title: "GitLab-managed apps: Use GitLab's repo as replacement for the Helm stable repo"
+merge_request: 44875
+author:
+type: other
diff --git a/spec/models/clusters/applications/fluentd_spec.rb b/spec/models/clusters/applications/fluentd_spec.rb
index be7b4a87947..3bda3e99ec1 100644
--- a/spec/models/clusters/applications/fluentd_spec.rb
+++ b/spec/models/clusters/applications/fluentd_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe Clusters::Applications::Fluentd do
 
     it 'is initialized with fluentd arguments' do
       expect(subject.name).to eq('fluentd')
-      expect(subject.chart).to eq('stable/fluentd')
+      expect(subject.chart).to eq('fluentd/fluentd')
       expect(subject.version).to eq('2.4.0')
       expect(subject).to be_rbac
     end
diff --git a/spec/models/clusters/applications/ingress_spec.rb b/spec/models/clusters/applications/ingress_spec.rb
index e029283326f..196d57aff7b 100644
--- a/spec/models/clusters/applications/ingress_spec.rb
+++ b/spec/models/clusters/applications/ingress_spec.rb
@@ -135,7 +135,7 @@ RSpec.describe Clusters::Applications::Ingress do
 
     it 'is initialized with ingress arguments' do
       expect(subject.name).to eq('ingress')
-      expect(subject.chart).to eq('stable/nginx-ingress')
+      expect(subject.chart).to eq('ingress/nginx-ingress')
       expect(subject.version).to eq('1.40.2')
       expect(subject).to be_rbac
       expect(subject.files).to eq(ingress.files)
diff --git a/spec/models/clusters/applications/prometheus_spec.rb b/spec/models/clusters/applications/prometheus_spec.rb
index 1215b38a9a2..d037009994b 100644
--- a/spec/models/clusters/applications/prometheus_spec.rb
+++ b/spec/models/clusters/applications/prometheus_spec.rb
@@ -149,7 +149,7 @@ RSpec.describe Clusters::Applications::Prometheus do
 
     it 'is initialized with 3 arguments' do
       expect(subject.name).to eq('prometheus')
-      expect(subject.chart).to eq('stable/prometheus')
+      expect(subject.chart).to eq('prometheus/prometheus')
       expect(subject.version).to eq('9.5.2')
       expect(subject).to be_rbac
       expect(subject.files).to eq(prometheus.files)
@@ -237,7 +237,7 @@ RSpec.describe Clusters::Applications::Prometheus do
 
     it 'is initialized with 3 arguments' do
       expect(patch_command.name).to eq('prometheus')
-      expect(patch_command.chart).to eq('stable/prometheus')
+      expect(patch_command.chart).to eq('prometheus/prometheus')
       expect(patch_command.version).to eq('9.5.2')
       expect(patch_command.files).to eq(prometheus.files)
     end
diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore
index 259148fa18f..259148fa18f 100755..100644
--- a/vendor/gitignore/C++.gitignore
+++ b/vendor/gitignore/C++.gitignore
diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore
index a1c2a238a96..a1c2a238a96 100755..100644
--- a/vendor/gitignore/Java.gitignore
+++ b/vendor/gitignore/Java.gitignore