Merge pull request #177 from vfarcic/my-new-pr

My PR

Makefile

@@ -60,3 +60,7 @@ lint: vendor | $(PKGS) $(GOLINT) # ❷
 	    test -z "$$($(GOLINT) $$pkg | tee /dev/stderr)" || ret=1 ; \
 	done ; exit $$ret
 
+unittest: 
+	CGO_ENABLED=$(CGO_ENABLED) $(GO) \
+	test --run UnitTest -v
+

charts/go-demo-6/Makefile

@@ -36,7 +36,7 @@ ifeq ($(OS),Darwin)
 	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-26\/$(NAME)|" values.yaml
+	sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/jx-demo-276816\/$(NAME)|" values.yaml
 	sed -i -e "s/tag:.*/tag: $(VERSION)/" values.yaml
 else
 	echo "platfrom $(OS) not supported to tag with"

charts/preview/Makefile

@@ -8,7 +8,7 @@ ifeq ($(OS),Darwin)
 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-26\/go-demo-6|" values.yaml
+	sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/jx-demo-276816\/go-demo-6|" values.yaml
 	sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml
 else
 	echo "platfrom $(OS) not supported to release from"

charts/preview/values.yaml

@@ -21,3 +21,11 @@ preview:
     tag:
     pullPolicy: IfNotPresent
   probePath: /demo/hello?health=true
+
+
+db:
+  enabled: false
+
+preview-db:
+  persistence:
+    enabled: false

main.go

@@ -92,7 +92,7 @@ func HelloServer(w http.ResponseWriter, req *http.Request) {
 		delayNum, _ := strconv.Atoi(delay)
 		sleep(time.Duration(delayNum) * time.Millisecond)
 	}
-	io.WriteString(w, "hello, world!\n")
+	io.WriteString(w, "hello, PR not again!\n")
 }
 
 func RandomErrorServer(w http.ResponseWriter, req *http.Request) {

main_test.go

@@ -88,7 +88,7 @@ func (s *MainTestSuite) Test_HelloServer_WritesHelloWorld() {
 
 	HelloServer(w, req)
 
-	w.AssertCalled(s.T(), "Write", []byte("hello, world!\n"))
+	w.AssertCalled(s.T(), "Write", []byte("hello, PR not again!\n"))
 }
 
 func (s *MainTestSuite) Test_HelloServer_Waits_WhenDelayIsPresent() {

skaffold.yaml

@@ -1,28 +0,0 @@
-apiVersion: skaffold/v1beta2
-kind: Config
-build:
-  artifacts:
-  - image: devops-26/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}}'

watch.sh

@@ -2,5 +2,5 @@
 
 # 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'
+UUID=$(uuidgen) skaffold run -p dev
+reflex -r "\.go$" -- bash -c 'make linux && make unittest && UUID=$(uuidgen) skaffold run -p dev'