diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..1a8077fd6
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,13 @@
+draft.toml
+target/classes
+target/generated-sources
+target/generated-test-sources
+target/maven-archiver
+target/maven-status
+target/surefire-reports
+target/test-classes
+target/*.original
+charts/
+NOTICE
+LICENSE
+README.md
\ No newline at end of file
diff --git a/.helmignore b/.helmignore
new file mode 100644
index 000000000..747e6e94a
--- /dev/null
+++ b/.helmignore
@@ -0,0 +1,27 @@
+# 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
+*.png
+
+# known compile time folders
+target/
+node_modules/
+vendor/
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..f96718806
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,4 @@
+FROM scratch
+EXPOSE 8080
+ENTRYPOINT ["/go-demo-6"]
+COPY ./bin/ /
\ No newline at end of file
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..37b34fe23
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,62 @@
+SHELL := /bin/bash
+GO := GO15VENDOREXPERIMENT=1 go
+NAME := go-demo-6
+OS := $(shell uname)
+MAIN_GO := main.go
+ROOT_PACKAGE := $(GIT_PROVIDER)/vfarcic/$(NAME)
+GO_VERSION := $(shell $(GO) version | sed -e 's/^[^0-9.]*\([0-9.]*\).*/\1/')
+PACKAGE_DIRS := $(shell $(GO) list ./... | grep -v /vendor/)
+PKGS := $(shell go list ./... | grep -v /vendor | grep -v generated)
+BUILDFLAGS := ''
+CGO_ENABLED = 0
+VENDOR_DIR=vendor
+
+all: build
+
+check: fmt build test
+
+build:
+	CGO_ENABLED=$(CGO_ENABLED) $(GO) build -ldflags $(BUILDFLAGS) -o bin/$(NAME) $(MAIN_GO)
+
+test: 
+	CGO_ENABLED=$(CGO_ENABLED) $(GO) test $(PACKAGE_DIRS) -test.v
+
+full: $(PKGS)
+
+install:
+	GOBIN=${GOPATH}/bin $(GO) install -ldflags $(BUILDFLAGS) $(MAIN_GO)
+
+fmt:
+	@FORMATTED=`$(GO) fmt $(PACKAGE_DIRS)`
+	@([[ ! -z "$(FORMATTED)" ]] && printf "Fixed unformatted files:\n$(FORMATTED)") || true
+
+clean:
+	rm -rf build release
+
+linux:
+	CGO_ENABLED=$(CGO_ENABLED) GOOS=linux GOARCH=amd64 $(GO) build -ldflags $(BUILDFLAGS) -o bin/$(NAME) $(MAIN_GO)
+
+.PHONY: release clean
+
+FGT := $(GOPATH)/bin/fgt
+$(FGT):
+	go get github.com/GeertJohan/fgt
+
+GOLINT := $(GOPATH)/bin/golint
+$(GOLINT):
+	go get github.com/golang/lint/golint
+
+$(PKGS): $(GOLINT) $(FGT)
+	@echo "LINTING"
+	@$(FGT) $(GOLINT) $(GOPATH)/src/$@/*.go
+	@echo "VETTING"
+	@go vet -v $@
+	@echo "TESTING"
+	@go test -v $@
+
+.PHONY: lint
+lint: vendor | $(PKGS) $(GOLINT) # ❷
+	@cd $(BASE) && ret=0 && for pkg in $(PKGS); do \
+	    test -z "$$($(GOLINT) $$pkg | tee /dev/stderr)" || ret=1 ; \
+	done ; exit $$ret
+
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 000000000..11fd3dc6f
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,4 @@
+approvers:
+- vfarcic
+reviewers:
+- vfarcic
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
new file mode 100644
index 000000000..c8deecb16
--- /dev/null
+++ b/OWNERS_ALIASES
@@ -0,0 +1,6 @@
+aliases:
+- vfarcic
+best-approvers:
+- vfarcic
+best-reviewers:
+- vfarcic
diff --git a/charts/go-demo-6/.helmignore b/charts/go-demo-6/.helmignore
new file mode 100755
index 000000000..f0c131944
--- /dev/null
+++ b/charts/go-demo-6/.helmignore
@@ -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
diff --git a/charts/go-demo-6/Chart.yaml b/charts/go-demo-6/Chart.yaml
new file mode 100644
index 000000000..238ed7b12
--- /dev/null
+++ b/charts/go-demo-6/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+icon: https://raw.githubusercontent.com/jenkins-x/jenkins-x-platform/d273e09/images/go.png
+name: go-demo-6
+version: 0.1.0-SNAPSHOT
diff --git a/charts/go-demo-6/Makefile b/charts/go-demo-6/Makefile
new file mode 100755
index 000000000..cd4638010
--- /dev/null
+++ b/charts/go-demo-6/Makefile
@@ -0,0 +1,48 @@
+CHART_REPO := http://jenkins-x-chartmuseum:8080
+CURRENT=$(pwd)
+NAME := go-demo-6
+OS := $(shell uname)
+VERSION := $(shell cat ../../VERSION)
+
+build: clean
+	rm -rf requirements.lock
+	helm dependency build
+	helm lint
+
+install: clean build
+	helm install . --name ${NAME}
+
+upgrade: clean build
+	helm upgrade ${NAME} .
+
+delete:
+	helm delete --purge ${NAME}
+
+clean:
+	rm -rf charts
+	rm -rf ${NAME}*.tgz
+
+release: clean
+	helm dependency build
+	helm lint
+	helm init --client-only
+	helm package .
+	curl --fail -u $(CHARTMUSEUM_CREDS_USR):$(CHARTMUSEUM_CREDS_PSW) --data-binary "@$(NAME)-$(shell sed -n 's/^version: //p' Chart.yaml).tgz" $(CHART_REPO)/api/charts
+	rm -rf ${NAME}*.tgz%
+
+tag:
+ifeq ($(OS),Darwin)
+	sed -i "" -e "s/version:.*/version: $(VERSION)/" Chart.yaml
+	sed -i "" -e "s/tag:.*/tag: $(VERSION)/" values.yaml
+else ifeq ($(OS),Linux)
+	sed -i -e "s/version:.*/version: $(VERSION)/" Chart.yaml
+	sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/devops-27\/$(NAME)|" values.yaml
+	sed -i -e "s/tag:.*/tag: $(VERSION)/" values.yaml
+else
+	echo "platfrom $(OS) not supported to tag with"
+	exit -1
+endif
+	git add --all
+	git commit -m "release $(VERSION)" --allow-empty # if first release then no verion update is performed
+	git tag -fa v$(VERSION) -m "Release version $(VERSION)"
+	git push origin v$(VERSION)
diff --git a/charts/go-demo-6/README.md b/charts/go-demo-6/README.md
new file mode 100755
index 000000000..627fc3ddf
--- /dev/null
+++ b/charts/go-demo-6/README.md
@@ -0,0 +1 @@
+# golang application
\ No newline at end of file
diff --git a/charts/go-demo-6/templates/NOTES.txt b/charts/go-demo-6/templates/NOTES.txt
new file mode 100755
index 000000000..97823be26
--- /dev/null
+++ b/charts/go-demo-6/templates/NOTES.txt
@@ -0,0 +1,4 @@
+
+Get the application URL by running these commands:
+
+kubectl get ingress {{ template "fullname" . }}
diff --git a/charts/go-demo-6/templates/_helpers.tpl b/charts/go-demo-6/templates/_helpers.tpl
new file mode 100755
index 000000000..f0d83d2ed
--- /dev/null
+++ b/charts/go-demo-6/templates/_helpers.tpl
@@ -0,0 +1,16 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 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 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/charts/go-demo-6/templates/canary.yaml b/charts/go-demo-6/templates/canary.yaml
new file mode 100755
index 000000000..bd5e3f857
--- /dev/null
+++ b/charts/go-demo-6/templates/canary.yaml
@@ -0,0 +1,58 @@
+{{- if .Values.canary.enabled }}
+apiVersion: flagger.app/v1alpha3
+kind: Canary
+metadata:
+  name: {{ template "fullname" . }}
+  labels:
+    draft: {{ default "draft-app" .Values.draft }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+spec:
+  provider: istio
+  targetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ template "fullname" . }}
+  progressDeadlineSeconds: {{ .Values.canary.progressDeadlineSeconds }}
+  {{- if .Values.hpa.enabled }}
+  autoscalerRef:
+    apiVersion: autoscaling/v2beta1
+    kind: HorizontalPodAutoscaler
+    name: {{ template "fullname" . }}
+  {{- end }}
+  service:
+    port: {{ .Values.service.externalPort }}
+    targetPort: {{ .Values.service.internalPort }}
+    gateways:
+    - {{ template "fullname" . }}
+    hosts:
+    - {{ .Values.canary.host }}
+  canaryAnalysis:
+    interval: {{ .Values.canary.canaryAnalysis.interval }}
+    threshold: {{ .Values.canary.canaryAnalysis.threshold }}
+    maxWeight: {{ .Values.canary.canaryAnalysis.maxWeight }}
+    stepWeight: {{ .Values.canary.canaryAnalysis.stepWeight }}
+    metrics:
+    - name: request-success-rate
+      threshold: {{ .Values.canary.canaryAnalysis.metrics.requestSuccessRate.threshold }}
+      interval: {{ .Values.canary.canaryAnalysis.metrics.requestSuccessRate.interval }}
+    - name: request-duration
+      threshold: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.threshold }}
+      interval: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.interval }}
+
+---
+
+apiVersion: networking.istio.io/v1alpha3
+kind: Gateway
+metadata:
+  name: {{ template "fullname" . }}
+spec:
+  selector:
+    istio: ingressgateway
+  servers:
+  - port:
+      number: {{ .Values.service.externalPort }}
+      name: http
+      protocol: HTTP
+    hosts:
+    - {{ .Values.canary.host }}
+{{- end }}
diff --git a/charts/go-demo-6/templates/deployment.yaml b/charts/go-demo-6/templates/deployment.yaml
new file mode 100755
index 000000000..1507ef6c2
--- /dev/null
+++ b/charts/go-demo-6/templates/deployment.yaml
@@ -0,0 +1,59 @@
+{{- if .Values.knativeDeploy }}
+{{- else }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ template "fullname" . }}
+  labels:
+    draft: {{ default "draft-app" .Values.draft }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+spec:
+  selector:
+    matchLabels:
+      app: {{ template "fullname" . }}
+{{- if .Values.hpa.enabled }}
+{{- else }}
+  replicas: {{ .Values.replicaCount }}
+{{- end }}
+  template:
+    metadata:
+      labels:
+        draft: {{ default "draft-app" .Values.draft }}
+        app: {{ template "fullname" . }}
+{{- if .Values.podAnnotations }}
+      annotations:
+{{ toYaml .Values.podAnnotations | indent 8 }}
+{{- end }}
+    spec:
+      containers:
+      - name: {{ .Chart.Name }}
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        env:
+{{- range $pkey, $pval := .Values.env }}
+        - name: {{ $pkey }}
+          value: {{ quote $pval }}
+{{- end }}
+        envFrom:
+{{ toYaml .Values.envFrom | indent 10 }}
+        ports:
+        - containerPort: {{ .Values.service.internalPort }}
+        livenessProbe:
+          httpGet:
+            path: {{ .Values.probePath }}
+            port: {{ .Values.service.internalPort }}
+          initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+          successThreshold: {{ .Values.livenessProbe.successThreshold }}
+          timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+        readinessProbe:
+          httpGet:
+            path: {{ .Values.probePath }}
+            port: {{ .Values.service.internalPort }}
+          periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+          successThreshold: {{ .Values.readinessProbe.successThreshold }}
+          timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+        resources:
+{{ toYaml .Values.resources | indent 12 }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+{{- end }}
diff --git a/charts/go-demo-6/templates/hpa.yaml b/charts/go-demo-6/templates/hpa.yaml
new file mode 100755
index 000000000..1c03eb4c9
--- /dev/null
+++ b/charts/go-demo-6/templates/hpa.yaml
@@ -0,0 +1,25 @@
+{{- if .Values.hpa.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ template "fullname" . }}
+  labels:
+    draft: {{ default "draft-app" .Values.draft }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ template "fullname" . }}
+  minReplicas: {{ .Values.hpa.minReplicas }}
+  maxReplicas: {{ .Values.hpa.maxReplicas }}
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      targetAverageUtilization: {{ .Values.hpa.cpuTargetAverageUtilization }}
+  - type: Resource
+    resource:
+      name: memory
+      targetAverageUtilization: {{ .Values.hpa.memoryTargetAverageUtilization }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/go-demo-6/templates/ksvc.yaml b/charts/go-demo-6/templates/ksvc.yaml
new file mode 100755
index 000000000..d37fb3f82
--- /dev/null
+++ b/charts/go-demo-6/templates/ksvc.yaml
@@ -0,0 +1,41 @@
+{{- if .Values.knativeDeploy }}
+apiVersion: serving.knative.dev/v1alpha1
+kind: Service
+metadata:
+{{- if .Values.service.name }}
+  name: {{ .Values.service.name }}
+{{- else }}
+  name: {{ template "fullname" . }}
+{{- end }}
+  labels:
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+spec:
+  runLatest:
+    configuration:
+      revisionTemplate:
+        spec:
+          container:
+            image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+            imagePullPolicy: {{ .Values.image.pullPolicy }}
+            env:
+{{- range $pkey, $pval := .Values.env }}
+            - name: {{ $pkey }}
+              value: {{ quote $pval }}
+{{- end }}
+            livenessProbe:
+              httpGet:
+                path: {{ .Values.probePath }}
+              initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+              periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+              successThreshold: {{ .Values.livenessProbe.successThreshold }}
+              timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            readinessProbe:
+              failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+              httpGet:
+                path: {{ .Values.probePath }}
+              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+              timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            resources:
+{{ toYaml .Values.resources | indent 14 }}
+{{- end }}
diff --git a/charts/go-demo-6/templates/service.yaml b/charts/go-demo-6/templates/service.yaml
new file mode 100755
index 000000000..9a2a4c758
--- /dev/null
+++ b/charts/go-demo-6/templates/service.yaml
@@ -0,0 +1,26 @@
+{{- if or .Values.knativeDeploy .Values.canary.enabled }}
+{{- else }}
+apiVersion: v1
+kind: Service
+metadata:
+{{- if .Values.service.name }}
+  name: {{ .Values.service.name }}
+{{- else }}
+  name: {{ template "fullname" . }}
+{{- end }}
+  labels:
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+{{- if .Values.service.annotations }}
+  annotations:
+{{ toYaml .Values.service.annotations | indent 4 }}
+{{- end }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+  - port: {{ .Values.service.externalPort }}
+    targetPort: {{ .Values.service.internalPort }}
+    protocol: TCP
+    name: http
+  selector:
+    app: {{ template "fullname" . }}
+{{- end }}
diff --git a/charts/go-demo-6/values.yaml b/charts/go-demo-6/values.yaml
new file mode 100755
index 000000000..048c6ddb3
--- /dev/null
+++ b/charts/go-demo-6/values.yaml
@@ -0,0 +1,71 @@
+# Default values for Go projects.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+replicaCount: 1
+image:
+  repository: draft
+  tag: dev
+  pullPolicy: IfNotPresent
+
+# define environment variables here as a map of key: value
+env:
+
+# enable this flag to use knative serve to deploy the app
+knativeDeploy: false
+
+# HorizontalPodAutoscaler
+hpa:
+  enabled: false
+  minReplicas: 2
+  maxReplicas: 6
+  cpuTargetAverageUtilization: 80
+  memoryTargetAverageUtilization: 80
+
+# Canary deployments
+# If enabled, Istio and Flagger need to be installed in the cluster
+canary:
+  enabled: false
+  progressDeadlineSeconds: 60
+  canaryAnalysis:
+    interval: "1m"
+    threshold: 5
+    maxWeight: 60
+    stepWeight: 20
+    # WARNING: Canary deployments will fail and rollback if there is no traffic that will generate the below specified metrics.
+    metrics:
+      requestSuccessRate:
+        threshold: 99
+        interval: "1m"
+      requestDuration:
+        threshold: 1000
+        interval: "1m"
+  # The host is using Istio Gateway and is currently not auto-generated
+  # Please overwrite the `canary.host` in `values.yaml` in each environment repository (e.g., staging, production)
+  host: acme.com
+
+service:
+  name: go-demo-6
+  type: ClusterIP
+  externalPort: 80
+  internalPort: 8080
+  annotations:
+    fabric8.io/expose: "true"
+    fabric8.io/ingress.annotations: "kubernetes.io/ingress.class: nginx"
+resources:
+  limits:
+    cpu: 100m
+    memory: 256Mi
+  requests:
+    cpu: 80m
+    memory: 128Mi
+probePath: /
+livenessProbe:
+  initialDelaySeconds: 60
+  periodSeconds: 10
+  successThreshold: 1
+  timeoutSeconds: 1
+readinessProbe:
+  failureThreshold: 1
+  periodSeconds: 10
+  successThreshold: 1
+  timeoutSeconds: 1
diff --git a/charts/preview/Chart.yaml b/charts/preview/Chart.yaml
new file mode 100644
index 000000000..d5b379cf2
--- /dev/null
+++ b/charts/preview/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+icon: https://raw.githubusercontent.com/jenkins-x/jenkins-x-platform/master/images/go.png
+name: preview
+version: 0.1.0-SNAPSHOT
diff --git a/charts/preview/Makefile b/charts/preview/Makefile
new file mode 100755
index 000000000..50e87820a
--- /dev/null
+++ b/charts/preview/Makefile
@@ -0,0 +1,18 @@
+OS := $(shell uname)
+
+preview:
+ifeq ($(OS),Darwin)
+	sed -i "" -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml
+	sed -i "" -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml
+	sed -i "" -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml
+else ifeq ($(OS),Linux)
+	sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml
+	sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml
+	sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/devops-27\/go-demo-6|" values.yaml
+	sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml
+else
+	echo "platfrom $(OS) not supported to release from"
+	exit -1
+endif
+	echo "  version: $(PREVIEW_VERSION)" >> requirements.yaml
+	jx step helm build
diff --git a/charts/preview/requirements.yaml b/charts/preview/requirements.yaml
new file mode 100755
index 000000000..54957ae67
--- /dev/null
+++ b/charts/preview/requirements.yaml
@@ -0,0 +1,16 @@
+# !! File must end with empty line !!
+dependencies:
+- alias: expose
+  name: exposecontroller
+  repository: http://chartmuseum.jenkins-x.io
+  version: 2.3.92
+- alias: cleanup
+  name: exposecontroller
+  repository: http://chartmuseum.jenkins-x.io
+  version: 2.3.92
+
+  # !! "alias: preview" must be last entry in dependencies array !!
+  # !! Place custom dependencies above !!
+- alias: preview
+  name: go-demo-6
+  repository: file://../go-demo-6
diff --git a/charts/preview/values.yaml b/charts/preview/values.yaml
new file mode 100755
index 000000000..b53ceaa57
--- /dev/null
+++ b/charts/preview/values.yaml
@@ -0,0 +1,22 @@
+
+expose:
+  Annotations:
+    helm.sh/hook: post-install,post-upgrade
+    helm.sh/hook-delete-policy: hook-succeeded
+  config:
+    exposer: Ingress
+    http: true
+    tlsacme: false
+
+cleanup:
+  Args:
+    - --cleanup
+  Annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-delete-policy: hook-succeeded
+
+preview:
+  image:
+    repository:
+    tag:
+    pullPolicy: IfNotPresent
\ No newline at end of file
diff --git a/jenkins-x.yml b/jenkins-x.yml
new file mode 100755
index 000000000..a121a198e
--- /dev/null
+++ b/jenkins-x.yml
@@ -0,0 +1 @@
+buildPack: go
diff --git a/skaffold.yaml b/skaffold.yaml
new file mode 100644
index 000000000..96a727a72
--- /dev/null
+++ b/skaffold.yaml
@@ -0,0 +1,28 @@
+apiVersion: skaffold/v1beta2
+kind: Config
+build:
+  artifacts:
+  - image: devops-27/go-demo-6
+    context: .
+    docker: {}
+  tagPolicy:
+    envTemplate:
+      template: '{{.DOCKER_REGISTRY}}/{{.IMAGE_NAME}}:{{.VERSION}}'
+  local: {}
+deploy:
+  kubectl: {}
+profiles:
+- name: dev
+  build:
+    tagPolicy:
+      envTemplate:
+        template: '{{.DOCKER_REGISTRY}}/{{.IMAGE_NAME}}:{{.DIGEST_HEX}}'
+    local: {}
+  deploy:
+    helm:
+      releases:
+      - name: go-demo-6
+        chartPath: charts/go-demo-6
+        setValueTemplates:
+          image.repository: '{{.DOCKER_REGISTRY}}/{{.IMAGE_NAME}}'
+          image.tag: '{{.DIGEST_HEX}}'
diff --git a/watch.sh b/watch.sh
new file mode 100644
index 000000000..679dc7073
--- /dev/null
+++ b/watch.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# watch the go files and continously deploy the service
+make linux
+skaffold run -p dev
+reflex -r "\.go$" -- bash -c 'make linux && skaffold run -p dev'