Skip to content

Commit

Permalink
Merge pull request #258 from JohnStrunk/relprep
Browse files Browse the repository at this point in the history
Prepare for release v3.2
  • Loading branch information
mergify[bot] authored Oct 10, 2022
2 parents 13164c1 + 5dd8db1 commit 65379fb
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 68 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ This project follows [Semantic Versioning](https://semver.org/)

## [Unreleased]

## [3.2.0] - 2022-10-10

### Added

- Ability to specify a container hash instead of just a tag when deploying via
Expand Down Expand Up @@ -128,7 +130,8 @@ This project follows [Semantic Versioning](https://semver.org/)
- Label selectors to control which PVCs are selected for snapshotting
- Retention policies based on snapshot age or count

[unreleased]: https://github.com/backube/snapscheduler/compare/v3.1.0...HEAD
[Unreleased]: https://github.com/backube/snapscheduler/compare/v3.2.0...HEAD
[3.2.0]: https://github.com/backube/snapscheduler/compare/v3.1.0...v3.2.0
[3.1.0]: https://github.com/backube/snapscheduler/compare/v3.0.0...v3.1.0
[3.0.0]: https://github.com/backube/snapscheduler/compare/v2.1.0...v3.0.0
[2.1.0]: https://github.com/backube/snapscheduler/compare/v2.0.0...v2.1.0
Expand Down
2 changes: 1 addition & 1 deletion bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=snapscheduler
LABEL operators.operatorframework.io.bundle.channels.v1=candidate,stable
LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.22.0
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.23.0
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ spec:
description: Schedule is a Cronspec specifying when snapshots should
be taken. See https://en.wikipedia.org/wiki/Cron for a description
of the format.
pattern: ^((\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}|@(hourly|daily|weekly|monthly|yearly))$
pattern: ^(@(annually|yearly|monthly|weekly|daily|hourly))|((((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|\*)\s?){5,7})$
type: string
snapshotTemplate:
description: A template to customize the Snapshots.
Expand Down
11 changes: 6 additions & 5 deletions bundle/manifests/snapscheduler.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ metadata:
certified: "false"
description: The SnapScheduler operator takes snapshots of Kubernetes CSI-based
persistent volumes according to user-supplied schedules.
operators.operatorframework.io/builder: operator-sdk-v1.22.0
operators.operatorframework.io/builder: operator-sdk-v1.23.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/backube/snapscheduler
support: https://github.com/backube/snapscheduler
name: snapscheduler.v3.1.0
containerImage: quay.io/backube/snapscheduler:3.2.0
name: snapscheduler.v3.2.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -273,7 +274,7 @@ spec:
- --upstream=http://127.0.0.1:8080/
- --logtostderr=true
- --v=0
image: quay.io/brancz/kube-rbac-proxy:v0.13.0
image: quay.io/brancz/kube-rbac-proxy:v0.13.1
name: kube-rbac-proxy
ports:
- containerPort: 8443
Expand All @@ -297,7 +298,7 @@ spec:
- --leader-elect
command:
- /manager
image: quay.io/backube/snapscheduler:3.1.0
image: quay.io/backube/snapscheduler:3.2.0
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -391,4 +392,4 @@ spec:
provider:
name: Backube
url: https://github.com/backube
version: 3.1.0
version: 3.2.0
2 changes: 1 addition & 1 deletion bundle/metadata/annotations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ annotations:
operators.operatorframework.io.bundle.package.v1: snapscheduler
operators.operatorframework.io.bundle.channels.v1: candidate,stable
operators.operatorframework.io.bundle.channel.default.v1: stable
operators.operatorframework.io.metrics.builder: operator-sdk-v1.22.0
operators.operatorframework.io.metrics.builder: operator-sdk-v1.23.0
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

Expand Down
12 changes: 6 additions & 6 deletions bundle/tests/scorecard/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ stages:
- entrypoint:
- scorecard-test
- basic-check-spec
image: quay.io/operator-framework/scorecard-test:v1.22.0
image: quay.io/operator-framework/scorecard-test:v1.23.0
labels:
suite: basic
test: basic-check-spec-test
Expand All @@ -18,7 +18,7 @@ stages:
- entrypoint:
- scorecard-test
- olm-bundle-validation
image: quay.io/operator-framework/scorecard-test:v1.22.0
image: quay.io/operator-framework/scorecard-test:v1.23.0
labels:
suite: olm
test: olm-bundle-validation-test
Expand All @@ -28,7 +28,7 @@ stages:
- entrypoint:
- scorecard-test
- olm-crds-have-validation
image: quay.io/operator-framework/scorecard-test:v1.22.0
image: quay.io/operator-framework/scorecard-test:v1.23.0
labels:
suite: olm
test: olm-crds-have-validation-test
Expand All @@ -38,7 +38,7 @@ stages:
- entrypoint:
- scorecard-test
- olm-crds-have-resources
image: quay.io/operator-framework/scorecard-test:v1.22.0
image: quay.io/operator-framework/scorecard-test:v1.23.0
labels:
suite: olm
test: olm-crds-have-resources-test
Expand All @@ -48,7 +48,7 @@ stages:
- entrypoint:
- scorecard-test
- olm-spec-descriptors
image: quay.io/operator-framework/scorecard-test:v1.22.0
image: quay.io/operator-framework/scorecard-test:v1.23.0
labels:
suite: olm
test: olm-spec-descriptors-test
Expand All @@ -58,7 +58,7 @@ stages:
- entrypoint:
- scorecard-test
- olm-status-descriptors
image: quay.io/operator-framework/scorecard-test:v1.22.0
image: quay.io/operator-framework/scorecard-test:v1.23.0
labels:
suite: olm
test: olm-status-descriptors-test
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/backube/snapscheduler
newTag: 3.1.0
newTag: 3.2.0
4 changes: 2 additions & 2 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ Kubernetes version compatibility:
| 2.1 | 1.17 -- 1.23 | `v1beta1` |
| 3.0 | 1.20 -- 1.24+ | `v1` |
| 3.1 | 1.20 -- 1.24+ | `v1` |
| master | 1.20 -- 1.24+ | `v1` |
| 3.2 | 1.20 -- 1.25+ | `v1` |
| master | 1.20 -- 1.25+ | `v1` |

## Contents

Expand All @@ -38,5 +39,4 @@ Developer documentation

- [Building & running snapscheduler locally](development.md)
- [Editing the documentation](docs.md)
- [Upgrading the operator-sdk version](sdk-upgrade.md)
- [Project tracking & roadmap](roadmap.md)
48 changes: 0 additions & 48 deletions docs/sdk-upgrade.md

This file was deleted.

4 changes: 2 additions & 2 deletions helm/snapscheduler/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: v2
name: snapscheduler
# Chart version: Incremented during chart, template, or appVersion changes.
version: "3.1.0"
version: "3.2.0"
description: >-
An operator to take scheduled snapshots of Kubernetes persistent volumes
type: application
Expand All @@ -23,7 +23,7 @@ maintainers:
url: https://github.com/JohnStrunk
icon: https://raw.githubusercontent.com/backube/snapscheduler/master/docs/media/snapscheduler.svg?sanitize=true
# This is the version number of the application being deployed.
appVersion: "3.1.0"
appVersion: "3.2.0"
annotations:
# https://artifacthub.io/docs/topics/annotations/helm/
# Changelog for current chart & app version
Expand Down
1 change: 1 addition & 0 deletions release-checklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
`annotations.artifacthub.io/changes`
* In Chart.yaml, update `artifacthub.io/changes` annotation based on changelog
* Update version compatibility matrix in [docs/index.md](docs/index.md)
* Build OperatorHub bundle
* Commit to `master`
* Branch to a release branch
* Tag a release (vX.Y.Z) on that branch
Expand Down

0 comments on commit 65379fb

Please sign in to comment.