Skip to content

Commit

Permalink
Merge pull request #8 from Financial-Times/helm-integration
Browse files Browse the repository at this point in the history
Helm and Jenkins integration
  • Loading branch information
peterschubert committed Aug 23, 2017
2 parents 605a5e1 + 0fcf331 commit 9f0ef3c
Show file tree
Hide file tree
Showing 9 changed files with 149 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*.iml
*.exe
.idea
content-rw-elasticsearch
/content-rw-elasticsearch
vendor/*/
3 changes: 3 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@Library('k8s-pipeline-lib') _

uppEntryPointForJenkinsfile()
21 changes: 21 additions & 0 deletions helm/content-rw-elasticsearch/.helmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*~
# Various IDEs
.project
.idea/
*.tmproj
4 changes: 4 additions & 0 deletions helm/content-rw-elasticsearch/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: v1
description: content-rw-elasticsearch Helm chart for Kubernetes
name: content-rw-elasticsearch
version: 0.0.0 # this entry can be left untouched as it is automatically handled by Jenkins pipeline
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Values used for the deployed application.
replicaCount: 2
service:
name: content-rw-elasticsearch
env:
KAFKA_TOPIC: CombinedPostPublicationEvents
KAFKA_CONCURRENT_PROCESSING: true
16 changes: 16 additions & 0 deletions helm/content-rw-elasticsearch/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 24 | trimSuffix "-" -}}
{{- end -}}

{{/*
Create a default fully qualified app name.
We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
*/}}
{{- define "fullname" -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 24 | trimSuffix "-" -}}
{{- end -}}
65 changes: 65 additions & 0 deletions helm/content-rw-elasticsearch/templates/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: {{ .Values.service.name }}
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
visualize: "true"
app: {{ .Values.service.name }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app: {{ .Values.service.name }}
template:
metadata:
labels:
app: {{ .Values.service.name }}
visualize: "true"
spec:
containers:
- name: {{ .Values.service.name }}
image: "{{ .Values.image.repository }}:{{ .Chart.Version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: ELASTICSEARCH_SAPI_ENDPOINT
valueFrom:
configMapKeyRef:
name: global-config
key: aws.content.elasticsearch.endpoint
- name: KAFKA_CONSUMER_GROUP
value: "k8s-{{ .Values.service.name }}"
- name: KAFKA_TOPIC
value: {{ .Values.env.KAFKA_TOPIC }}
- name: KAFKA_CONCURRENT_PROCESSING
value: "{{ .Values.env.KAFKA_CONCURRENT_PROCESSING }}"
- name: KAFKA_PROXY_ADDR
valueFrom:
configMapKeyRef:
name: global-config
key: kafka.proxy.url.with.protocol
- name: AWS_ACCESS_KEY_ID
valueFrom:
secretKeyRef:
name: global-secrets
key: aws.access_key_id
- name: AWS_SECRET_ACCESS_KEY
valueFrom:
secretKeyRef:
name: global-secrets
key: aws.secret_access_key
ports:
- containerPort: 8080
livenessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 10
readinessProbe:
httpGet:
path: "/__gtg"
port: 8080
initialDelaySeconds: 15
periodSeconds: 30
resources:
{{ toYaml .Values.resources | indent 12 }}

16 changes: 16 additions & 0 deletions helm/content-rw-elasticsearch/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
kind: Service
apiVersion: v1
metadata:
name: {{.Values.service.name}}
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: {{.Values.service.name}}
visualize: "true"
hasHealthcheck: "{{ .Values.service.hasHealthcheck }}"
spec:
ports:
- port: 8080
# name: # The name of this port within the service. Optional if only one port is defined on this service
targetPort: 8080
selector:
app: {{ .Values.service.name }}
16 changes: 16 additions & 0 deletions helm/content-rw-elasticsearch/values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Default values for content-rw-elasticsearch.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
service:
name: "" # The name of the service, should be defined in the specific app-configs folder.
hasHealthcheck: "true"
replicaCount: 2
image:
repository: coco/content-rw-elasticsearch
pullPolicy: IfNotPresent
resources:
limits:
memory: 256Mi
env:
KAFKA_TOPIC: ""
KAFKA_CONCURRENT_PROCESSING: ""

0 comments on commit 9f0ef3c

Please sign in to comment.