Merge pull request #448 from thomasmckay/1486-fix-makefile-4

chore: fix chglog params (PROJQUAY-1486)

.chglog/CHANGELOG.tpl.md

@@ -1,6 +1,19 @@
 ## Red Hat Quay Release Notes
 (Red Hat Customer Portal)[https://access.redhat.com/documentation/en-us/red_hat_quay/3/html/red_hat_quay_release_notes/index]
 
+{{ if .Versions -}}
+
+{{ if .Unreleased.CommitGroups -}}
+{{ range .Unreleased.CommitGroups -}}
+### {{ .Title }}
+{{ range .Commits -}}
+- [{{.Hash.Short}}]({{ $.Info.RepositoryURL  }}/commit/{{ .Hash.Long }}): {{ .Subject }}
+{{ if .Refs -}}{{ range .Refs }} -{{if .Action}}{{ .Action }} {{ end }} [#{{ .Ref }}]({{ $.Info.RepositoryURL  }}/issues/{{ .Ref }}){{ end -}}
+{{ end -}}
+{{ end -}}
+{{ end -}}
+{{ end -}}
+
 {{ range .Versions }}
 <a name="{{ .Tag.Name }}"></a>
 ## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }}
@@ -45,3 +58,4 @@
 {{ end -}}
 {{ end -}}
 {{ end -}}
+{{ end -}}

.chglog/config.yml

@@ -4,7 +4,7 @@ info:
   title: CHANGELOG
   repository_url: https://github.com/quay/quay-operator
 options:
-  tag_sort_by: semver
+  sort: semver
   commits:
     sort_by: Scope
   commit_groups:

.github/workflows/prepare-release.yml

@@ -11,6 +11,12 @@ on:
       tag:
         description: 'the tag to be released'
         rdequired: true
+      quay_release:
+        description: 'version of quay (eg. v3.6.0)'
+        default: ''
+      quay_release:
+        description: 'version of clair (eg. 4.0.5)'
+        default: '4.0.5'
       jira:
         description: 'PROJQUAY jira release issue'
         required: true
@@ -26,14 +32,13 @@ jobs:
           fetch-depth: 0
           ref: ${{ github.event.inputs.branch }}
       - name: Changelog
-        shell: bash
         run: |
           curl -o /tmp/git-chglog.tar.gz -fsSL\
             https://github.com/git-chglog/git-chglog/releases/download/v0.14.0/git-chglog_0.14.0_linux_amd64.tar.gz
           tar xvf /tmp/git-chglog.tar.gz --directory /tmp
           chmod u+x /tmp/git-chglog
           echo "creating change log for tag: ${{ github.event.inputs.tag }}"
-          /tmp/git-chglog --tag-filter-pattern "v3.*" -o CHANGELOG.md v3.6.0-alpha.2..
+          /tmp/git-chglog --next-tag "${{ github.event.inputs.tag }}" --tag-filter-pattern "v3.*" -o CHANGELOG.md v3.6.0-alpha.2..
       - name: Version bundle
         env:
           RELEASE: ${{ github.event.inputs.tag }}

CHANGELOG.md

@@ -2,6 +2,41 @@
 (Red Hat Customer Portal)[https://access.redhat.com/documentation/en-us/red_hat_quay/3/html/red_hat_quay_release_notes/index]
 
 
+<a name="v3.6.0-alpha.5"></a>
+## [v3.6.0-alpha.5] - 2021-04-20
+### Chore
+- [5b4bf55](https://github.com/quay/quay-operator/commit/5b4bf556135a301a9b9c34f4553e56cc606634e6): correct version sent to prepare-release (PROJQUAY-1486)
+- [337ac92](https://github.com/quay/quay-operator/commit/337ac924207b870f46c74fcb0ddddf793c4625b7): correct version sent to prepare-release (PROJQUAY-1486)
+- [ea63cf5](https://github.com/quay/quay-operator/commit/ea63cf514330f8c914eca320d22d59aa58786d39): correct version sent to prepare-release (PROJQUAY-1486)
+- [a9c6687](https://github.com/quay/quay-operator/commit/a9c6687e4a7517a0eed0f7843551e0e7048ba886): prepare-release update csv (PROJQUAY-1486)
+### Deps
+- [ef4e0de](https://github.com/quay/quay-operator/commit/ef4e0dead7c50a7b41d264230a12c4ce1cd634f6): update controller-runtime to v0.8.2 (PROJQUAY-1622)
+### Feature
+- [c58d804](https://github.com/quay/quay-operator/commit/c58d80472d7a2bab69ccf0dc18f0049d115201aa): Allow image tags to be used in place of digest (PROJQUAY-1890)
+### Kustomize
+- [51859ca](https://github.com/quay/quay-operator/commit/51859ca093ffd8b743e78fa2ccdfda344f5dee28): use separate ServiceAccount for Quay app pods (PROJQUAY-1909)
+### Pull Requests
+- Merge pull request [#444](https://github.com/quay/quay-operator/issues/444) from alecmerdler/PROJQUAY-1909
+- Merge pull request [#443](https://github.com/quay/quay-operator/issues/443) from thomasmckay/1486-fix-makefile-3
+- Merge pull request [#441](https://github.com/quay/quay-operator/issues/441) from thomasmckay/1486-fix-makefile-2
+- Merge pull request [#439](https://github.com/quay/quay-operator/issues/439) from thomasmckay/1486-fix-makefile
+- Merge pull request [#433](https://github.com/quay/quay-operator/issues/433) from thomasmckay/1486-prepare-release-bundle
+- Merge pull request [#436](https://github.com/quay/quay-operator/issues/436) from jonathankingfc/allow_image_tag
+- Merge pull request [#434](https://github.com/quay/quay-operator/issues/434) from alecmerdler/update-controller-runtime
+
+
+<a name="v3.6.0-alpha.3"></a>
+## [v3.6.0-alpha.3] - 2021-04-15
+### Chore
+- [7581dda](https://github.com/quay/quay-operator/commit/7581dda81098d1b229dbb120004d7dcb7d18d9a2): v3.6.0-alpha.3 changelog bump (PROJQUAY-1486)
+- [3a34acd](https://github.com/quay/quay-operator/commit/3a34acdb320283e6e4ffbd1da4e35fde8f93c735): fix release actions (PROJQUAY-1486)
+- [98626d9](https://github.com/quay/quay-operator/commit/98626d9a6b428b61083e554494f71cbb5aaeeb9a): fix release actions (PROJQUAY-1486)
+### Pull Requests
+- Merge pull request [#432](https://github.com/quay/quay-operator/issues/432) from quay/ready-v3.6.0-alpha.3
+- Merge pull request [#431](https://github.com/quay/quay-operator/issues/431) from thomasmckay/1486-cut-release-3
+- Merge pull request [#429](https://github.com/quay/quay-operator/issues/429) from thomasmckay/1486-cut-release-2
+
+
 <a name="v3.6.0-alpha.2"></a>
 ## [v3.6.0-alpha.2] - 2021-04-15
 ### Chore
@@ -10,5 +45,7 @@
 - Merge pull request [#428](https://github.com/quay/quay-operator/issues/428) from thomasmckay/1486-release-1
 
 
-[Unreleased]: https://github.com/quay/quay-operator/compare/v3.6.0-alpha.2...HEAD
+[Unreleased]: https://github.com/quay/quay-operator/compare/v3.6.0-alpha.5...HEAD
+[v3.6.0-alpha.5]: https://github.com/quay/quay-operator/compare/v3.6.0-alpha.3...v3.6.0-alpha.5
+[v3.6.0-alpha.3]: https://github.com/quay/quay-operator/compare/v3.6.0-alpha.2...v3.6.0-alpha.3
 [v3.6.0-alpha.2]: https://github.com/quay/quay-operator/compare/v3.6.0-alpha.1...v3.6.0-alpha.2

Makefile

@@ -79,16 +79,19 @@ else
 CONTROLLER_GEN=$(shell which controller-gen)
 endif
 
-# Same commands as in the prepare-release github action. When bumping to a new y-stream, update
-# both this Makefile and the github action.
+# This target called from the prepare-release github action.
+# RELEASE       - quay-operator tag (eg. v3.6.0-alpha.4)
+# QUAY_RELEASE  - quay version
+# CLAIR_RELEASE - clair version
 prepare-release:
 	sed -i "s/createdAt:.*/createdAt: `date --utc +'%Y-%m-%d %k:%m UTC'`/" bundle/upstream/manifests/quay-operator.clusterserviceversion.yaml
 	sed -i "s/olm\.skipRange:.*/olm\.skipRange: \">=3.5.x <$(RELEASE)\"/" bundle/upstream/manifests/quay-operator.clusterserviceversion.yaml
 	sed -i "s/quay-version:.*/quay-version: v$(RELEASE)/" bundle/upstream/manifests/quay-operator.clusterserviceversion.yaml
 	sed -i "s/containerImage:.*/containerImage: quay.io\/projectquay\/quay-operator:v$(RELEASE)/" bundle/upstream/manifests/quay-operator.clusterserviceversion.yaml
 	sed -i "s/^  name: quay-operator.*/  name: quay-operator.v$(RELEASE)/" bundle/upstream/manifests/quay-operator.clusterserviceversion.yaml
 	sed -i "s/image: quay.io\/projectquay\/quay-operator.*/image: quay.io\/projectquay\/quay-operator:v$(RELEASE)/" bundle/upstream/manifests/quay-operator.clusterserviceversion.yaml
-	sed -i "s/value: quay.io\/projectquay\/quay:.*/value: quay.io\/projectquay\/quay:v$(RELEASE)/" bundle/upstream/manifests/quay-operator.clusterserviceversion.yaml
+	sed -i "s/value: quay.io\/projectquay\/quay:.*/value: quay.io\/projectquay\/quay:$(QUAY_RELEASE)/" bundle/upstream/manifests/quay-operator.clusterserviceversion.yaml
+	sed -i "s/value: quay.io\/projectquay\/clair:.*/value: quay.io\/projectquay\/clair:$(CLAIR_RELEASE)/" bundle/upstream/manifests/quay-operator.clusterserviceversion.yaml
 	sed -i "s/^  version: .*/  version: $(RELEASE)/" bundle/upstream/manifests/quay-operator.clusterserviceversion.yaml
 ifneq (,$(findstring alpha,$(RELEASE)))
 	sed -i "s/operators.operatorframework.io.bundle.channel.default.v1.*/operators.operatorframework.io.bundle.channel.default.v1: preview-3.6/" bundle/upstream/metadata/annotations.yaml