Skip to content

Commit a790408

Browse files
Merge pull request #22 from codefresh-io/v14-not-supporting-v13
hotfix to support version 13
2 parents 4870ac2 + f1c8bf3 commit a790408

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ RUN apk update && apk add curl
44

55
RUN curl -o kubectl1.15 -L https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/linux/amd64/kubectl
66
RUN curl -o kubectl1.14 -L https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubectl
7+
RUN curl -o kubectl1.13 -L https://storage.googleapis.com/kubernetes-release/release/v1.13.0/bin/linux/amd64/kubectl
78
RUN curl -o kubectl1.12 -L https://storage.googleapis.com/kubernetes-release/release/v1.12.0/bin/linux/amd64/kubectl
89
RUN curl -o kubectl1.10 -L https://storage.googleapis.com/kubernetes-release/release/v1.10.0/bin/linux/amd64/kubectl
910
RUN curl -o kubectl1.6 -L https://storage.googleapis.com/kubernetes-release/release/v1.6.0/bin/linux/amd64/kubectl
@@ -15,14 +16,15 @@ RUN apk add --update bash
1516
#copy all versions of kubectl to switch between them later.
1617
COPY --from=builder kubectl1.15 /usr/local/bin/
1718
COPY --from=builder kubectl1.14 /usr/local/bin/
19+
COPY --from=builder kubectl1.13 /usr/local/bin/
1820
COPY --from=builder kubectl1.12 /usr/local/bin/
1921
COPY --from=builder kubectl1.10 /usr/local/bin/
2022
COPY --from=builder kubectl1.6 /usr/local/bin/
2123

2224
# Set Default
2325
COPY --from=builder kubectl1.14 /usr/local/bin/kubectl
2426

25-
RUN chmod +x /usr/local/bin/kubectl /usr/local/bin/kubectl1.6 /usr/local/bin/kubectl1.10 /usr/local/bin/kubectl1.12 /usr/local/bin/kubectl1.14 /usr/local/bin/kubectl1.15
27+
RUN chmod +x /usr/local/bin/kubectl /usr/local/bin/kubectl1.6 /usr/local/bin/kubectl1.10 /usr/local/bin/kubectl1.12 /usr/local/bin/kubectl1.13 /usr/local/bin/kubectl1.14 /usr/local/bin/kubectl1.15
2628

2729
WORKDIR /
2830

cf-deploy-kubernetes.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,10 @@ fi
7373
# Determine appropriate kubectl version
7474
if [[ "${SERVER_VERSION}" -eq "15" ]]; then
7575
KUBE_CTL="15"
76-
elif [[ "${SERVER_VERSION}" -le "14" && "${SERVER_VERSION}" -ge "13" ]]; then
76+
elif [[ "${SERVER_VERSION}" -eq "14" ]]; then
7777
KUBE_CTL="14"
78+
elif [[ "${SERVER_VERSION}" -eq "13" ]]; then
79+
KUBE_CTL="13"
7880
elif [[ "${SERVER_VERSION}" -le "12" && "${SERVER_VERSION}" -ge "11" ]]; then
7981
KUBE_CTL="12"
8082
elif [[ "${SERVER_VERSION}" -le "10" && "${SERVER_VERSION}" -ge "9" ]]; then

0 commit comments

Comments
 (0)