Merge pull request #480 from JohnStrunk/relprep

Prep for v3.3 release
backube · Sep 22, 2023 · e8cb6a5 · e8cb6a5
2 parents 4e74efa + ba16e86
commit e8cb6a5
Show file tree

Hide file tree

Showing 11 changed files with 79 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,17 @@ This project follows [Semantic Versioning](https://semver.org/)
 
 ## [Unreleased]
 
+## [3.3.0] - 2023-09-22
+
+### Added
+
+- Ability to set a `priorityClassName` for the operator via Helm chart
+- Ability to set pod labels and annotations for the operator via Helm chart
+
+### Fixed
+
+- Improve cronspec validation to allow "slash" notation
+
 ## [3.2.0] - 2022-10-10
 
 ### Added
@@ -130,7 +141,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.2.0...HEAD
+[Unreleased]: https://github.com/backube/snapscheduler/compare/v3.3.0...HEAD
+[3.3.0]: https://github.com/backube/snapscheduler/compare/v3.2.0...v3.3.0
 [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

diff --git 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.23.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.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-controller-manager-metrics-service_v1_service.yaml b/bundle/manifests/snapscheduler-controller-manager-metrics-service_v1_service.yaml
@@ -3,6 +3,12 @@ kind: Service
 metadata:
   creationTimestamp: null
   labels:
+    app.kubernetes.io/component: kube-rbac-proxy
+    app.kubernetes.io/created-by: snapscheduler
+    app.kubernetes.io/instance: controller-manager-metrics-service
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: service
+    app.kubernetes.io/part-of: snapscheduler
     control-plane: controller-manager
   name: snapscheduler-controller-manager-metrics-service
 spec:

diff --git a/bundle/manifests/snapscheduler-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml b/bundle/manifests/snapscheduler-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml
@@ -2,6 +2,13 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
+  labels:
+    app.kubernetes.io/component: kube-rbac-proxy
+    app.kubernetes.io/created-by: snapscheduler
+    app.kubernetes.io/instance: metrics-reader
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: clusterrole
+    app.kubernetes.io/part-of: snapscheduler
   name: snapscheduler-metrics-reader
 rules:
 - nonResourceURLs:

diff --git 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.9.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   creationTimestamp: null
   name: snapshotschedules.snapscheduler.backube
 spec:
@@ -95,6 +95,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+                x-kubernetes-map-type: atomic
               disabled:
                 description: Indicates that this schedule should be temporarily disabled
                 type: boolean
@@ -117,7 +118,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: ^(@(annually|yearly|monthly|weekly|daily|hourly))|((((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|\*)\s?){5,7})$
+                pattern: ^(@(annually|yearly|monthly|weekly|daily|hourly))|((((\d+,)*\d+|(\d+(\/|-)\d+)|\*(\/\d+)?)\s?){5})$
                 type: string
               snapshotTemplate:
                 description: A template to customize the Snapshots.

diff --git a/bundle/manifests/snapscheduler.clusterserviceversion.yaml b/bundle/manifests/snapscheduler.clusterserviceversion.yaml
@@ -8,6 +8,13 @@ metadata:
           "apiVersion": "snapscheduler.backube/v1",
           "kind": "SnapshotSchedule",
           "metadata": {
+            "labels": {
+              "app.kubernetes.io/created-by": "snapscheduler",
+              "app.kubernetes.io/instance": "daily",
+              "app.kubernetes.io/managed-by": "kustomize",
+              "app.kubernetes.io/name": "snapshotschedule",
+              "app.kubernetes.io/part-of": "snapscheduler"
+            },
             "name": "daily"
           },
           "spec": {
@@ -21,14 +28,15 @@ metadata:
     capabilities: Full Lifecycle
     categories: Storage
     certified: "false"
+    containerImage: quay.io/backube/snapscheduler:v3.3.0
+    createdAt: "2023-09-22T15:45:56Z"
     description: The SnapScheduler operator takes snapshots of Kubernetes CSI-based
       persistent volumes according to user-supplied schedules.
-    operators.operatorframework.io/builder: operator-sdk-v1.23.0
+    operators.operatorframework.io/builder: operator-sdk-v1.31.0
     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:3.2.0
-  name: snapscheduler.v3.2.0
+  name: snapscheduler.v3.3.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -242,6 +250,12 @@ spec:
         serviceAccountName: snapscheduler-controller-manager
       deployments:
       - label:
+          app.kubernetes.io/component: manager
+          app.kubernetes.io/created-by: snapscheduler
+          app.kubernetes.io/instance: controller-manager
+          app.kubernetes.io/managed-by: kustomize
+          app.kubernetes.io/name: deployment
+          app.kubernetes.io/part-of: snapscheduler
           control-plane: controller-manager
         name: snapscheduler-controller-manager
         spec:
@@ -257,6 +271,18 @@ spec:
                 control-plane: controller-manager
             spec:
               affinity:
+                nodeAffinity:
+                  requiredDuringSchedulingIgnoredDuringExecution:
+                    nodeSelectorTerms:
+                    - matchExpressions:
+                      - key: kubernetes.io/arch
+                        operator: In
+                        values:
+                        - amd64
+                      - key: kubernetes.io/os
+                        operator: In
+                        values:
+                        - linux
                 podAntiAffinity:
                   preferredDuringSchedulingIgnoredDuringExecution:
                   - podAffinityTerm:
@@ -274,7 +300,7 @@ spec:
                 - --upstream=http://127.0.0.1:8080/
                 - --logtostderr=true
                 - --v=0
-                image: quay.io/brancz/kube-rbac-proxy:v0.13.1
+                image: quay.io/brancz/kube-rbac-proxy:v0.14.3
                 name: kube-rbac-proxy
                 ports:
                 - containerPort: 8443
@@ -298,7 +324,7 @@ spec:
                 - --leader-elect
                 command:
                 - /manager
-                image: quay.io/backube/snapscheduler:3.2.0
+                image: quay.io/backube/snapscheduler:3.3.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -392,4 +418,4 @@ spec:
   provider:
     name: Backube
     url: https://github.com/backube
-  version: 3.2.0
+  version: 3.3.0
diff --git 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.23.0
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.31.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
@@ -8,7 +8,7 @@ stages:
   - entrypoint:
     - scorecard-test
     - basic-check-spec
-    image: quay.io/operator-framework/scorecard-test:v1.23.0
+    image: quay.io/operator-framework/scorecard-test:v1.31.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.23.0
+    image: quay.io/operator-framework/scorecard-test:v1.31.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.23.0
+    image: quay.io/operator-framework/scorecard-test:v1.31.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.23.0
+    image: quay.io/operator-framework/scorecard-test:v1.31.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.23.0
+    image: quay.io/operator-framework/scorecard-test:v1.31.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.23.0
+    image: quay.io/operator-framework/scorecard-test:v1.31.0
     labels:
       suite: olm
       test: olm-status-descriptors-test

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -6,4 +6,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/backube/snapscheduler
-  newTag: 3.2.0
+  newTag: 3.3.0
diff --git a/docs/index.md b/docs/index.md
@@ -25,6 +25,7 @@ Kubernetes version compatibility:
 | 3.0           | 1.20 -- 1.24+ | `v1`                      |
 | 3.1           | 1.20 -- 1.24+ | `v1`                      |
 | 3.2           | 1.20 -- 1.25+ | `v1`                      |
+| 3.3           | 1.20 -- 1.28+ | `v1`                      |
 | master        | 1.20 -- 1.28+ | `v1`                      |
 
 ## Contents

diff --git a/helm/snapscheduler/Chart.yaml b/helm/snapscheduler/Chart.yaml
@@ -23,22 +23,20 @@ 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.2.0"
+appVersion: "3.3.0"
 annotations:
+  artifacthub.io/category: storage
   # https://artifacthub.io/docs/topics/annotations/helm/
   # Changelog for current chart & app version
   # Supported kinds: added, changed, deprecated, removed, fixed, security
   artifacthub.io/changes: |
     - kind: added
-      description: Added ability to specify a container hash instead of just a tag
-    - kind: changed
-      description: Helm chart now directly manages CRD installation/upgrade
-    - kind: changed
-      description: Made CRD validation of cronspec more permissive
-    - kind: changed
-      description: Upgrade operator-sdk to 1.23.0
-    - kind: security
-      description: Upgrade quay.io/brancz/kube-rbac-proxy to v0.13.1
+      description: Ability to set a `priorityClassName` for the operator via Helm chart
+    - kind: added
+      description: Ability to set pod labels and annotations for the operator via Helm chart
+    - kind: fixed
+      description: Improve cronspec validation to allow "slash" notation
+  artifacthub.io/containsSecurityUpdates: "true"
   artifacthub.io/crds: |
     - kind: SnapshotSchedule
       version: v1