Merge pull request #63 from stefanprodan/release-3.2.4

Release v3.2.4

.circleci/config.yml

@@ -33,6 +33,7 @@ jobs:
             echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin;
             echo $QUAY_PASS | docker login -u $QUAY_USER --password-stdin quay.io;
             make push-container;
+            make push-base;
           fi
 
   push-binary:

Dockerfile.base

@@ -0,0 +1,10 @@
+FROM golang:1.14
+
+WORKDIR /workspace
+
+# copy modules manifests
+COPY go.mod go.mod
+COPY go.sum go.sum
+
+# cache modules
+RUN go mod download

Makefile

@@ -33,6 +33,12 @@ build-charts:
 build-container:
 	docker build -t $(DOCKER_IMAGE_NAME):$(VERSION) .
 
+build-base:
+	docker build -f Dockerfile.base -t $(DOCKER_REPOSITORY)/podinfo-base:latest .
+
+push-base: build-base
+	docker push $(DOCKER_REPOSITORY)/podinfo-base:latest
+
 test-container:
 	@docker rm -f podinfo || true
 	@docker run -dp 9898:9898 --name=podinfo $(DOCKER_IMAGE_NAME):$(VERSION)

charts/podinfo/Chart.yaml

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

charts/podinfo/README.md

@@ -42,6 +42,8 @@ Parameter | Default | Description
 `faults.error` | `false` | 1/3 chances of a random HTTP response error
 `faults.unhealthy` | `false` | When set, the healthy state is never reached
 `faults.unready` | `false` | When set, the ready state is never reached
+`faults.testFail` | `false` | When set, a helm test is included which always fails
+`faults.testTimeout` | `false` | When set, a helm test is included which always times out
 `h2c.enabled` | `false` | Allow upgrading to h2c
 `image.repository` | `stefanprodan/podinfo` | Image repository
 `image.tag` | `<VERSION>` | Image tag

charts/podinfo/templates/deployment.yaml

@@ -64,7 +64,7 @@ spec:
           env:
           {{- if .Values.ui.message }}
           - name: PODINFO_UI_MESSAGE
-            value: {{ .Values.ui.message }}
+            value: {{ quote .Values.ui.message }}
           {{- end }}
           {{- if .Values.ui.logo }}
           - name: PODINFO_UI_LOGO

charts/podinfo/templates/tests/fail.yaml

@@ -0,0 +1,26 @@
+{{- if .Values.faults.test }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ template "podinfo.fullname" . }}-fault-test-{{ randAlphaNum 5 | lower }}
+  labels:
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    app: {{ template "podinfo.name" . }}
+  annotations:
+    "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    sidecar.istio.io/inject: "false"
+    linkerd.io/inject: disabled
+    appmesh.k8s.aws/sidecarInjectorWebhook: disabled
+spec:
+  template:
+    spec:
+      containers:
+        - name: fault
+          image: alpine:3.11
+          command: ['/bin/sh']
+          args:  ['-c', 'exit 1']
+      restartPolicy: Never
+{{- end }}

charts/podinfo/templates/tests/grpc.yaml

@@ -1,5 +1,5 @@
-apiVersion: v1
+apiVersion: batch/v1
-kind: Pod
+kind: Job
 metadata:
   name: {{ template "podinfo.fullname" . }}-grpc-test-{{ randAlphaNum 5 | lower }}
   labels:
@@ -14,9 +14,11 @@ metadata:
     linkerd.io/inject: disabled
     appmesh.k8s.aws/sidecarInjectorWebhook: disabled
 spec:
-  containers:
+  template:
-    - name: grpc-health-probe
+    spec:
-      image: stefanprodan/grpc_health_probe:v0.3.0
+      containers:
-      command: ['grpc_health_probe']
+        - name: grpc-health-probe
-      args:  ['-addr={{ template "podinfo.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.service.grpcPort }}']
+          image: stefanprodan/grpc_health_probe:v0.3.0
-  restartPolicy: Never
+          command: ['grpc_health_probe']
+          args:  ['-addr={{ template "podinfo.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.service.grpcPort }}']
+      restartPolicy: Never

charts/podinfo/templates/tests/jwt.yaml

@@ -1,5 +1,5 @@
-apiVersion: v1
+apiVersion: batch/v1
-kind: Pod
+kind: Job
 metadata:
   name: {{ template "podinfo.fullname" . }}-jwt-test-{{ randAlphaNum 5 | lower }}
   labels:
@@ -14,16 +14,18 @@ metadata:
     linkerd.io/inject: disabled
     appmesh.k8s.aws/sidecarInjectorWebhook: disabled
 spec:
-  containers:
+  template:
-    - name: tools
+    spec:
-      image: giantswarm/tiny-tools
+      containers:
-      command:
+        - name: tools
-        - sh
+          image: giantswarm/tiny-tools
-        - -c
+          command:
-        - |
+            - sh
-          TOKEN=$(curl -sd 'test' ${PODINFO_SVC}/token | jq -r .token) &&
+            - -c
-          curl -sH "Authorization: Bearer ${TOKEN}" ${PODINFO_SVC}/token/validate | grep test
+            - |
-      env:
+              TOKEN=$(curl -sd 'test' ${PODINFO_SVC}/token | jq -r .token) &&
-      - name: PODINFO_SVC
+              curl -sH "Authorization: Bearer ${TOKEN}" ${PODINFO_SVC}/token/validate | grep test
-        value: "{{ template "podinfo.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.service.externalPort }}"
+          env:
-  restartPolicy: Never
+          - name: PODINFO_SVC
+            value: "{{ template "podinfo.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.service.externalPort }}"
+      restartPolicy: Never

