diff --git a/.github/actions/helm/entrypoint.sh b/.github/actions/helm/entrypoint.sh index 70e6183..9997575 100644 --- a/.github/actions/helm/entrypoint.sh +++ b/.github/actions/helm/entrypoint.sh @@ -20,5 +20,5 @@ main() { } main -echo "::add-path::$BIN_DIR" -echo "::add-path::$RUNNER_WORKSPACE/$(basename $GITHUB_REPOSITORY)/bin" +echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH +echo "$RUNNER_WORKSPACE/$(basename $GITHUB_REPOSITORY)/bin" >> $GITHUB_PATH diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 48a2c20..5bb6fe2 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -12,7 +12,7 @@ jobs: matrix: helm-version: - 2.16.12 - - 3.3.3 + - 3.3.4 runs-on: ubuntu-latest steps: - name: Checkout diff --git a/charts/podinfo/Chart.yaml b/charts/podinfo/Chart.yaml index dcfd332..0d0ea2c 100644 --- a/charts/podinfo/Chart.yaml +++ b/charts/podinfo/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -version: 5.0.1 -appVersion: 5.0.1 +version: 5.0.2 +appVersion: 5.0.2 name: podinfo engine: gotpl description: Podinfo Helm chart for Kubernetes diff --git a/charts/podinfo/values-prod.yaml b/charts/podinfo/values-prod.yaml index c671a5c..91a6a2f 100644 --- 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.0.1 + tag: 5.0.2 pullPolicy: IfNotPresent service: @@ -39,9 +39,9 @@ service: # metrics-server add-on required hpa: enabled: true - maxReplicas: 10 + maxReplicas: 5 # average total CPU usage per pod (1-100) - cpu: + cpu: 99 # average memory usage per pod (100Mi-1Gi) memory: # average http requests per second per pod (k8s-prometheus-adapter) @@ -53,7 +53,7 @@ cache: "" redis: enabled: true repository: redis - tag: 6.0.1 + tag: 6.0.8 serviceAccount: # Specifies whether a service account should be created @@ -85,9 +85,10 @@ ingress: resources: limits: + memory: 256Mi requests: - cpu: 1m - memory: 16Mi + cpu: 100m + memory: 64Mi nodeSelector: {} diff --git a/charts/podinfo/values.yaml b/charts/podinfo/values.yaml index 825b53d..a1d340c 100644 --- a/charts/podinfo/values.yaml +++ b/charts/podinfo/values.yaml @@ -23,7 +23,7 @@ h2c: image: repository: ghcr.io/stefanprodan/podinfo - tag: 5.0.1 + tag: 5.0.2 pullPolicy: IfNotPresent service: @@ -53,7 +53,7 @@ cache: "" redis: enabled: false repository: redis - tag: 6.0.1 + tag: 6.0.8 serviceAccount: # Specifies whether a service account should be created diff --git a/deploy/bases/backend/deployment.yaml b/deploy/bases/backend/deployment.yaml index f7c889c..e4263e4 100644 --- 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.0.1 + image: ghcr.io/stefanprodan/podinfo:5.0.2 imagePullPolicy: IfNotPresent ports: - name: http diff --git a/deploy/bases/frontend/deployment.yaml b/deploy/bases/frontend/deployment.yaml index cc98bb2..ddf087a 100644 --- 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.0.1 + image: ghcr.io/stefanprodan/podinfo:5.0.2 imagePullPolicy: IfNotPresent ports: - name: http diff --git a/deploy/webapp/backend/deployment.yaml b/deploy/webapp/backend/deployment.yaml index 5aa6d39..d542687 100644 --- 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.0.1 + image: ghcr.io/stefanprodan/podinfo:5.0.2 imagePullPolicy: IfNotPresent ports: - name: http diff --git a/deploy/webapp/frontend/deployment.yaml b/deploy/webapp/frontend/deployment.yaml index f90d919..ab700f5 100644 --- 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.0.1 + image: ghcr.io/stefanprodan/podinfo:5.0.2 imagePullPolicy: IfNotPresent ports: - name: http diff --git a/kustomize/deployment.yaml b/kustomize/deployment.yaml index 7cc3de1..7357a05 100644 --- a/kustomize/deployment.yaml +++ b/kustomize/deployment.yaml @@ -23,7 +23,7 @@ spec: spec: containers: - name: podinfod - image: ghcr.io/stefanprodan/podinfo:5.0.1 + image: ghcr.io/stefanprodan/podinfo:5.0.2 imagePullPolicy: IfNotPresent ports: - name: http diff --git a/kustomize/kustomization.yaml b/kustomize/kustomization.yaml index e37ee7b..470e464 100644 --- a/kustomize/kustomization.yaml +++ b/kustomize/kustomization.yaml @@ -1,7 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - hpa.yaml - deployment.yaml - service.yaml -commonLabels: - app: podinfo diff --git a/pkg/version/version.go b/pkg/version/version.go index 5bbce08..60868d5 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -1,4 +1,4 @@ package version -var VERSION = "5.0.1" +var VERSION = "5.0.2" var REVISION = "unknown"