Commit ca51c7e6 authored by Thong Kuah's avatar Thong Kuah

Use GitLab's copy of Helm stable repo

As the Helm stable repo is going away soon, we use an archive for GitLab
instead.
parent e7655a30
......@@ -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
......
......@@ -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,
......
......@@ -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,
......
---
title: "GitLab-managed apps: Use GitLab's repo as replacement for the Helm stable repo"
merge_request: 44875
author:
type: other
......@@ -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
......
......@@ -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)
......
......@@ -152,7 +152,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('10.4.1')
expect(subject).to be_rbac
expect(subject.files).to eq(prometheus.files)
......@@ -240,7 +240,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('10.4.1')
expect(patch_command.files).to eq(prometheus.files)
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment