Skip to content

Commit b0bbd16

Browse files
authored
Merge pull request #28 from stefanprodan/prep-2.0.2
Release v2.0.2
2 parents e0864b6 + 7564949 commit b0bbd16

File tree

8 files changed

+62
-16
lines changed

8 files changed

+62
-16
lines changed

.circleci/config.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,20 @@ jobs:
44
machine: true
55
steps:
66
- checkout
7-
- run: e2e/bootstrap.sh
8-
- run: e2e/install.sh
9-
- run: e2e/test.sh
7+
- run:
8+
name: Build podinfo container
9+
command: e2e/build.sh
10+
- run:
11+
name: Start Kubernetes Kind cluster
12+
command: e2e/bootstrap.sh
13+
- run:
14+
name: Install podinfo with Helm
15+
command: e2e/install.sh
16+
- run:
17+
name: Run Helm tests
18+
command: e2e/test.sh
1019

11-
build-container:
20+
push-container:
1221
docker:
1322
- image: circleci/golang:1.12
1423
working_directory: ~/build
@@ -78,25 +87,24 @@ workflows:
7887
version: 2
7988
build-test:
8089
jobs:
81-
- build-container
8290
- e2e-kubernetes
8391
release:
8492
jobs:
85-
- build-container:
93+
- push-binary:
8694
filters:
8795
branches:
8896
ignore: /.*/
8997
tags:
9098
ignore: /^chart.*/
91-
- push-binary:
99+
- push-container:
92100
filters:
93101
branches:
94102
ignore: /.*/
95103
tags:
96104
ignore: /^chart.*/
97105
- push-helm-charts:
98106
requires:
99-
- build-container
107+
- push-container
100108
filters:
101109
branches:
102110
ignore: /.*/

charts/podinfo/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v1
2-
version: 2.0.1
3-
appVersion: 2.0.1
2+
version: 2.0.2
3+
appVersion: 2.0.2
44
name: podinfo
55
engine: gotpl
66
description: Podinfo Helm chart for Kubernetes

charts/podinfo/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ faults:
1212

1313
image:
1414
repository: quay.io/stefanprodan/podinfo
15-
tag: 2.0.1
15+
tag: 2.0.2
1616
pullPolicy: IfNotPresent
1717

1818
service:

e2e/README.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# podinfo end-to-end testing
2+
3+
The e2e testing infrastructure is powered by CircleCI and [Kubernetes Kind](https://github.com/kubernetes-sigs/kind).
4+
5+
### CI workflow
6+
7+
* download go modules
8+
* run unit tests
9+
* build container
10+
* install kubectl, helm and Kubernetes Kind CLIs
11+
* create local Kubernetes cluster with kind
12+
* deploy Tiller on the local cluster
13+
* load podinfo image onto the local cluster
14+
* deploy podinfo with Helm
15+
* run Helm tests
16+
17+
```yaml
18+
jobs:
19+
e2e-kubernetes:
20+
machine: true
21+
steps:
22+
- checkout
23+
- run:
24+
name: Build podinfo container
25+
command: e2e/build.sh
26+
- run:
27+
name: Start Kubernetes Kind cluster
28+
command: e2e/bootstrap.sh
29+
- run:
30+
name: Install podinfo with Helm
31+
command: e2e/install.sh
32+
- run:
33+
name: Run Helm tests
34+
command: e2e/test.sh
35+
```

e2e/build.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env bash
2+
3+
set -o errexit
4+
5+
docker build -t test/podinfo:latest .
6+

e2e/install.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ set -o errexit
55
REPO_ROOT=$(git rev-parse --show-toplevel)
66
export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
77

8-
echo ">>> Building container"
9-
docker build -t test/podinfo:latest .
10-
118
echo '>>> Loading image in Kind'
129
kind load docker-image test/podinfo:latest
1310

kustomize/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
spec:
2525
containers:
2626
- name: podinfod
27-
image: quay.io/stefanprodan/podinfo:2.0.1
27+
image: quay.io/stefanprodan/podinfo:2.0.2
2828
imagePullPolicy: IfNotPresent
2929
ports:
3030
- containerPort: 9898

pkg/version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
package version
22

3-
var VERSION = "2.0.1"
3+
var VERSION = "2.0.2"
44
var REVISION = "unknown"

0 commit comments

Comments
 (0)