Prepare for release 3.4.22-v11 (#1062)

ProductLine: Stash

Release: v2021.08.02

Release-tracker: stashed/CHANGELOG#39
Signed-off-by: 1gtm <1gtm@appscode.com>

Author: 1gtm

go.mod

@@ -19,7 +19,7 @@ require (
 	kmodules.xyz/custom-resources v0.0.0-20210618003440-c6bb400da153
 	kmodules.xyz/offshoot-api v0.0.0-20210618005544-5217a24765da
 	kubedb.dev/apimachinery v0.18.1-0.20210618122709-e98fb31f5dfb
-	stash.appscode.dev/apimachinery v0.14.1
+	stash.appscode.dev/apimachinery v0.15.0
 )
 
 replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d

go.sum

@@ -1180,5 +1180,5 @@ software.sslmate.com/src/go-pkcs12 v0.0.0-20180114231543-2291e8f0f237/go.mod h1:
 software.sslmate.com/src/go-pkcs12 v0.0.0-20200830195227-52f69702a001/go.mod h1:/xvNRWUqm0+/ZMiF4EX00vrSCMsE4/NHb+Pt3freEeQ=
 sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
 stash.appscode.dev/apimachinery v0.14.1-0.20210618025054-0cae462d7e04/go.mod h1:/Ys7EVp/ved+2xkfhqMbRpaJtI3p/KpCPRLJ6ZgDddA=
-stash.appscode.dev/apimachinery v0.14.1 h1:HU6ediYchu138WckGEN+uXF7l99kd9bAbqBeZFnQLNk=
-stash.appscode.dev/apimachinery v0.14.1/go.mod h1:/Ys7EVp/ved+2xkfhqMbRpaJtI3p/KpCPRLJ6ZgDddA=
+stash.appscode.dev/apimachinery v0.15.0 h1:vpwPKV6LP4ieZ87/2ri3ms4r3ZnE8bES24y8bbLYxqE=
+stash.appscode.dev/apimachinery v0.15.0/go.mod h1:ColOw+Y5IeI3DO5bu1WZWw2AAhinz99K6fKKVLNkd2U=

vendor/modules.txt

@@ -584,7 +584,7 @@ sigs.k8s.io/structured-merge-diff/v4/typed
 sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.2.0
 sigs.k8s.io/yaml
-# stash.appscode.dev/apimachinery v0.14.1
+# stash.appscode.dev/apimachinery v0.15.0
 ## explicit
 stash.appscode.dev/apimachinery/apis
 stash.appscode.dev/apimachinery/apis/repositories

vendor/stash.appscode.dev/apimachinery/apis/stash/v1beta1/backup_session_types.go

@@ -37,6 +37,7 @@ const (
 // +kubebuilder:printcolumn:name="Invoker-Type",type="string",JSONPath=".spec.invoker.kind"
 // +kubebuilder:printcolumn:name="Invoker-Name",type="string",JSONPath=".spec.invoker.name"
 // +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase"
+// +kubebuilder:printcolumn:name="Duration",type="string",JSONPath=".status.sessionDuration"
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 type BackupSession struct {
 	metav1.TypeMeta   `json:",inline"`

vendor/stash.appscode.dev/apimachinery/apis/stash/v1beta1/generated.proto

@@ -39,6 +39,7 @@ const (
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Repository",type="string",JSONPath=".spec.repository.name"
 // +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase"
+// +kubebuilder:printcolumn:name="Duration",type="string",JSONPath=".status.sessionDuration"
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 type RestoreSession struct {
 	metav1.TypeMeta   `json:",inline,omitempty"`

vendor/stash.appscode.dev/apimachinery/apis/stash/v1beta1/restore_session_types.go

@@ -39,17 +39,12 @@ func load(filename string, o interface{}) error {
 func CustomResourceDefinition(gvr schema.GroupVersionResource) (*apiextensions.CustomResourceDefinition, error) {
 	var out apiextensions.CustomResourceDefinition
 
-	v1file := fmt.Sprintf("%s_%s.v1.yaml", gvr.Group, gvr.Resource)
+	v1file := fmt.Sprintf("%s_%s.yaml", gvr.Group, gvr.Resource)
 	if err := load(v1file, &out.V1); err != nil {
 		return nil, err
 	}
 
-	v1beta1file := fmt.Sprintf("%s_%s.yaml", gvr.Group, gvr.Resource)
-	if err := load(v1beta1file, &out.V1beta1); err != nil {
-		return nil, err
-	}
-
-	if out.V1 == nil && out.V1beta1 == nil {
+	if out.V1 == nil {
 		return nil, fmt.Errorf("missing crd yamls for gvr: %s", gvr)
 	}
 

vendor/stash.appscode.dev/apimachinery/crds/lib.go

@@ -1,78 +1,76 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
   labels:
     app.kubernetes.io/name: stash
   name: snapshots.repositories.stash.appscode.com
 spec:
-  additionalPrinterColumns:
-  - JSONPath: .status.repository
-    name: Repository
-    type: string
-  - JSONPath: .status.hostname
-    name: Hostname
-    type: string
   group: repositories.stash.appscode.com
   names:
     kind: Snapshot
     listKind: SnapshotList
     plural: snapshots
     singular: snapshot
-  preserveUnknownFields: false
   scope: Namespaced
-  subresources: {}
-  validation:
-    openAPIV3Schema:
-      properties:
-        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/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/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          type: object
-        status:
-          properties:
-            gid:
-              format: int32
-              type: integer
-            hostname:
-              type: string
-            paths:
-              items:
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.repository
+      name: Repository
+      type: string
+    - jsonPath: .status.hostname
+      name: Hostname
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          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/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/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          status:
+            properties:
+              gid:
+                format: int32
+                type: integer
+              hostname:
                 type: string
-              type: array
-            repository:
-              type: string
-            tags:
-              items:
+              paths:
+                items:
+                  type: string
+                type: array
+              repository:
                 type: string
-              type: array
-            tree:
-              type: string
-            uid:
-              format: int32
-              type: integer
-            username:
-              type: string
-          required:
-          - gid
-          - hostname
-          - paths
-          - repository
-          - tree
-          - uid
-          - username
-          type: object
-      type: object
-  version: v1alpha1
-  versions:
-  - name: v1alpha1
+              tags:
+                items:
+                  type: string
+                type: array
+              tree:
+                type: string
+              uid:
+                format: int32
+                type: integer
+              username:
+                type: string
+            required:
+            - gid
+            - hostname
+            - paths
+            - repository
+            - tree
+            - uid
+            - username
+            type: object
+        type: object
     served: true
     storage: true
+    subresources: {}