Commit 52587ff8 authored by Stan Hu's avatar Stan Hu

Merge branch 'update-helm-2-to-2-17-0' into 'master'

Update Helm 2 version to 2.17.0

See merge request gitlab-org/gitlab!50547
parents 6e5132d3 d80539c7
...@@ -18,7 +18,7 @@ module Clusters ...@@ -18,7 +18,7 @@ module Clusters
include ::Clusters::Concerns::ApplicationStatus include ::Clusters::Concerns::ApplicationStatus
include ::Gitlab::Utils::StrongMemoize include ::Gitlab::Utils::StrongMemoize
default_value_for :version, Gitlab::Kubernetes::Helm::HELM_VERSION default_value_for :version, Gitlab::Kubernetes::Helm::V2::BaseCommand::HELM_VERSION
before_create :create_keys_and_certs before_create :create_keys_and_certs
......
---
title: Update Helm 2 version to 2.17.0
merge_request: 50547
author:
type: fixed
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
module Gitlab module Gitlab
module Kubernetes module Kubernetes
module Helm module Helm
HELM_VERSION = '2.16.9'
KUBECTL_VERSION = '1.13.12' KUBECTL_VERSION = '1.13.12'
NAMESPACE = 'gitlab-managed-apps' NAMESPACE = 'gitlab-managed-apps'
NAMESPACE_LABELS = { 'app.gitlab.com/managed_by' => :gitlab }.freeze NAMESPACE_LABELS = { 'app.gitlab.com/managed_by' => :gitlab }.freeze
......
...@@ -7,7 +7,7 @@ module Gitlab ...@@ -7,7 +7,7 @@ module Gitlab
class BaseCommand class BaseCommand
attr_reader :name, :files attr_reader :name, :files
HELM_VERSION = '2.16.9' HELM_VERSION = '2.17.0'
def initialize(rbac:, name:, files:) def initialize(rbac:, name:, files:)
@rbac = rbac @rbac = rbac
......
...@@ -7,7 +7,7 @@ RSpec.describe Gitlab::Kubernetes::Helm::Pod do ...@@ -7,7 +7,7 @@ RSpec.describe Gitlab::Kubernetes::Helm::Pod do
using RSpec::Parameterized::TableSyntax using RSpec::Parameterized::TableSyntax
where(:helm_major_version, :expected_helm_version, :expected_command_env) do where(:helm_major_version, :expected_helm_version, :expected_command_env) do
2 | '2.16.9' | [:TILLER_NAMESPACE] 2 | '2.17.0' | [:TILLER_NAMESPACE]
3 | '3.2.4' | nil 3 | '3.2.4' | nil
end 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