diff --git a/CHANGELOG.md b/CHANGELOG.md index 31eb8bca..39e34074 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 @@ -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 diff --git a/bundle.Dockerfile b/bundle.Dockerfile index bd1e80ec..cd16878a 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -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 diff --git a/bundle/manifests/snapscheduler.backube_snapshotschedules.yaml b/bundle/manifests/snapscheduler.backube_snapshotschedules.yaml index 34a74306..24b1895d 100644 --- a/bundle/manifests/snapscheduler.backube_snapshotschedules.yaml +++ b/bundle/manifests/snapscheduler.backube_snapshotschedules.yaml @@ -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. diff --git a/bundle/manifests/snapscheduler.clusterserviceversion.yaml b/bundle/manifests/snapscheduler.clusterserviceversion.yaml index b03c1a66..4c70b872 100644 --- a/bundle/manifests/snapscheduler.clusterserviceversion.yaml +++ b/bundle/manifests/snapscheduler.clusterserviceversion.yaml @@ -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: {} @@ -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 @@ -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 @@ -391,4 +392,4 @@ spec: provider: name: Backube url: https://github.com/backube - version: 3.1.0 + version: 3.2.0 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 962ec645..d92f8771 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -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 diff --git a/bundle/tests/scorecard/config.yaml b/bundle/tests/scorecard/config.yaml index c4fd10b0..32323e94 100644 --- a/bundle/tests/scorecard/config.yaml +++ b/bundle/tests/scorecard/config.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index b32f655d..83b4f84c 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: quay.io/backube/snapscheduler - newTag: 3.1.0 + newTag: 3.2.0 diff --git a/docs/index.md b/docs/index.md index f4cb0603..ca13eaf5 100644 --- a/docs/index.md +++ b/docs/index.md @@ -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 @@ -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) diff --git a/docs/sdk-upgrade.md b/docs/sdk-upgrade.md deleted file mode 100644 index 4ed8cb87..00000000 --- a/docs/sdk-upgrade.md +++ /dev/null @@ -1,48 +0,0 @@ -# Upgrading the operator-sdk version - -Generate the scaffolding like it is a new project: - -```console -$ mkdir ~/temp -$ cd temp/ -$ operator-sdk new snapscheduler --repo github.com/backube/snapscheduler -INFO[0000] Creating new Go operator 'snapscheduler'. -... -INFO[0003] Project creation complete. -$ cd snapscheduler/ -$ operator-sdk add api --api-version snapscheduler.backube/v1 --kind SnapshotSchedule -INFO[0000] Generating api version snapscheduler.backube/v1 for kind SnapshotSchedule. -... -INFO[0016] API generation complete. -$ operator-sdk add controller --api-version snapscheduler.backube/v1 --kind SnapshotSchedule -INFO[0000] Generating controller version snapscheduler.backube/v1 for kind SnapshotSchedule. -... -INFO[0000] Controller generation complete. -``` - -In the existing repo, switch to the `sdk-scaffolding` branch: - -```console -$ cd -$ git checkout sdk-scaffolding -Switched to branch 'sdk-scaffolding' -``` - -Replace the files w/ the newly generated ones: - -```console -$ rm -rf * -$ cp -a ~/temp/snapscheduler/* . -$ -``` - -Commit the result: - -```console -$ git add . -$ git commit -m 'Upgrade to operator-sdk v0.10.0' -[sdk-scaffolding 0192b10] Upgrade to operator-sdk v0.10.0 - 5 files changed, 24 insertions(+), 20 deletions(-) -``` - -Merge this branch into `master` via merge commit or PR. diff --git a/helm/snapscheduler/Chart.yaml b/helm/snapscheduler/Chart.yaml index fe1eebb6..5a6a1d86 100644 --- a/helm/snapscheduler/Chart.yaml +++ b/helm/snapscheduler/Chart.yaml @@ -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 @@ -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 diff --git a/release-checklist.md b/release-checklist.md index 5a715d32..57ffebaa 100644 --- a/release-checklist.md +++ b/release-checklist.md @@ -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