diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b8a99215..f47da05b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -148,13 +148,14 @@ jobs: - name: Setup Cosign uses: sigstore/cosign-installer@main - - name: checkout jetstack-charts - uses: actions/checkout@v6 - with: - token: ${{ secrets.JETSTACK_CHARTS_PAT }} - repository: jetstack/jetstack-charts - ref: main - path: jetstack-charts + # Temporarily disabled while org auth is being sorted. + # - name: checkout jetstack-charts + # uses: actions/checkout@v6 + # with: + # token: ${{ secrets.JETSTACK_CHARTS_PAT }} + # repository: jetstack/jetstack-charts + # ref: main + # path: jetstack-charts - name: Setup Helm uses: azure/setup-helm@v5 @@ -168,6 +169,7 @@ jobs: - name: package helm chart run: | + mkdir -p jetstack-charts/charts helm package version-checker/deploy/charts/version-checker -d jetstack-charts/charts/ - name: Sign Helm Chart @@ -184,21 +186,29 @@ jobs: # jetstack-charts/charts/version-checker-${{ needs.release-name.outputs.name }}.tgz \ # oci://quay.io/jetstack/version-checker/chart - - name: Creating Publishing Chart's PR - uses: peter-evans/create-pull-request@v8 - if: ${{ startsWith(github.ref, 'refs/tags/') }} + # Temporarily disabled while org auth is being sorted. + # - name: Creating Publishing Chart's PR + # uses: peter-evans/create-pull-request@v8 + # if: ${{ startsWith(github.ref, 'refs/tags/') }} + # with: + # token: ${{ secrets.JETSTACK_CHARTS_PAT }} + # title: "Release version-checker ${{ needs.release-name.outputs.name }}" + # commit-message: "Release version-checker ${{ needs.release-name.outputs.name }}" + # branch: version-checker/${{ github.ref_name }} + # path: jetstack-charts + # add-paths: | + # charts/*.tgz + # charts/*.tgz.cosign.bundle + # delete-branch: true + # signoff: true + # base: main + + - name: Upload chart artifacts for manual publishing + uses: actions/upload-artifact@v4 with: - token: ${{ secrets.JETSTACK_CHARTS_PAT }} - title: "Release version-checker ${{ needs.release-name.outputs.name }}" - commit-message: "Release version-checker ${{ needs.release-name.outputs.name }}" - branch: version-checker/${{ github.ref_name }} - path: jetstack-charts - add-paths: | - charts/*.tgz - charts/*.tgz.cosign.bundle - delete-branch: true - signoff: true - base: main + name: helm-chart-${{ needs.release-name.outputs.name }} + path: jetstack-charts/charts/* + if-no-files-found: error docker-release: runs-on: ubuntu-latest @@ -267,6 +277,8 @@ jobs: - name: Create Release / Change Logs uses: softprops/action-gh-release@v3 with: + tag_name: ${{ needs.release-name.outputs.name }} + target_commitish: ${{ github.ref_name }} draft: ${{ !startsWith(github.ref, 'refs/tags/') }} prerelease: ${{ contains('-rc', github.ref_name) || !startsWith(github.ref, 'refs/tags/') }} generate_release_notes: true diff --git a/Makefile b/Makefile index 20534f35..e1d9f336 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ verify: test build ## tests and builds version-checker image: ## build docker image GOARCH=$(ARCH) GOOS=linux CGO_ENABLED=0 go build -o ./bin/version-checker-linux ./cmd/. - docker build -t quay.io/jetstack/version-checker:v0.10.0 . + docker build -t quay.io/jetstack/version-checker:v0.11.0 . clean: ## clean up created files rm -rf \ diff --git a/deploy/charts/version-checker/Chart.yaml b/deploy/charts/version-checker/Chart.yaml index 9354266b..d66b85ff 100644 --- a/deploy/charts/version-checker/Chart.yaml +++ b/deploy/charts/version-checker/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -appVersion: "v0.10.0" -version: "v0.10.0" +appVersion: "v0.11.0" +version: "v0.11.0" description: A Helm chart for version-checker home: https://github.com/jetstack/version-checker name: version-checker diff --git a/deploy/charts/version-checker/README.md b/deploy/charts/version-checker/README.md index 03b7716c..cb7e9a4a 100644 --- a/deploy/charts/version-checker/README.md +++ b/deploy/charts/version-checker/README.md @@ -1,6 +1,6 @@ # version-checker -![Version: v0.10.0](https://img.shields.io/badge/Version-v0.10.0-informational?style=flat-square) ![AppVersion: v0.10.0](https://img.shields.io/badge/AppVersion-v0.10.0-informational?style=flat-square) +![Version: v0.11.0](https://img.shields.io/badge/Version-v0.11.0-informational?style=flat-square) ![AppVersion: v0.11.0](https://img.shields.io/badge/AppVersion-v0.11.0-informational?style=flat-square) A Helm chart for version-checker @@ -22,8 +22,8 @@ A Helm chart for version-checker | additionalAnnotations | object | `{}` | Additional Annotations to apply to Service and Deployment/Pod Objects | | additionalLabels | object | `{}` | Additional Labels to apply to Service and Deployment/Pod Objects | | affinity | object | `{}` | Set affinity | -| dashboards.enabled | bool | `false` | Deploy Grafana Dashboard(s) for version-checker | | dashboards.annotations | object | `{}` | Additional annotations to add to the Grafana Dashboard resources | +| dashboards.enabled | bool | `false` | Deploy Grafana Dashboard(s) for version-checker | | dashboards.grafana | string | `""` | Grafana instance to associate the Dashboard with when using GrafanaOperator | | dashboards.labels | object | `{}` | Additional labels to add to the Grafana Dashboard | | docker.password | string | `nil` | Password to authenticate with docker registry | diff --git a/deploy/yaml/deploy.yaml b/deploy/yaml/deploy.yaml index 9d5d4411..738a2ffa 100644 --- a/deploy/yaml/deploy.yaml +++ b/deploy/yaml/deploy.yaml @@ -50,7 +50,7 @@ spec: spec: serviceAccountName: version-checker containers: - - image: quay.io/jetstack/version-checker:v0.10.0 + - image: quay.io/jetstack/version-checker:v0.11.0 imagePullPolicy: Always ports: - containerPort: 8080