Merge pull request #45 from stefanprodan/prep-3.2.0

Release v3.2.0

.circleci/config.yml

@@ -11,7 +11,7 @@ jobs:
           name: Start Kubernetes Kind cluster
           command: e2e/bootstrap.sh
       - run:
-          name: Install podinfo with Helm
+          name: Install podinfo with Helm v3
           command: e2e/install.sh
       - run:
           name: Run Helm tests

Makefile

@@ -8,11 +8,12 @@ DOCKER_REPOSITORY:=stefanprodan
 DOCKER_IMAGE_NAME:=$(DOCKER_REPOSITORY)/$(NAME)
 GIT_COMMIT:=$(shell git describe --dirty --always)
 VERSION:=$(shell grep 'VERSION' pkg/version/version.go | awk '{ print $$4 }' | tr -d '"')
+EXTRA_RUN_ARGS?=
 
 run:
 	GO111MODULE=on go run -ldflags "-s -w -X github.com/stefanprodan/podinfo/pkg/version.REVISION=$(GIT_COMMIT)" cmd/podinfo/* \
 	--level=debug --grpc-port=9999 --backend-url=https://httpbin.org/status/401 --backend-url=https://httpbin.org/status/500 \
-	--ui-logo=https://raw.githubusercontent.com/stefanprodan/podinfo/gh-pages/cuddle_clap.gif --ui-color=#34577c
+	--ui-logo=https://raw.githubusercontent.com/stefanprodan/podinfo/gh-pages/cuddle_clap.gif --ui-color=#34577c $(EXTRA_RUN_ARGS)
 
 test:
 	GO111MODULE=on go test -v -race ./...

charts/podinfo/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
-version: 3.1.5
-appVersion: 3.1.5
+version: 3.2.0
+appVersion: 3.2.0
 name: podinfo
 engine: gotpl
 description: Podinfo Helm chart for Kubernetes

charts/podinfo/README.md

@@ -36,6 +36,8 @@ Parameter | Description | Default
 `backends` | echo backend URL array | None
 `faults.delay` | random HTTP response delays between 0 and 5 seconds | `false`
 `faults.error` | 1/3 chances of a random HTTP response error | `false`
+`faults.unhealthy` | when set, the healthy state is never reached | `false`
+`faults.unready` | when set, the ready state is never reached | `false`
 `hpa.enabled` | enables HPA | `false`
 `hpa.cpu` | target CPU usage per pod | None
 `hpa.memory` | target memory usage per pod | None

charts/podinfo/templates/deployment.yaml

@@ -54,6 +54,12 @@ spec:
             - --level={{ .Values.logLevel }}
             - --random-delay={{ .Values.faults.delay }}
             - --random-error={{ .Values.faults.error }}
+            {{- if .Values.faults.unhealthy }}
+            - --unhealthy
+            {{- end }}
+            {{- if .Values.faults.unready }}
+            - --unready
+            {{- end }}
             {{- if .Values.h2c.enabled }}
             - --h2c
             {{- end }}

charts/podinfo/values.yaml

@@ -13,13 +13,15 @@ ui:
 faults:
   delay: false
   error: false
+  unhealthy: false
+  unready: false
 
 h2c:
   enabled: false
 
 image:
   repository: stefanprodan/podinfo
-  tag: 3.1.5
+  tag: 3.2.0
   pullPolicy: IfNotPresent
 
 service:

cmd/podinfo/main.go

@@ -39,10 +39,12 @@ func main() {
 	fs.String("ui-logo", "", "UI logo")
 	fs.String("ui-color", "cyan", "UI color")
 	fs.String("ui-message", fmt.Sprintf("greetings from podinfo v%v", version.VERSION), "UI message")
-	fs.Bool("h2c", false, "Allow upgrading to H2C")
+	fs.Bool("h2c", false, "allow upgrading to H2C")
 	fs.Bool("random-delay", false, "between 0 and 5 seconds random delay")
 	fs.Bool("random-error", false, "1/3 chances of a random response error")
-	fs.Int("stress-cpu", 0, "Number of CPU cores with 100 load")
+	fs.Bool("unhealthy", false, "when set, healthy state is never reached")
+	fs.Bool("unready", false, "when set, ready state is never reached")
+	fs.Int("stress-cpu", 0, "number of CPU cores with 100 load")
 	fs.Int("stress-memory", 0, "MB of data to load into memory")
 
 	versionFlag := fs.BoolP("version", "v", false, "get version number")

e2e/README.md

@@ -7,11 +7,11 @@ The e2e testing infrastructure is powered by CircleCI and [Kubernetes Kind](http
 * download go modules
 * run unit tests
 * build container
-* install kubectl, helm and Kubernetes Kind CLIs
+* install kubectl, Helm v3 and Kubernetes Kind CLIs
 * create local Kubernetes cluster with kind
-* deploy Tiller on the local cluster
 * load podinfo image onto the local cluster
 * deploy podinfo with Helm
+* set the podinfo image to the locally built one
 * run Helm tests
 
 ```yaml

e2e/bootstrap.sh

@@ -3,7 +3,7 @@
 set -o errexit
 
 REPO_ROOT=$(git rev-parse --show-toplevel)
-KIND_VERSION=v0.5.1
+KIND_VERSION=v0.7.0
 
 if [[ "$1" ]]; then
   KIND_VERSION=$1
@@ -22,13 +22,5 @@ sudo mv kind /usr/local/bin/kind
 echo ">>> Creating kind cluster"
 kind create cluster --wait 5m
 
-export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
-kubectl get pods --all-namespaces
-
-echo ">>> Installing Helm"
-curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
-
-echo '>>> Installing Tiller'
-kubectl --namespace kube-system create sa tiller
-kubectl create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller
-helm init --service-account tiller --upgrade --wait
+echo ">>> Installing Helm v3"
+curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash

e2e/install.sh

@@ -3,7 +3,6 @@
 set -o errexit
 
 REPO_ROOT=$(git rev-parse --show-toplevel)
-export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
 
 echo '>>> Loading image in Kind'
 kind load docker-image test/podinfo:latest

e2e/test.sh

@@ -2,15 +2,11 @@
 
 set -o errexit
 
-REPO_ROOT=$(git rev-parse --show-toplevel)
-export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
-
 function finish {
   echo '>>> Test logs'
   kubectl logs -l app=podinfo
 }
 trap finish EXIT
 
-echo '>>> Testing'
+echo '>>> Start integration tests'
 helm test podinfo
-

kustomize/deployment.yaml

@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
       - name: podinfod
-        image: stefanprodan/podinfo:3.1.5
+        image: stefanprodan/podinfo:3.2.0
         imagePullPolicy: IfNotPresent
         ports:
         - name: http

pkg/api/server.go

@@ -65,6 +65,8 @@ type Config struct {
 	H2C                       bool          `mapstructure:"h2c"`
 	RandomDelay               bool          `mapstructure:"random-delay"`
 	RandomError               bool          `mapstructure:"random-error"`
+	Unhealthy                 bool          `mapstructure:"unhealthy"`
+	Unready                   bool          `mapstructure:"unready"`
 	JWTSecret                 string        `mapstructure:"jwt-secret"`
 }
 
@@ -181,8 +183,12 @@ func (s *Server) ListenAndServe(stopCh <-chan struct{}) {
 	}()
 
 	// signal Kubernetes the server is ready to receive traffic
-	atomic.StoreInt32(&healthy, 1)
-	atomic.StoreInt32(&ready, 1)
+	if !s.config.Unhealthy {
+		atomic.StoreInt32(&healthy, 1)
+	}
+	if !s.config.Unready {
+		atomic.StoreInt32(&ready, 1)
+	}
 
 	// wait for SIGTERM or SIGINT
 	<-stopCh

pkg/version/version.go

@@ -1,4 +1,4 @@
 package version
 
-var VERSION = "3.1.5"
+var VERSION = "3.2.0"
 var REVISION = "unknown"