Fix/clean scripts, generated code, and calls

Deleting the entire `generated` directory and running `make update`
works. Modifying an api and running `make verify` works as expected.

Signed-off-by: Carlisia <[email protected]>

Makefile

@@ -206,18 +206,12 @@ ifneq ($(SKIP_TESTS), 1)
 	hack/test.sh $(WHAT)
 endif
 
-verify: verify-gen
+verify:
 ifneq ($(SKIP_TESTS), 1)
 	@$(MAKE) shell CMD="-c 'hack/verify-all.sh'"
 endif
 
-verify-gen: generate
-	@if !(git diff --quiet HEAD); then \
-		git diff; \
-		echo "files were out of date, `make generate` was run"; exit 1; \
-	fi
-
-update: manifests generate
+update: manifests
 	@$(MAKE) shell CMD="-c 'hack/update-all.sh'"
 
 build-dirs:
@@ -318,10 +312,6 @@ endif
 manifests: controller-gen
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./pkg/apis/velero/v1" output:crd:artifacts:config=config/crd/bases
 
-# Generate code
-generate: controller-gen
-	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./pkg/apis/velero/v1"
-
 # find or download controller-gen
 # download controller-gen if necessary
 controller-gen:

config/crd/bases/velero.io_backupstoragelocations.yaml

@@ -8,24 +8,17 @@ metadata:
   creationTimestamp: null
   name: backupstoragelocations.velero.io
 spec:
-  additionalPrinterColumns:
-  - JSONPath: .status.phase
-    description: Backup Storage Location status such as Available/Unavailable
-    name: Phase
-    type: string
   group: velero.io
   names:
     kind: BackupStorageLocation
     listKind: BackupStorageLocationList
     plural: backupstoragelocations
     singular: backupstoragelocation
   scope: Namespaced
-  subresources:
-    status: {}
   validation:
     openAPIV3Schema:
-      description: BackupStorageLocation is the Schema for the backupstoragelocations
-        API
+      description: BackupStorageLocation is a location where Velero stores backup
+        objects.
       properties:
         apiVersion:
           description: 'APIVersion defines the versioned schema of this representation
@@ -40,8 +33,8 @@ spec:
         metadata:
           type: object
         spec:
-          description: BackupStorageLocationSpec defines the desired state of a Velero
-            BackupStorageLocation
+          description: BackupStorageLocationSpec defines the specification for a Velero
+            BackupStorageLocation.
           properties:
             accessMode:
               description: AccessMode defines the permissions for the backup storage
@@ -87,7 +80,8 @@ spec:
           - provider
           type: object
         status:
-          description: BackupStorageLocationStatus defines the observed state of BackupStorageLocation
+          description: BackupStorageLocationStatus describes the current status of
+            a Velero BackupStorageLocation.
           properties:
             accessMode:
               description: "AccessMode is an unused field. \n Deprecated: there is

design/backup-resource-list.md

