Merge pull request #121 from stefanprodan/release-5.1.4

Release v5.1.4
2026-04-07 11:36:50 +00:00 · 2021-02-02 16:26:20 +02:00 · 2021-02-02 16:20:22 +02:00 · 2021-02-02 10:03:57 +02:00 · 2021-02-01 18:47:54 +01:00 · 2021-01-31 12:41:08 +02:00
19 changed files with 31 additions and 38 deletions
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -11,8 +11,7 @@ jobs:
    strategy:
      matrix:
        helm-version:
-          - 2.16.12
-          - 3.3.4
+          - 3.5.0
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
@@ -21,19 +20,16 @@ jobs:
        uses: engineerd/setup-kind@v0.5.0
      - name: Build container image
        run: |
-          ./hack/build.sh
+          ./test/build.sh
          kind load docker-image test/podinfo:latest
      - name: Setup Helm
        uses: ./.github/actions/helm
        with:
          helm-version: ${{ matrix.helm-version }}
-      - name: Install Tiller
-        if: ${{ startsWith(matrix.helm-version, '2') }}
-        run: ./hack/tiller.sh
      - name: Deploy
-        run: ./hack/deploy.sh
+        run: ./test/deploy.sh
      - name: Run integration tests
-        run: ./hack/test.sh
+        run: ./test/test.sh
      - name: Debug failure
        if: failure()
        run: |
--- a/2
+++ b/2
@@ -27,7 +27,7 @@ ARG REVISION
 LABEL maintainer="stefanprodan"

 RUN addgroup -S app \
-    && adduser -S -g app app \
+    && adduser -S -G app app \
    && apk --no-cache add \
    ca-certificates curl netcat-openbsd

--- a/charts/podinfo/Chart.yaml
+++ b/charts/podinfo/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
-version: 5.1.2
-appVersion: 5.1.2
+version: 5.1.4
+appVersion: 5.1.4
 name: podinfo
 engine: gotpl
 description: Podinfo Helm chart for Kubernetes
--- a/charts/podinfo/templates/servicemonitor.yaml
+++ b/charts/podinfo/templates/servicemonitor.yaml
@@ -12,5 +12,5 @@ spec:
      interval: {{ .Values.serviceMonitor.interval }}
  selector:
    matchLabels:
-      app: {{ template "podinfo.fullname" . }}
+      {{- include "podinfo.selectorLabels" . | nindent 6 }}
 {{- end }}
--- a/charts/podinfo/values-prod.yaml
+++ b/charts/podinfo/values-prod.yaml
@@ -23,7 +23,7 @@ h2c:

 image:
  repository: ghcr.io/stefanprodan/podinfo
-  tag: 5.1.2
+  tag: 5.1.4
  pullPolicy: IfNotPresent

 service:
--- a/charts/podinfo/values.yaml
+++ b/charts/podinfo/values.yaml
@@ -23,7 +23,7 @@ h2c:

 image:
  repository: ghcr.io/stefanprodan/podinfo
-  tag: 5.1.2
+  tag: 5.1.4
  pullPolicy: IfNotPresent

 service:
--- a/deploy/bases/backend/deployment.yaml
+++ b/deploy/bases/backend/deployment.yaml
@@ -23,7 +23,7 @@ spec:
    spec:
      containers:
      - name: backend
-        image: ghcr.io/stefanprodan/podinfo:5.1.2
+        image: ghcr.io/stefanprodan/podinfo:5.1.4
        imagePullPolicy: IfNotPresent
        ports:
        - name: http
--- a/deploy/bases/frontend/deployment.yaml
+++ b/deploy/bases/frontend/deployment.yaml
@@ -23,7 +23,7 @@ spec:
    spec:
      containers:
      - name: frontend
-        image: ghcr.io/stefanprodan/podinfo:5.1.2
+        image: ghcr.io/stefanprodan/podinfo:5.1.4
        imagePullPolicy: IfNotPresent
        ports:
        - name: http
--- a/deploy/kind.sh
+++ b/deploy/kind.sh
@@ -1,5 +1,20 @@
 #! /usr/bin/env sh

