diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4b2c3b4af..ba1b615c4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,7 +48,9 @@ jobs: platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 tags: | docker.io/stefanprodan/podinfo:${{ steps.prep.outputs.VERSION }} + docker.io/stefanprodan/podinfo:latest ghcr.io/stefanprodan/podinfo:${{ steps.prep.outputs.VERSION }} + ghcr.io/stefanprodan/podinfo:latest labels: | org.opencontainers.image.title=${{ github.event.repository.name }} org.opencontainers.image.description=${{ github.event.repository.description }} @@ -60,9 +62,10 @@ jobs: - name: Publish base image uses: docker/build-push-action@v2 with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + push: true + builder: ${{ steps.buildx.outputs.name }} context: . + platforms: linux/amd64 file: ./Dockerfile.base tags: docker.io/stefanprodan/podinfo-base:latest - name: Publish helm chart diff --git a/README.md b/README.md index 0b34753d7..8d869b64b 100644 --- a/README.md +++ b/README.md @@ -104,5 +104,5 @@ kubectl apply -k github.com/stefanprodan/podinfo//kustomize Docker: ```bash -docker run -dp 9898:9898 stefanprodan/podinfo +docker run -dp 9898:9898 ghcr.io/stefanprodan/podinfo ``` \ No newline at end of file diff --git a/charts/podinfo/Chart.yaml b/charts/podinfo/Chart.yaml index 937395015..3acd2ad8f 100644 --- a/charts/podinfo/Chart.yaml +++ b/charts/podinfo/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 version: 5.0.0 -appVersion: 4.0.6 +appVersion: 5.0.0 name: podinfo engine: gotpl description: Podinfo Helm chart for Kubernetes diff --git a/charts/podinfo/templates/_helpers.tpl b/charts/podinfo/templates/_helpers.tpl index 0eeb03723..533dcf057 100644 --- a/charts/podinfo/templates/_helpers.tpl +++ b/charts/podinfo/templates/_helpers.tpl @@ -53,7 +53,7 @@ app.kubernetes.io/name: {{ include "podinfo.fullname" . }} Create the name of the service account to use */}} {{- define "podinfo.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} +{{- if .Values.serviceAccount.enabled }} {{- default (include "podinfo.fullname" .) .Values.serviceAccount.name }} {{- else }} {{- default "default" .Values.serviceAccount.name }} diff --git a/charts/podinfo/values.yaml b/charts/podinfo/values.yaml index 308d2091b..b1fc14a37 100644 --- a/charts/podinfo/values.yaml +++ b/charts/podinfo/values.yaml @@ -22,8 +22,8 @@ h2c: enabled: false image: - repository: stefanprodan/podinfo - tag: 4.0.6 + repository: ghcr.io/stefanprodan/podinfo + tag: 5.0.0 pullPolicy: IfNotPresent service: diff --git a/deploy/bases/backend/deployment.yaml b/deploy/bases/backend/deployment.yaml index a632d5725..c8951f96e 100644 --- a/deploy/bases/backend/deployment.yaml +++ b/deploy/bases/backend/deployment.yaml @@ -23,7 +23,7 @@ spec: spec: containers: - name: backend - image: stefanprodan/podinfo:4.0.6 + image: ghcr.io/stefanprodan/podinfo:5.0.0 imagePullPolicy: IfNotPresent ports: - name: http diff --git a/deploy/bases/frontend/deployment.yaml b/deploy/bases/frontend/deployment.yaml index 1b414ede6..9c699bb05 100644 --- a/deploy/bases/frontend/deployment.yaml +++ b/deploy/bases/frontend/deployment.yaml @@ -23,7 +23,7 @@ spec: spec: containers: - name: frontend - image: stefanprodan/podinfo:4.0.6 + image: ghcr.io/stefanprodan/podinfo:5.0.0 imagePullPolicy: IfNotPresent ports: - name: http diff --git a/deploy/webapp/backend/deployment.yaml b/deploy/webapp/backend/deployment.yaml index 8c6996fe5..b635e543a 100644 --- a/deploy/webapp/backend/deployment.yaml +++ b/deploy/webapp/backend/deployment.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: webapp containers: - name: backend - image: stefanprodan/podinfo:4.0.6 + image: ghcr.io/stefanprodan/podinfo:5.0.0 imagePullPolicy: IfNotPresent ports: - name: http diff --git a/deploy/webapp/frontend/deployment.yaml b/deploy/webapp/frontend/deployment.yaml index cb93d9803..b54d001b3 100644 --- a/deploy/webapp/frontend/deployment.yaml +++ b/deploy/webapp/frontend/deployment.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: webapp containers: - name: frontend - image: stefanprodan/podinfo:4.0.6 + image: ghcr.io/stefanprodan/podinfo:5.0.0 imagePullPolicy: IfNotPresent ports: - name: http diff --git a/kustomize/deployment.yaml b/kustomize/deployment.yaml index dfd671461..337c7f9e3 100644 --- a/kustomize/deployment.yaml +++ b/kustomize/deployment.yaml @@ -23,7 +23,7 @@ spec: spec: containers: - name: podinfod - image: stefanprodan/podinfo:4.0.6 + image: ghcr.io/stefanprodan/podinfo:5.0.0 imagePullPolicy: IfNotPresent ports: - name: http diff --git a/pkg/version/version.go b/pkg/version/version.go index bcfad93bc..33a3937a8 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -1,4 +1,4 @@ package version -var VERSION = "4.0.6" +var VERSION = "5.0.0" var REVISION = "unknown"