@@ -57,10 +57,10 @@ The Backupper currently initialises a map to track the `backedUpItems` (https://
 This property will be moved to the [Backup request struct](https://github.com/heptio/velero/blob/16910a6215cbd8f0bde385dba9879629ebcbcc28/pkg/backup/request.go#L11), allowing the BackupController to access it after a successful backup.
 
 `backedUpItems` currently uses the `schema.GroupResource` as a key for the resource.
-In order to record the API group, version and kind for the resource, this key will be constructed from the object's `schema.GroupVersionKind` in the format `{group}/{version}/{kind}` (e.g. `apps/v1/Deployment`).
+In order to record the API group, version and kind for the resource, this key will be constructed from the object's `schema.SchemeGroupVersionKind` in the format `{group}/{version}/{kind}` (e.g. `apps/v1/Deployment`).
 
 The `backedUpItems` map is kept as a flat structure internally for quick lookup.
-When the backup is ready to upload, `backedUpItems` will be converted to a nested structure representing the metadata file above, grouped by `schema.GroupVersionKind`.
+When the backup is ready to upload, `backedUpItems` will be converted to a nested structure representing the metadata file above, grouped by `schema.SchemeGroupVersionKind`.
 After converting to the right format, it can be passed to the `persistBackup` function to persist the file in object storage.
 
 ### Changes to DownloadRequest CRD and processing

go.mod

@@ -31,7 +31,7 @@ require (
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.4.0
-	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
+	golang.org/x/net v0.0.0-20200602114024-627f9648deb9
 	google.golang.org/grpc v1.26.0
 	k8s.io/api v0.17.4
 	k8s.io/apiextensions-apiserver v0.17.4

go.sum

@@ -435,6 +435,8 @@ golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM=
+golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
@@ -467,6 +469,8 @@ golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191220220014-0732a990476f h1:72l8qCJ1nGxMGH26QVBVIxKd/D34cfGt0OvrPtpemyY=
 golang.org/x/sys v0.0.0-20191220220014-0732a990476f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

hack/update-generated-crd-code.sh

@@ -14,6 +14,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -o errexit
+set -o nounset
+set -o pipefail
+set -o xtrace
+
 # this script expects to be run from the root of the Velero repo.
 
+if [[ -z "${GOPATH}" ]]; then
+  GOPATH=~/go
+fi
+
+if [[ ! -d "${GOPATH}/src/k8s.io/code-generator" ]]; then
+  echo "k8s.io/code-generator missing from GOPATH"
+  exit 1
+fi
+
+if ! command -v controller-gen > /dev/null; then
+  echo "controller-gen is missing"
+  exit 1
+fi
+
+${GOPATH}/src/k8s.io/code-generator/generate-groups.sh \
+  all \
+  github.com/vmware-tanzu/velero/pkg/generated \
+  github.com/vmware-tanzu/velero/pkg/apis \
+  "velero:v1" \
+  --go-header-file ./hack/boilerplate.go.txt \
+  --output-base ../../.. \
+  $@
+
 go generate ./config/crd/crds

pkg/apis/velero/v1/backupstoragelocation_types.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2018, 2020 the Velero contributors.
+Copyright 2018 the Velero contributors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,85 +21,33 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 )
 
-func init() {
-	SchemeBuilder.Register(&BackupStorageLocation{}, &BackupStorageLocation{})
-}
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// BackupStorageLocationSpec defines the desired state of a Velero BackupStorageLocation
-type BackupStorageLocationSpec struct {
-	// Provider is the provider of the backup storage.
-	Provider string `json:"provider"`
-
-	// Config is for provider-specific configuration fields.
-	// +optional
-	Config map[string]string `json:"config,omitempty"`
-
-	StorageType `json:",inline"`
-
-	// AccessMode defines the permissions for the backup storage location.
-	// +optional
-	AccessMode BackupStorageLocationAccessMode `json:"accessMode,omitempty"`
-
-	// BackupSyncPeriod defines how frequently to sync backup API objects from object storage. A value of 0 disables sync.
-	// +optional
-	// +nullable
-	BackupSyncPeriod *metav1.Duration `json:"backupSyncPeriod,omitempty"`
-}
-
-// BackupStorageLocationStatus defines the observed state of BackupStorageLocation
-type BackupStorageLocationStatus struct {
-	// Phase is the current state of the BackupStorageLocation.
-	// +optional
-	Phase BackupStorageLocationPhase `json:"phase,omitempty"`
+// BackupStorageLocation is a location where Velero stores backup objects.
+type BackupStorageLocation struct {
+	metav1.TypeMeta `json:",inline"rated/clientset/versioned/typed/velero/v1/fake/fake_backupstoragelocationspec.go:77`
 
-	// LastSyncedTime is the last time the contents of the location were synced into
-	// the cluster.
 	// +optional
-	// +nullable
-	LastSyncedTime *metav1.Time `json:"lastSyncedTime,omitempty"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	// LastSyncedRevision is the value of the `metadata/revision` file in the backup
-	// storage location the last time the BSL's contents were synced into the cluster.
-	//
-	// Deprecated: this field is no longer updated or used for detecting changes to
-	// the location's contents and will be removed entirely in v2.0.
 	// +optional
-	LastSyncedRevision types.UID `json:"lastSyncedRevision,omitempty"`
+	Spec BackupStorageLocationSpec `json:"spec,omitempty"`
 
-	// AccessMode is an unused field.
-	//
-	// Deprecated: there is now an AccessMode field on the Spec and this field
-	// will be removed entirely as of v2.0.
 	// +optional
-	AccessMode BackupStorageLocationAccessMode `json:"accessMode,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-// +kubebuilder:object:generate=true
-// +kubebuilder:storageversion
-// +kubebuilder:subresource:status
-// +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase",description="Backup Storage Location status such as Available/Unavailable"
-
-// BackupStorageLocation is the Schema for the backupstoragelocations API
-type BackupStorageLocation struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   BackupStorageLocationSpec   `json:"spec,omitempty"`
 	Status BackupStorageLocationStatus `json:"status,omitempty"`
 }
 
-// +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// BackupStorageLocationList contains a list of BackupStorageLocation
+// BackupStorageLocationList is a list of BackupStorageLocations.
 type BackupStorageLocationList struct {
 	metav1.TypeMeta `json:",inline"`
+
+	// +optional
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []BackupStorageLocation `json:"items"`
-}
 
-func init() {
-	SchemeBuilder.Register(&BackupStorageLocation{}, &BackupStorageLocationList{})
+	Items []BackupStorageLocation `json:"items"`
 }
 
 // StorageType represents the type of storage that a backup location uses.
@@ -122,7 +70,28 @@ type ObjectStorageLocation struct {
 	CACert []byte `json:"caCert,omitempty"`
 }
 
-// BackupStorageLocationPhase is the lifecycle phase of a Velero BackupStorageLocation.
+// BackupStorageLocationSpec defines the specification for a Velero BackupStorageLocation.
+type BackupStorageLocationSpec struct {
+	// Provider is the provider of the backup storage.
+	Provider string `json:"provider"`
+
+	// Config is for provider-specific configuration fields.
+	// +optional
+	Config map[string]string `json:"config,omitempty"`
+
+	StorageType `json:",inline"`
+
+	// AccessMode defines the permissions for the backup storage location.
+	// +optional
+	AccessMode BackupStorageLocationAccessMode `json:"accessMode,omitempty"`
+
+	// BackupSyncPeriod defines how frequently to sync backup API objects from object storage. A value of 0 disables sync.
+	// +optional
+	// +nullable
+	BackupSyncPeriod *metav1.Duration `json:"backupSyncPeriod,omitempty"`
+}
+
+// BackupStorageLocationPhase is the lifecyle phase of a Velero BackupStorageLocation.
 // +kubebuilder:validation:Enum=Available;Unavailable
 type BackupStorageLocationPhase string
 
@@ -148,3 +117,31 @@ const (
 
 // TODO(2.0): remove the AccessMode field from BackupStorageLocationStatus.
 // TODO(2.0): remove the LastSyncedRevision field from BackupStorageLocationStatus.
+
+// BackupStorageLocationStatus describes the current status of a Velero BackupStorageLocation.
+type BackupStorageLocationStatus struct {
+	// Phase is the current state of the BackupStorageLocation.
+	// +optional
+	Phase BackupStorageLocationPhase `json:"phase,omitempty"`
+
+	// LastSyncedTime is the last time the contents of the location were synced into
+	// the cluster.
+	// +optional
+	// +nullable
+	LastSyncedTime *metav1.Time `json:"lastSyncedTime,omitempty"`
+
+	// LastSyncedRevision is the value of the `metadata/revision` file in the backup
+	// storage location the last time the BSL's contents were synced into the cluster.
+	//
+	// Deprecated: this field is no longer updated or used for detecting changes to
+	// the location's contents and will be removed entirely in v2.0.
+	// +optional
+	LastSyncedRevision types.UID `json:"lastSyncedRevision,omitempty"`
+
+	// AccessMode is an unused field.
+	//
+	// Deprecated: there is now an AccessMode field on the Spec and this field
+	// will be removed entirely as of v2.0.
+	// +optional
+	AccessMode BackupStorageLocationAccessMode `json:"accessMode,omitempty"`
+}

pkg/apis/velero/v1/groupversion_info.go

@@ -20,16 +20,16 @@ limitations under the License.
 package v1
 
 import (
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
-	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "velero.io", Version: "v1"}
+	// SchemeGroupVersion is group version used to register these objects
+	SchemeGroupVersion = schema.GroupVersion{Group: "velero.io", Version: "v1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme

pkg/apis/velero/v1/register.go

@@ -24,7 +24,7 @@ import (
 
 // Resource gets a Velero GroupResource for a specified resource
 func Resource(resource string) schema.GroupResource {
-	return GroupVersion.WithResource(resource).GroupResource()
+	return SchemeGroupVersion.WithResource(resource).GroupResource()
 }
 
 type typeInfo struct {
@@ -61,9 +61,9 @@ func CustomResources() map[string]typeInfo {
 
 func addKnownTypes(scheme *runtime.Scheme) error {
 	for _, typeInfo := range CustomResources() {
-		scheme.AddKnownTypes(GroupVersion, typeInfo.ItemType, typeInfo.ItemListType)
+		scheme.AddKnownTypes(SchemeGroupVersion, typeInfo.ItemType, typeInfo.ItemListType)
 	}
 
-	metav1.AddToGroupVersion(scheme, GroupVersion)
+	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
 }