Skip to content

Commit 8e2ede9

Browse files
Merge pull request #123 from harshal-choudhari/update-gitkubed
Updated gitkubed and manifests to support kubernetes version above 1.13
2 parents 111107a + c5ae603 commit 8e2ede9

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

build/gitkubed/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ MAINTAINER [email protected]
44
# Install openssh server
55
RUN apt-get update \
66
&& apt-get install -y upx-ucl binutils curl openssh-server git jq \
7-
&& curl -o /tmp/docker-18.06 'https://download.docker.com/linux/static/stable/x86_64/docker-18.06.1-ce.tgz' \
8-
&& tar -xf /tmp/docker-18.06 -C /tmp \
7+
&& curl -o /tmp/docker-19.03 'https://download.docker.com/linux/static/stable/x86_64/docker-19.03.8.tgz' \
8+
&& tar -xf /tmp/docker-19.03 -C /tmp \
99
&& mv /tmp/docker/docker /bin/docker \
10-
&& rm -rf /tmp/docker-18.06 /tmp/docker \
10+
&& rm -rf /tmp/docker-19.03 /tmp/docker \
1111
&& strip --strip-unneeded /bin/docker \
1212
&& chmod a+x /bin/docker \
1313
&& upx /bin/docker \
14-
&& curl -o /bin/kubectl 'https://storage.googleapis.com/kubernetes-release/release/v1.8.7/bin/linux/amd64/kubectl' \
14+
&& curl -o /bin/kubectl 'https://storage.googleapis.com/kubernetes-release/release/v1.17.4/bin/linux/amd64/kubectl' \
1515
&& strip --strip-unneeded /bin/kubectl \
1616
&& chmod a+x /bin/kubectl \
1717
&& upx /bin/kubectl \

manifests/gitkube-setup.yaml

+8-4
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,17 @@ metadata:
3838
name: gitkube-ci-conf
3939
namespace: kube-system
4040
---
41-
apiVersion: extensions/v1beta1
41+
apiVersion: apps/v1
4242
kind: Deployment
4343
metadata:
4444
labels:
4545
app: gitkubed
4646
name: gitkubed
4747
namespace: kube-system
4848
spec:
49+
selector:
50+
matchLabels:
51+
app: gitkubed
4952
replicas: 1
5053
strategy:
5154
rollingUpdate:
@@ -101,14 +104,17 @@ spec:
101104
name: gitkube-ci-conf
102105
name: gitkube-ci-conf
103106
---
104-
apiVersion: extensions/v1beta1
107+
apiVersion: apps/v1
105108
kind: Deployment
106109
metadata:
107110
labels:
108111
app: gitkube-controller
109112
name: gitkube-controller
110113
namespace: kube-system
111114
spec:
115+
selector:
116+
matchLabels:
117+
app: gitkube-controller
112118
replicas: 1
113119
strategy:
114120
rollingUpdate:
@@ -134,5 +140,3 @@ spec:
134140
valueFrom:
135141
fieldRef:
136142
fieldPath: metadata.namespace
137-
138-

0 commit comments

Comments
 (0)