charts/podinfo/templates/tests/service.yaml

@@ -1,5 +1,5 @@
-apiVersion: v1
+apiVersion: batch/v1
-kind: Pod
+kind: Job
 metadata:
   name: {{ template "podinfo.fullname" . }}-service-test-{{ randAlphaNum 5 | lower }}
   labels:
@@ -14,15 +14,17 @@ metadata:
     linkerd.io/inject: disabled
     appmesh.k8s.aws/sidecarInjectorWebhook: disabled
 spec:
-  containers:
+  template:
-    - name: curl
+    spec:
-      image: curlimages/curl:7.69.0
+      containers:
-      command:
+        - name: curl
-        - sh
+          image: curlimages/curl:7.69.0
-        - -c
+          command:
-        - |
+            - sh
-          curl -s ${PODINFO_SVC}/api/info | grep version
+            - -c
-      env:
+            - |
-        - name: PODINFO_SVC
+              curl -s ${PODINFO_SVC}/api/info | grep version
-          value: "{{ template "podinfo.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.service.externalPort }}"
+          env:
-  restartPolicy: Never
+            - name: PODINFO_SVC
+              value: "{{ template "podinfo.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.service.externalPort }}"
+      restartPolicy: Never

charts/podinfo/templates/tests/timeout.yaml

@@ -0,0 +1,26 @@
+{{- if .Values.faults.test }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ template "podinfo.fullname" . }}-fault-test-{{ randAlphaNum 5 | lower }}
+  labels:
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    app: {{ template "podinfo.name" . }}
+  annotations:
+    "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    sidecar.istio.io/inject: "false"
+    linkerd.io/inject: disabled
+    appmesh.k8s.aws/sidecarInjectorWebhook: disabled
+spec:
+  template:
+    spec:
+      containers:
+        - name: fault
+          image: alpine:3.11
+          command: ['/bin/sh']
+          args:  ['-c', 'while sleep 3600; do :; done']
+      restartPolicy: Never
+{{- end }}

charts/podinfo/values.yaml

@@ -15,13 +15,15 @@ faults:
   error: false
   unhealthy: false
   unready: false
+  testFail: false
+  testTimeout: false
 
 h2c:
   enabled: false
 
 image:
   repository: stefanprodan/podinfo
-  tag: 3.2.3
+  tag: 3.2.4
   pullPolicy: IfNotPresent
 
 service:

deploy/bases/backend/deployment.yaml

@@ -23,7 +23,7 @@ spec:
     spec:
       containers:
       - name: backend
-        image: stefanprodan/podinfo:3.2.3
+        image: stefanprodan/podinfo:3.2.4
         imagePullPolicy: IfNotPresent
         ports:
         - name: http

deploy/bases/frontend/deployment.yaml

@@ -23,7 +23,7 @@ spec:
     spec:
       containers:
       - name: frontend
-        image: stefanprodan/podinfo:3.2.3
+        image: stefanprodan/podinfo:3.2.4
         imagePullPolicy: IfNotPresent
         ports:
         - name: http

deploy/bases/frontend/hpa.yaml

@@ -6,7 +6,7 @@ spec:
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
-    name: backend
+    name: frontend
   minReplicas: 1
   maxReplicas: 4
   metrics:

deploy/webapp/backend/deployment.yaml

@@ -25,7 +25,7 @@ spec:
       serviceAccountName: webapp
       containers:
       - name: backend
-        image: stefanprodan/podinfo:3.2.3
+        image: stefanprodan/podinfo:3.2.4
         imagePullPolicy: IfNotPresent
         ports:
         - name: http

deploy/webapp/common/reconciler-rbac.yaml

@@ -0,0 +1,29 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: reconciler
+  namespace: webapp
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: reconciler
+  namespace: webapp
+rules:
+  - apiGroups: ['*']
+    resources: ['*']
+    verbs: ['*']
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: reconciler
+  namespace: webapp
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: reconciler
+subjects:
+  - kind: ServiceAccount
+    name: reconciler
+    namespace: webapp

deploy/webapp/frontend/deployment.yaml

@@ -25,7 +25,7 @@ spec:
       serviceAccountName: webapp
       containers:
       - name: frontend
-        image: stefanprodan/podinfo:3.2.3
+        image: stefanprodan/podinfo:3.2.4
         imagePullPolicy: IfNotPresent
         ports:
         - name: http

kustomize/deployment.yaml

@@ -23,7 +23,7 @@ spec:
     spec:
       containers:
       - name: podinfod
-        image: stefanprodan/podinfo:3.2.3
+        image: stefanprodan/podinfo:3.2.4
         imagePullPolicy: IfNotPresent
         ports:
         - name: http

pkg/version/version.go

@@ -1,4 +1,4 @@
 package version
 
-var VERSION = "3.2.3"
+var VERSION = "3.2.4"
 var REVISION = "unknown"