Skip to content

Commit

Permalink
Merge pull request #123 from harshal-choudhari/update-gitkubed
Browse files Browse the repository at this point in the history
Updated gitkubed and manifests to support kubernetes version above 1.13
  • Loading branch information
tirumaraiselvan committed Mar 22, 2020
2 parents 111107a + c5ae603 commit 8e2ede9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
8 changes: 4 additions & 4 deletions build/gitkubed/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ MAINTAINER tiru@hasura.io
# Install openssh server
RUN apt-get update \
&& apt-get install -y upx-ucl binutils curl openssh-server git jq \
&& curl -o /tmp/docker-18.06 'https://download.docker.com/linux/static/stable/x86_64/docker-18.06.1-ce.tgz' \
&& tar -xf /tmp/docker-18.06 -C /tmp \
&& curl -o /tmp/docker-19.03 'https://download.docker.com/linux/static/stable/x86_64/docker-19.03.8.tgz' \
&& tar -xf /tmp/docker-19.03 -C /tmp \
&& mv /tmp/docker/docker /bin/docker \
&& rm -rf /tmp/docker-18.06 /tmp/docker \
&& rm -rf /tmp/docker-19.03 /tmp/docker \
&& strip --strip-unneeded /bin/docker \
&& chmod a+x /bin/docker \
&& upx /bin/docker \
&& curl -o /bin/kubectl 'https://storage.googleapis.com/kubernetes-release/release/v1.8.7/bin/linux/amd64/kubectl' \
&& curl -o /bin/kubectl 'https://storage.googleapis.com/kubernetes-release/release/v1.17.4/bin/linux/amd64/kubectl' \
&& strip --strip-unneeded /bin/kubectl \
&& chmod a+x /bin/kubectl \
&& upx /bin/kubectl \
Expand Down
12 changes: 8 additions & 4 deletions manifests/gitkube-setup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,17 @@ metadata:
name: gitkube-ci-conf
namespace: kube-system
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: gitkubed
name: gitkubed
namespace: kube-system
spec:
selector:
matchLabels:
app: gitkubed
replicas: 1
strategy:
rollingUpdate:
Expand Down Expand Up @@ -101,14 +104,17 @@ spec:
name: gitkube-ci-conf
name: gitkube-ci-conf
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: gitkube-controller
name: gitkube-controller
namespace: kube-system
spec:
selector:
matchLabels:
app: gitkube-controller
replicas: 1
strategy:
rollingUpdate:
Expand All @@ -134,5 +140,3 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace


0 comments on commit 8e2ede9

Please sign in to comment.