Skip to content

Commit

Permalink
[infra] updated jenkins k18s cluster
Browse files Browse the repository at this point in the history
Issues #10, #400
  • Loading branch information
mikea committed Mar 7, 2017
1 parent 21851f0 commit 5ed9cd5
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 63 deletions.
57 changes: 57 additions & 0 deletions infra/jenkins-cluster/deployment-jenkins.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: jenkins-master
spec:
replicas: 1
template:
metadata:
name: jenkins-master
labels:
app: jenkins-master
spec:
containers:
- name: jenkins
image: jenkinsci/jenkins
# command:
# - "/bin/tini"
# - "--"
# - "/usr/local/bin/jenkins.sh"
env:
# - name: KUB_POD_NAME
# valueFrom:
# fieldRef:
# fieldPath: metadata.name
# - name: KUB_POD_IP
# valueFrom:
# fieldRef:
# fieldPath: status.podIP
- name: JAVA_OPTS
value: "-Duser.timezone=America/Los_Angeles -Dhudson.security.csrf.requestfield=Jenkins-Crumb"
ports:
- containerPort: 8080
- containerPort: 50000
volumeMounts:
- name: jenkins-home
mountPath: "/var/jenkins_home"
livenessProbe:
httpGet:
path: "/login"
port: 8080
initialDelaySeconds: 60
timeoutSeconds: 15
resources:
requests:
memory: "4Gi"
cpu: "4"
- name: kubectl-proxy
image: lachlanevenson/k8s-kubectl
args:
- "proxy"
- "-p"
- "8081"
volumes:
- name: jenkins-home
gcePersistentDisk:
pdName: jenkins-home
fsType: ext4
58 changes: 0 additions & 58 deletions infra/jenkins-cluster/jenkins.yaml

This file was deleted.

File renamed without changes.
10 changes: 5 additions & 5 deletions infra/jenkins-cluster/service-jenkins-master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ metadata:
labels:
app: jenkins-master
spec:
type: NodePort
selector:
app: jenkins-master
ports:
- port: 50000
targetPort: 50000
nodePort: 31001
protocol: TCP
- name: agent
port: 50000
- name: http
port: 80
targetPort: 8080
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 5ed9cd5

Please sign in to comment.