Skip to content

Commit

Permalink
Merge pull request #76 from JohnStrunk/release-1.1
Browse files Browse the repository at this point in the history
Prep for release 1.1
  • Loading branch information
JohnStrunk authored Feb 13, 2020
2 parents 15312bc + c80cd38 commit b88ee97
Show file tree
Hide file tree
Showing 10 changed files with 106 additions and 32 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]

## [1.1.0] - 2019-02-12

### Added

- Support Kubernetes 1.17 and `snapshot.storage.k8s.io/v1beta1` snapshot version
Expand All @@ -19,5 +21,6 @@ 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/v1.0.0...HEAD
[unreleased]: https://github.com/backube/snapscheduler/compare/v1.1.0...HEAD
[1.1.0]: https://github.com/backube/snapscheduler/compare/v1.0.0...v1.1.0
[1.0.0]: https://github.com/backube/snapscheduler/releases/tag/v1.0.0
7 changes: 1 addition & 6 deletions docs/Gemfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
source "https://rubygems.org"
# Serve documentation locally with:
# bundle update
# bundle exec jekyll serve
# bundle exec jekyll serve -w -l

#gem "minima"
gem "github-pages", group: :jekyll_plugins
#group :jekyll_plugins do
# gem "jekyll-feed"
# gem "jemoji"
#end

# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
# and associated library.
Expand Down
35 changes: 18 additions & 17 deletions docs/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (6.0.1)
activesupport (6.0.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand All @@ -16,7 +16,7 @@ GEM
colorator (1.1.0)
commonmarker (0.17.13)
ruby-enum (~> 0.5)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.6)
dnsruby (1.61.3)
addressable (~> 2.5)
em-websocket (0.5.1)
Expand All @@ -26,12 +26,12 @@ GEM
ffi (>= 1.3.0)
eventmachine (1.2.7)
execjs (2.7.0)
faraday (0.17.1)
faraday (1.0.0)
multipart-post (>= 1.2, < 3)
ffi (1.11.3)
ffi (1.12.2)
forwardable-extended (2.6.0)
gemoji (3.0.1)
github-pages (203)
github-pages (204)
github-pages-health-check (= 1.16.1)
jekyll (= 3.8.5)
jekyll-avatar (= 0.7.0)
Expand All @@ -40,7 +40,7 @@ GEM
jekyll-default-layout (= 0.1.4)
jekyll-feed (= 0.13.0)
jekyll-gist (= 1.5.0)
jekyll-github-metadata (= 2.12.1)
jekyll-github-metadata (= 2.13.0)
jekyll-mentions (= 1.5.1)
jekyll-optional-front-matter (= 0.3.2)
jekyll-paginate (= 1.1.0)
Expand Down Expand Up @@ -80,7 +80,7 @@ GEM
octokit (~> 4.0)
public_suffix (~> 3.0)
typhoeus (~> 1.3)
html-pipeline (2.12.2)
html-pipeline (2.12.3)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
Expand Down Expand Up @@ -117,8 +117,8 @@ GEM
jekyll (>= 3.7, < 5.0)
jekyll-gist (1.5.0)
octokit (~> 4.2)
jekyll-github-metadata (2.12.1)
jekyll (~> 3.4)
jekyll-github-metadata (2.13.0)
jekyll (>= 3.4, < 5.0)
octokit (~> 4.0, != 4.4.0)
jekyll-mentions (1.5.1)
html-pipeline (~> 2.3)
Expand Down Expand Up @@ -202,22 +202,23 @@ GEM
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.13.0)
minitest (5.14.0)
multipart-post (2.1.1)
nokogiri (1.10.7)
nokogiri (1.10.8)
mini_portile2 (~> 2.4.0)
octokit (4.14.0)
octokit (4.16.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (3.1.1)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
rouge (3.13.0)
ruby-enum (0.7.2)
i18n
rubyzip (2.0.0)
rubyzip (2.2.0)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
Expand All @@ -232,11 +233,11 @@ GEM
thread_safe (0.3.6)
typhoeus (1.3.1)
ethon (>= 0.9.0)
tzinfo (1.2.5)
tzinfo (1.2.6)
thread_safe (~> 0.1)
tzinfo-data (1.2019.3)
tzinfo (>= 1.0.0)
unicode-display_width (1.6.0)
unicode-display_width (1.6.1)
wdm (0.1.1)
zeitwerk (2.2.2)

Expand All @@ -250,4 +251,4 @@ DEPENDENCIES
wdm (~> 0.1.1)

BUNDLED WITH
2.0.2
2.1.4
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ The documentation can be viewed/edited locally using [jekyll](https://jekyllrb.c
* Install/update the local gems
* `bundle update`
* Serve the docs
* `PAGES_REPO_NWO=backube/snapscheduler bundle exec jekyll serve -l`
* `PAGES_REPO_NWO=backube/snapscheduler bundle exec jekyll serve -l -w`
1 change: 1 addition & 0 deletions docs/_includes/twitter-follow.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<a href="https://twitter.com/BackubeProject?ref_src=twsrc%5Etfw" class="twitter-follow-button" data-size="large" data-show-count="false">Follow @BackubeProject</a><script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
66 changes: 66 additions & 0 deletions docs/_layouts/default.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<!DOCTYPE html>
<html lang="{{ site.lang | default: "en-US" }}">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">

{% seo %}
<link rel="stylesheet" href="{{ "/assets/css/style.css?v=" | append: site.github.build_revision | relative_url }}">
<!--[if lt IE 9]>
<script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
<![endif]-->
</head>
<body>
<div class="wrapper">
<header>
<h1><a href="{{ "/" | absolute_url }}">{{ site.title | default: site.github.repository_name }}</a></h1>

{% if site.logo %}
<img src="{{site.logo | relative_url}}" alt="Logo" />
{% endif %}

<p>{{ site.description | default: site.github.project_tagline }}</p>

{% if site.github.is_project_page %}
<p class="view"><a href="{{ site.github.repository_url }}">View the Project on GitHub <small>{{ site.github.repository_nwo }}</small></a></p>
{% endif %}

{% if site.github.is_user_page %}
<p class="view"><a href="{{ site.github.owner_url }}">View My GitHub Profile</a></p>
{% endif %}

{% if site.show_downloads %}
<ul class="downloads">
<li><a href="{{ site.github.zip_url }}">Download <strong>ZIP File</strong></a></li>
<li><a href="{{ site.github.tar_url }}">Download <strong>TAR Ball</strong></a></li>
<li><a href="{{ site.github.repository_url }}">View On <strong>GitHub</strong></a></li>
</ul>
{% endif %}
</header>
<section>

{{ content }}

</section>
<footer>
{% if site.github.is_project_page %}
<p>This project is maintained by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a></p>
{% endif %}
<p>{% include twitter-follow.html %}</p>
<p><small>Hosted on GitHub Pages &mdash; Theme by <a href="https://github.com/orderedlist">orderedlist</a></small></p>
</footer>
</div>
<script src="{{ "/assets/js/scale.fix.js" | relative_url }}"></script>
{% if site.google_analytics %}
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', '{{ site.google_analytics }}', 'auto');
ga('send', 'pageview');
</script>
{% endif %}
</body>
</html>
8 changes: 8 additions & 0 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@ storage
drivers](https://kubernetes.io/blog/2019/01/15/container-storage-interface-ga/)
that are capable of taking volume snapshots.

Kubernetes version compatibility:

| snapscheduler | Kubernetes | `snapshot.storage.k8s.io` |
|---------------|---------------|---------------------------|
| 1.0 | 1.13 -- 1.16 | `v1alpha1` |
| 1.1 | 1.13 -- 1.17+ | `v1alpha1`, `v1beta1` |
| master | 1.13 -- 1.17+ | `v1alpha1`, `v1beta1` |

## Contents

User documentation
Expand Down
8 changes: 4 additions & 4 deletions helm/snapscheduler/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
apiVersion: v2
name: snapscheduler
# Chart version: Incremented during chart, template, or appVersion changes.
version: "1.0.2"
version: "1.1.0"
description: >-
An operator to take scheduled snapshots of Kubernetes persistent volumes
type: application
# Minimum kube version 1.12 since we use CSI snapshots
kubeVersion: "^1.12"
# Minimum kube version 1.13
kubeVersion: "^1.13"
keywords:
- csi
- scheduler
Expand All @@ -22,4 +22,4 @@ 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: "1.0.0"
appVersion: "1.1.0"
2 changes: 1 addition & 1 deletion helm/snapscheduler/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ for more information.

## Requirements

- Kubernetes >= 1.12
- Kubernetes >= 1.13
- CSI-based storage driver that supports snapshots (i.e. has the
`CREATE_DELETE_SNAPSHOT` capability)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ spec:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
Expand Down

0 comments on commit b88ee97

Please sign in to comment.