diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-12 14:02:30 +0200 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-12 14:02:30 +0200 |
| commit | a8a3cccd1c90380ec481300d74f32667b4ce7e03 (patch) | |
| tree | 407751fa3e2c5a00be1a6a5d29e24805b454a4d5 | |
| parent | 3309229fd04ac5a1c33ed5f0902b2d7a12db44b6 (diff) | |
| download | gitlab-ce-a8a3cccd1c90380ec481300d74f32667b4ce7e03.tar.gz | |
Fix kubectl command execution
| -rw-r--r-- | lib/gitlab/kubernetes/helm/api.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/kubernetes/helm/kubectl_command.rb | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/gitlab/kubernetes/helm/api.rb b/lib/gitlab/kubernetes/helm/api.rb index 1db21b8ca29..f55b6cbd5d9 100644 --- a/lib/gitlab/kubernetes/helm/api.rb +++ b/lib/gitlab/kubernetes/helm/api.rb @@ -44,7 +44,7 @@ module Gitlab command.config_map_resource.tap do |config_map_resource| break unless config_map_resource - if service_account_exists?(config_map_resource) + if config_map_exists?(config_map_resource) kubeclient.update_config_map(config_map_resource) else kubeclient.create_config_map(config_map_resource) diff --git a/lib/gitlab/kubernetes/helm/kubectl_command.rb b/lib/gitlab/kubernetes/helm/kubectl_command.rb index c2bd9911df0..c9f59219598 100644 --- a/lib/gitlab/kubernetes/helm/kubectl_command.rb +++ b/lib/gitlab/kubernetes/helm/kubectl_command.rb @@ -20,7 +20,13 @@ module Gitlab echo http://mirror.clarkson.edu/alpine/v$ALPINE_VERSION/main >> /etc/apk/repositories echo http://mirror1.hs-esslingen.de/pub/Mirrors/alpine/v$ALPINE_VERSION/main >> /etc/apk/repositories apk add -U wget ca-certificates openssl >/dev/null - wget -q https://storage.googleapis.com/kubernetes-release/release/v1.11.0/bin/darwin/amd64/kubectl + + wget -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub + wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk + apk add glibc-2.28-r0.apk + rm glibc-2.28-r0.apk + + wget https://storage.googleapis.com/kubernetes-release/release/v1.11.0/bin/linux/amd64/kubectl chmod +x kubectl mv kubectl /usr/bin/ HEREDOC |