From cfaad30fa31817f7395cf1af190716e5a6a5e660 Mon Sep 17 00:00:00 2001 From: John Strunk Date: Thu, 31 Mar 2022 10:03:00 -0400 Subject: [PATCH 1/4] Update docs for v3.0 release Signed-off-by: John Strunk --- CHANGELOG.md | 6 +++++- docs/index.md | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0565f784..df89628a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,12 @@ This project follows [Semantic Versioning](https://semver.org/) ## [Unreleased] +## [3.0.0] - 2021-04-01 + ### Changed - Snapshot objects are now accessed via `snapshot.storage.k8s.io/v1` API version +- Upgrade operator-sdk to 1.18 ### Removed @@ -75,7 +78,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/v2.1.0...HEAD +[unreleased]: https://github.com/backube/snapscheduler/compare/v3.0.0...HEAD +[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 [2.0.0]: https://github.com/backube/snapscheduler/compare/v1.2.0...v2.0.0 [1.2.0]: https://github.com/backube/snapscheduler/compare/v1.1.1...v1.2.0 diff --git a/docs/index.md b/docs/index.md index 273f6e08..6dab05b9 100644 --- a/docs/index.md +++ b/docs/index.md @@ -22,6 +22,7 @@ Kubernetes version compatibility: | 1.2 | 1.13 -- 1.21 | `v1alpha1`, `v1beta1` | | 2.0 | 1.17 -- 1.23 | `v1beta1` | | 2.1 | 1.17 -- 1.23 | `v1beta1` | +| 3.0 | 1.20 -- 1.23+ | `v1` | | master | 1.20 -- 1.23+ | `v1` | ## Contents From 654b98586c8d1627297d0fa6947b227b3dc84f4d Mon Sep 17 00:00:00 2001 From: John Strunk Date: Thu, 31 Mar 2022 10:10:10 -0400 Subject: [PATCH 2/4] Update kustomize to v4.5.4 Older versions couldn't be installed via `go install` Signed-off-by: John Strunk --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4e551f9b..899e0a5e 100644 --- a/Makefile +++ b/Makefile @@ -171,7 +171,7 @@ controller-gen: ## Download controller-gen locally if necessary. .PHONY: kustomize KUSTOMIZE = $(shell pwd)/bin/kustomize kustomize: ## Download kustomize locally if necessary. - $(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v3@v3.8.7) + $(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v4@v4.5.4) .PHONY: envtest ENVTEST = $(shell pwd)/bin/setup-envtest From c302428716d3f0d2d62d0da7295305f28f01ca68 Mon Sep 17 00:00:00 2001 From: John Strunk Date: Thu, 31 Mar 2022 10:15:48 -0400 Subject: [PATCH 3/4] Update bundle for v3.0.0 release Signed-off-by: John Strunk --- bundle.Dockerfile | 2 +- ...apscheduler.backube_snapshotschedules.yaml | 2 +- .../snapscheduler.clusterserviceversion.yaml | 22 ++++++++++++------- bundle/metadata/annotations.yaml | 2 +- bundle/tests/scorecard/config.yaml | 12 +++++----- config/manager/kustomization.yaml | 2 +- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 4d1068fa..43c4d977 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.14.0+git +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.17.0+git 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 a45a9b61..67e294d6 100644 --- a/bundle/manifests/snapscheduler.backube_snapshotschedules.yaml +++ b/bundle/manifests/snapscheduler.backube_snapshotschedules.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.7.0 + controller-gen.kubebuilder.io/version: v0.8.0 creationTimestamp: null name: snapshotschedules.snapscheduler.backube spec: diff --git a/bundle/manifests/snapscheduler.clusterserviceversion.yaml b/bundle/manifests/snapscheduler.clusterserviceversion.yaml index 6a88ad16..75961fd2 100644 --- a/bundle/manifests/snapscheduler.clusterserviceversion.yaml +++ b/bundle/manifests/snapscheduler.clusterserviceversion.yaml @@ -23,12 +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.14.0+git + operators.operatorframework.io/builder: operator-sdk-v1.17.0+git operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/backube/snapscheduler support: https://github.com/backube/snapscheduler - containerImage: quay.io/backube/snapscheduler:2.1.0 - name: snapscheduler.v2.1.0 + containerImage: quay.io/backube/snapscheduler:3.0.0 + name: snapscheduler.v3.0.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -271,21 +271,27 @@ spec: - --secure-listen-address=0.0.0.0:8443 - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - - --v=10 + - --v=0 image: quay.io/brancz/kube-rbac-proxy:v0.11.0 name: kube-rbac-proxy ports: - containerPort: 8443 name: https protocol: TCP - resources: {} + resources: + limits: + cpu: 500m + memory: 128Mi + requests: + cpu: 5m + memory: 64Mi - args: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 - --leader-elect command: - /manager - image: quay.io/backube/snapscheduler:2.1.0 + image: quay.io/backube/snapscheduler:3.0.0 livenessProbe: httpGet: path: /healthz @@ -372,8 +378,8 @@ spec: - email: jstrunk@redhat.com name: John Strunk maturity: stable - minKubeVersion: 1.17.0-0 + minKubeVersion: 1.20.0-0 provider: name: Backube url: https://github.com/backube - version: 2.1.0 + version: 3.0.0 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 9e836687..fef46273 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.14.0+git + operators.operatorframework.io.metrics.builder: operator-sdk-v1.17.0+git 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 14c9f7c3..60de8a49 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.15.0 + image: quay.io/operator-framework/scorecard-test:v1.18.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.15.0 + image: quay.io/operator-framework/scorecard-test:v1.18.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.15.0 + image: quay.io/operator-framework/scorecard-test:v1.18.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.15.0 + image: quay.io/operator-framework/scorecard-test:v1.18.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.15.0 + image: quay.io/operator-framework/scorecard-test:v1.18.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.15.0 + image: quay.io/operator-framework/scorecard-test:v1.18.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index e0fe8da8..8920bc2a 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: latest + newTag: 3.0.0 From 462f0771032131ff0751becec9885c448589f4a4 Mon Sep 17 00:00:00 2001 From: John Strunk Date: Thu, 31 Mar 2022 10:22:18 -0400 Subject: [PATCH 4/4] Update doc gems Signed-off-by: John Strunk --- docs/Gemfile | 3 +- docs/Gemfile.lock | 178 +++++++++++++++++++++++++--------------------- 2 files changed, 100 insertions(+), 81 deletions(-) diff --git a/docs/Gemfile b/docs/Gemfile index 50a83a2b..fba4c1fc 100644 --- a/docs/Gemfile +++ b/docs/Gemfile @@ -3,7 +3,8 @@ source "https://rubygems.org" # bundle update # bundle exec jekyll serve -w -l -gem "github-pages", group: :jekyll_plugins +# Current github-pages version: https://pages.github.com/versions/ +gem "github-pages", "~> 225", group: :jekyll_plugins # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem # and associated library. diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index f52be863..b60e9c07 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.3.6) + activesupport (6.0.4.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -14,36 +14,54 @@ GEM execjs coffee-script-source (1.11.1) colorator (1.1.0) - commonmarker (0.17.13) - ruby-enum (~> 0.5) - concurrent-ruby (1.1.8) - dnsruby (1.61.5) + commonmarker (0.23.4) + concurrent-ruby (1.1.10) + dnsruby (1.61.9) simpleidn (~> 0.1) - em-websocket (0.5.2) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - ethon (0.12.0) - ffi (>= 1.3.0) + http_parser.rb (~> 0) + ethon (0.15.0) + ffi (>= 1.15.0) eventmachine (1.2.7) - execjs (2.7.0) - faraday (1.3.0) + execjs (2.8.1) + faraday (1.10.0) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.3) multipart-post (>= 1.2, < 3) - ruby2_keywords faraday-net_http (1.0.1) - ffi (1.15.0) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + ffi (1.15.5) forwardable-extended (2.6.0) gemoji (3.0.1) - github-pages (214) - github-pages-health-check (= 1.17.0) + github-pages (225) + github-pages-health-check (= 1.17.9) jekyll (= 3.9.0) jekyll-avatar (= 0.7.0) jekyll-coffeescript (= 1.1.1) - jekyll-commonmark-ghpages (= 0.1.6) + jekyll-commonmark-ghpages (= 0.2.0) jekyll-default-layout (= 0.1.4) jekyll-feed (= 0.15.1) jekyll-gist (= 1.5.0) jekyll-github-metadata (= 2.13.0) + jekyll-include-cache (= 0.2.1) jekyll-mentions (= 1.6.0) jekyll-optional-front-matter (= 0.3.2) jekyll-paginate (= 1.1.0) @@ -52,22 +70,22 @@ GEM jekyll-relative-links (= 0.6.1) jekyll-remote-theme (= 0.4.3) jekyll-sass-converter (= 1.5.2) - jekyll-seo-tag (= 2.7.1) + jekyll-seo-tag (= 2.8.0) jekyll-sitemap (= 1.4.0) jekyll-swiss (= 1.0.0) - jekyll-theme-architect (= 0.1.1) - jekyll-theme-cayman (= 0.1.1) - jekyll-theme-dinky (= 0.1.1) - jekyll-theme-hacker (= 0.1.2) - jekyll-theme-leap-day (= 0.1.1) - jekyll-theme-merlot (= 0.1.1) - jekyll-theme-midnight (= 0.1.1) - jekyll-theme-minimal (= 0.1.1) - jekyll-theme-modernist (= 0.1.1) - jekyll-theme-primer (= 0.5.4) - jekyll-theme-slate (= 0.1.1) - jekyll-theme-tactile (= 0.1.1) - jekyll-theme-time-machine (= 0.1.1) + jekyll-theme-architect (= 0.2.0) + jekyll-theme-cayman (= 0.2.0) + jekyll-theme-dinky (= 0.2.0) + jekyll-theme-hacker (= 0.2.0) + jekyll-theme-leap-day (= 0.2.0) + jekyll-theme-merlot (= 0.2.0) + jekyll-theme-midnight (= 0.2.0) + jekyll-theme-minimal (= 0.2.0) + jekyll-theme-modernist (= 0.2.0) + jekyll-theme-primer (= 0.6.0) + jekyll-theme-slate (= 0.2.0) + jekyll-theme-tactile (= 0.2.0) + jekyll-theme-time-machine (= 0.2.0) jekyll-titles-from-headings (= 0.5.3) jemoji (= 0.12.0) kramdown (= 2.3.1) @@ -75,19 +93,19 @@ GEM liquid (= 4.0.3) mercenary (~> 0.3) minima (= 2.5.1) - nokogiri (>= 1.10.4, < 2.0) + nokogiri (>= 1.12.5, < 2.0) rouge (= 3.26.0) terminal-table (~> 1.4) - github-pages-health-check (1.17.0) + github-pages-health-check (1.17.9) addressable (~> 2.3) dnsruby (~> 1.60) octokit (~> 4.0) - public_suffix (>= 2.0.2, < 5.0) + public_suffix (>= 3.0, < 5.0) typhoeus (~> 1.3) - html-pipeline (2.14.0) + html-pipeline (2.14.1) activesupport (>= 2) nokogiri (>= 1.4) - http_parser.rb (0.6.0) + http_parser.rb (0.8.0) i18n (0.9.5) concurrent-ruby (~> 1.0) jekyll (3.9.0) @@ -108,12 +126,12 @@ GEM jekyll-coffeescript (1.1.1) coffee-script (~> 2.2) coffee-script-source (~> 1.11.1) - jekyll-commonmark (1.3.1) - commonmarker (~> 0.14) - jekyll (>= 3.7, < 5.0) - jekyll-commonmark-ghpages (0.1.6) - commonmarker (~> 0.17.6) - jekyll-commonmark (~> 1.2) + jekyll-commonmark (1.4.0) + commonmarker (~> 0.22) + jekyll-commonmark-ghpages (0.2.0) + commonmarker (~> 0.23.4) + jekyll (~> 3.9.0) + jekyll-commonmark (~> 1.4.0) rouge (>= 2.0, < 4.0) jekyll-default-layout (0.1.4) jekyll (~> 3.0) @@ -124,6 +142,8 @@ GEM jekyll-github-metadata (2.13.0) jekyll (>= 3.4, < 5.0) octokit (~> 4.0, != 4.4.0) + jekyll-include-cache (0.2.1) + jekyll (>= 3.7, < 5.0) jekyll-mentions (1.6.0) html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) @@ -143,50 +163,50 @@ GEM rubyzip (>= 1.3.0, < 3.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.7.1) + jekyll-seo-tag (2.8.0) jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) jekyll-swiss (1.0.0) - jekyll-theme-architect (0.1.1) - jekyll (~> 3.5) + jekyll-theme-architect (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-cayman (0.1.1) - jekyll (~> 3.5) + jekyll-theme-cayman (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-dinky (0.1.1) - jekyll (~> 3.5) + jekyll-theme-dinky (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-hacker (0.1.2) + jekyll-theme-hacker (0.2.0) jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-leap-day (0.1.1) - jekyll (~> 3.5) + jekyll-theme-leap-day (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-merlot (0.1.1) - jekyll (~> 3.5) + jekyll-theme-merlot (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-midnight (0.1.1) - jekyll (~> 3.5) + jekyll-theme-midnight (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-minimal (0.1.1) - jekyll (~> 3.5) + jekyll-theme-minimal (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-modernist (0.1.1) - jekyll (~> 3.5) + jekyll-theme-modernist (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-primer (0.5.4) + jekyll-theme-primer (0.6.0) jekyll (> 3.5, < 5.0) jekyll-github-metadata (~> 2.9) jekyll-seo-tag (~> 2.0) - jekyll-theme-slate (0.1.1) - jekyll (~> 3.5) + jekyll-theme-slate (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-tactile (0.1.1) - jekyll (~> 3.5) + jekyll-theme-tactile (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-time-machine (0.1.1) - jekyll (~> 3.5) + jekyll-theme-time-machine (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) jekyll-titles-from-headings (0.5.3) jekyll (>= 3.3, < 5.0) @@ -201,7 +221,7 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.5.1) + listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) @@ -210,27 +230,25 @@ GEM jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.14.4) + minitest (5.15.0) multipart-post (2.1.1) nokogiri (1.13.3) mini_portile2 (~> 2.8.0) racc (~> 1.4) - octokit (4.20.0) + octokit (4.22.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (4.0.6) racc (1.6.0) - rb-fsevent (0.10.4) + rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.5) rouge (3.26.0) - ruby-enum (0.9.0) - i18n - ruby2_keywords (0.0.4) - rubyzip (2.3.0) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) safe_yaml (1.0.5) sass (3.7.4) sass-listen (~> 4.0.0) @@ -249,23 +267,23 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.9) thread_safe (~> 0.1) - tzinfo-data (1.2021.1) + tzinfo-data (1.2022.1) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) + unf_ext (0.0.8.1) + unicode-display_width (1.8.0) wdm (0.1.1) - zeitwerk (2.4.2) + zeitwerk (2.5.4) PLATFORMS ruby DEPENDENCIES - github-pages + github-pages (~> 225) tzinfo (~> 1.2) tzinfo-data wdm (~> 0.1.1) BUNDLED WITH - 2.1.4 + 2.2.22