+mkdir -p bin
+cat > ./bin/kind.yaml <<EOF
+apiVersion: kind.x-k8s.io/v1alpha4
+kind: Cluster
+nodes:
+- role: control-plane
+  extraPortMappings:
+  - containerPort: 80
+    hostPort: 80
+    protocol: TCP
+  - containerPort: 443
+    hostPort: 443
+    protocol: TCP
+EOF
+
 # create the kind cluster
 kind create cluster --config=kind.yaml

--- a/deploy/kind.yaml
+++ b/deploy/kind.yaml
@@ -1,11 +0,0 @@
-kind: Cluster
-apiVersion: kind.x-k8s.io/v1alpha4
-nodes:
- role: control-plane
-  extraPortMappings:
-  - containerPort: 80
-    hostPort: 80
-    protocol: TCP
-  - containerPort: 443
-    hostPort: 443
-    protocol: TCP
--- a/deploy/webapp/backend/deployment.yaml
+++ b/deploy/webapp/backend/deployment.yaml
@@ -25,7 +25,7 @@ spec:
      serviceAccountName: webapp
      containers:
      - name: backend
-        image: ghcr.io/stefanprodan/podinfo:5.1.2
+        image: ghcr.io/stefanprodan/podinfo:5.1.4
        imagePullPolicy: IfNotPresent
        ports:
        - name: http
--- a/deploy/webapp/frontend/deployment.yaml
+++ b/deploy/webapp/frontend/deployment.yaml
@@ -25,7 +25,7 @@ spec:
      serviceAccountName: webapp
      containers:
      - name: frontend
-        image: ghcr.io/stefanprodan/podinfo:5.1.2
+        image: ghcr.io/stefanprodan/podinfo:5.1.4
        imagePullPolicy: IfNotPresent
        ports:
        - name: http
--- a/hack/tiller.sh
+++ b/hack/tiller.sh
@@ -1,7 +0,0 @@
-#! /usr/bin/env sh
-
-set -e
-
-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
--- a/kustomize/deployment.yaml
+++ b/kustomize/deployment.yaml
@@ -23,7 +23,7 @@ spec:
    spec:
      containers:
      - name: podinfod
-        image: ghcr.io/stefanprodan/podinfo:5.1.2
+        image: ghcr.io/stefanprodan/podinfo:5.1.4
        imagePullPolicy: IfNotPresent
        ports:
        - name: http
--- a/pkg/version/version.go
+++ b/pkg/version/version.go
@@ -1,4 +1,4 @@
 package version

-var VERSION = "5.1.2"
+var VERSION = "5.1.4"
 var REVISION = "unknown"
--- a/test/build.sh
+++ b/test/build.sh
--- a/test/deploy.sh
+++ b/test/deploy.sh
--- a/test/e2e.sh
+++ b/test/e2e.sh
--- a/test/test.sh
+++ b/test/test.sh
Author	SHA1	Message	Date
Stefan Prodan	e43ebfa5bf	Merge pull request #121 from stefanprodan/release-5.1.4 Release v5.1.4	2021-02-02 16:26:20 +02:00
Stefan Prodan	c914acb34d	Release v5.1.4 Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2021-02-02 16:20:22 +02:00
Stefan Prodan	982713606e	Merge pull request #120 from 181192/service-monitor-selector chart: Fix ServiceMonitor matchLabels for service	2021-02-02 10:03:57 +02:00
181192	63c0d0afe5	Fix servicemonitor matchLabels for service Signed-off-by: 181192 <k@kalli.no>	2021-02-01 18:47:54 +01:00
Stefan Prodan	4407939ea3	Merge pull request #119 from stefanprodan/release-5.1.3 Release v5.1.3	2021-01-31 12:41:08 +02:00
Stefan Prodan	ee6df13f57	Release v5.1.3 Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2021-01-31 12:36:06 +02:00
Stefan Prodan	97f9aca039	Merge pull request #118 from stefanprodan/remove-helmv2-tests Refactor e2e tests	2021-01-28 16:11:27 +02:00
Stefan Prodan	f30e3f89ed	Refactor e2e tests - remove Helm v2 and Tiller - update Helm v3 to 3.5.0 - rename scripts dir to test Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2021-01-28 13:05:34 +02:00
Stefan Prodan	f220644263	Merge pull request #117 from a-vorobiev/fix/use-group Fix adduser param to actually use 'app' group	2021-01-26 10:57:35 +02:00
Anton Vorobiev	9e066ebc7b	Fix adduser param to actually use 'app' group	2021-01-23 21:58:49 +01:00