diff options
| author | James Fargher <proglottis@gmail.com> | 2019-04-17 10:37:09 +1200 |
|---|---|---|
| committer | James Fargher <proglottis@gmail.com> | 2019-05-22 09:31:29 +0100 |
| commit | 44265276d0f5a9969b9fcadf9f13eadb7a37eb79 (patch) | |
| tree | 11654fedd5ebe3c72abb5163b452443ec9f55e2a | |
| parent | 4cf3a176da199b3f1fd874b3ba118e0ca2495939 (diff) | |
| download | gitlab-ce-glensc_helm-install-image.tar.gz | |
Try out helm install image with new install URLsglensc_helm-install-image
| -rw-r--r-- | lib/gitlab/kubernetes/helm/pod.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/kubernetes/helm/pod_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/kubernetes/helm/pod.rb b/lib/gitlab/kubernetes/helm/pod.rb index 75484f80070..436ab0affd5 100644 --- a/lib/gitlab/kubernetes/helm/pod.rb +++ b/lib/gitlab/kubernetes/helm/pod.rb @@ -27,7 +27,7 @@ module Gitlab def container_specification { name: 'helm', - image: "registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/#{Gitlab::Kubernetes::Helm::HELM_VERSION}-kube-#{Gitlab::Kubernetes::Helm::KUBECTL_VERSION}", + image: "registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/branches/glenc-k3s-for-specs:14aa347f80c1cb7f4a38476f1148c3010f827a46", env: generate_pod_env(command), command: %w(/bin/sh), args: %w(-c $(COMMAND_SCRIPT)) diff --git a/spec/lib/gitlab/kubernetes/helm/pod_spec.rb b/spec/lib/gitlab/kubernetes/helm/pod_spec.rb index 06c8d127951..fd9842de9a4 100644 --- a/spec/lib/gitlab/kubernetes/helm/pod_spec.rb +++ b/spec/lib/gitlab/kubernetes/helm/pod_spec.rb @@ -30,7 +30,7 @@ describe Gitlab::Kubernetes::Helm::Pod do it 'generates the appropriate specifications for the container' do container = subject.generate.spec.containers.first expect(container.name).to eq('helm') - expect(container.image).to eq('registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/2.12.3-kube-1.11.7') + expect(container.image).to eq('registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/branches/glenc-k3s-for-specs:14aa347f80c1cb7f4a38476f1148c3010f827a46') expect(container.env.count).to eq(3) expect(container.env.map(&:name)).to match_array([:HELM_VERSION, :TILLER_NAMESPACE, :COMMAND_SCRIPT]) expect(container.command).to match_array(["/bin/sh"]) |