From daf1a755155c4231a447a3505144a1749fafdd91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Lipt=C3=A1k?= Date: Wed, 21 Nov 2018 08:31:14 -0500 Subject: [PATCH] Bring Go current in Travis MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gábor Lipták --- .travis.yml | 2 +- hack/build-image/Dockerfile | 2 +- pkg/backup/group_backupper_test.go | 2 +- pkg/backup/item_backupper_test.go | 124 +++++++++--------- pkg/backup/rbac.go | 2 +- pkg/backup/resource_backupper_test.go | 2 +- pkg/backup/service_account_action_test.go | 6 +- pkg/cmd/cli/backup/create.go | 14 +- pkg/cmd/server/server.go | 14 +- pkg/cmd/util/output/backup_describer.go | 2 +- pkg/cmd/util/output/restore_describer.go | 2 +- .../pod_volume_restore_controller_test.go | 2 +- pkg/controller/restore_controller_test.go | 2 +- pkg/plugin/manager_test.go | 8 +- pkg/restic/repository_manager.go | 4 +- 15 files changed, 94 insertions(+), 94 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6110110cb..e9891094a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.10.x + - 1.11.x sudo: required diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index 0ed10e6c7..8ddcc33a1 100644 --- a/hack/build-image/Dockerfile +++ b/hack/build-image/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.10-alpine3.8 +FROM golang:1.11-alpine3.8 RUN apk add --update --no-cache git bash && \ mkdir -p /go/src/k8s.io && \ diff --git a/pkg/backup/group_backupper_test.go b/pkg/backup/group_backupper_test.go index 00179b89a..602145d85 100644 --- a/pkg/backup/group_backupper_test.go +++ b/pkg/backup/group_backupper_test.go @@ -54,7 +54,7 @@ func TestBackupGroupBacksUpCorrectResourcesInCorrectOrder(t *testing.T) { ).Return(resourceBackupper) gb := &defaultGroupBackupper{ - log: arktest.NewLogger(), + log: arktest.NewLogger(), resourceBackupperFactory: resourceBackupperFactory, } diff --git a/pkg/backup/item_backupper_test.go b/pkg/backup/item_backupper_test.go index ba9880cd5..5fb3c77a0 100644 --- a/pkg/backup/item_backupper_test.go +++ b/pkg/backup/item_backupper_test.go @@ -177,16 +177,16 @@ func TestBackupItemNoSkips(t *testing.T) { expectedTrackedPVCs sets.String }{ { - name: "explicit namespace include", - item: `{"metadata":{"namespace":"foo","name":"bar"}}`, + name: "explicit namespace include", + item: `{"metadata":{"namespace":"foo","name":"bar"}}`, namespaceIncludesExcludes: collections.NewIncludesExcludes().Includes("foo"), expectError: false, expectExcluded: false, expectedTarHeaderName: "resources/resource.group/namespaces/foo/bar.json", }, { - name: "* namespace include", - item: `{"metadata":{"namespace":"foo","name":"bar"}}`, + name: "* namespace include", + item: `{"metadata":{"namespace":"foo","name":"bar"}}`, namespaceIncludesExcludes: collections.NewIncludesExcludes().Includes("*"), expectError: false, expectExcluded: false, @@ -212,34 +212,34 @@ func TestBackupItemNoSkips(t *testing.T) { tarWriteError: true, }, { - name: "action invoked - cluster-scoped", + name: "action invoked - cluster-scoped", namespaceIncludesExcludes: collections.NewIncludesExcludes().Includes("*"), - item: `{"metadata":{"name":"bar"}}`, - expectError: false, - expectExcluded: false, - expectedTarHeaderName: "resources/resource.group/cluster/bar.json", - customAction: true, - expectedActionID: "bar", + item: `{"metadata":{"name":"bar"}}`, + expectError: false, + expectExcluded: false, + expectedTarHeaderName: "resources/resource.group/cluster/bar.json", + customAction: true, + expectedActionID: "bar", }, { - name: "action invoked - namespaced", + name: "action invoked - namespaced", namespaceIncludesExcludes: collections.NewIncludesExcludes().Includes("*"), - item: `{"metadata":{"namespace": "myns", "name":"bar"}}`, - expectError: false, - expectExcluded: false, - expectedTarHeaderName: "resources/resource.group/namespaces/myns/bar.json", - customAction: true, - expectedActionID: "myns/bar", + item: `{"metadata":{"namespace": "myns", "name":"bar"}}`, + expectError: false, + expectExcluded: false, + expectedTarHeaderName: "resources/resource.group/namespaces/myns/bar.json", + customAction: true, + expectedActionID: "myns/bar", }, { - name: "action invoked - additional items", + name: "action invoked - additional items", namespaceIncludesExcludes: collections.NewIncludesExcludes().Includes("*"), - item: `{"metadata":{"namespace": "myns", "name":"bar"}}`, - expectError: false, - expectExcluded: false, - expectedTarHeaderName: "resources/resource.group/namespaces/myns/bar.json", - customAction: true, - expectedActionID: "myns/bar", + item: `{"metadata":{"namespace": "myns", "name":"bar"}}`, + expectError: false, + expectExcluded: false, + expectedTarHeaderName: "resources/resource.group/namespaces/myns/bar.json", + customAction: true, + expectedActionID: "myns/bar", customActionAdditionalItemIdentifiers: []ResourceIdentifier{ { GroupResource: schema.GroupResource{Group: "g1", Resource: "r1"}, @@ -258,14 +258,14 @@ func TestBackupItemNoSkips(t *testing.T) { }, }, { - name: "action invoked - additional items - error", + name: "action invoked - additional items - error", namespaceIncludesExcludes: collections.NewIncludesExcludes().Includes("*"), - item: `{"metadata":{"namespace": "myns", "name":"bar"}}`, - expectError: true, - expectExcluded: false, - expectedTarHeaderName: "resources/resource.group/namespaces/myns/bar.json", - customAction: true, - expectedActionID: "myns/bar", + item: `{"metadata":{"namespace": "myns", "name":"bar"}}`, + expectError: true, + expectExcluded: false, + expectedTarHeaderName: "resources/resource.group/namespaces/myns/bar.json", + customAction: true, + expectedActionID: "myns/bar", customActionAdditionalItemIdentifiers: []ResourceIdentifier{ { GroupResource: schema.GroupResource{Group: "g1", Resource: "r1"}, @@ -285,66 +285,66 @@ func TestBackupItemNoSkips(t *testing.T) { additionalItemError: errors.New("foo"), }, { - name: "takePVSnapshot is not invoked for PVs when blockStore == nil", + name: "takePVSnapshot is not invoked for PVs when blockStore == nil", namespaceIncludesExcludes: collections.NewIncludesExcludes().Includes("*"), - item: `{"apiVersion": "v1", "kind": "PersistentVolume", "metadata": {"name": "mypv", "labels": {"failure-domain.beta.kubernetes.io/zone": "us-east-1c"}}, "spec": {"awsElasticBlockStore": {"volumeID": "aws://us-east-1c/vol-abc123"}}}`, - expectError: false, - expectExcluded: false, - expectedTarHeaderName: "resources/persistentvolumes/cluster/mypv.json", - groupResource: "persistentvolumes", + item: `{"apiVersion": "v1", "kind": "PersistentVolume", "metadata": {"name": "mypv", "labels": {"failure-domain.beta.kubernetes.io/zone": "us-east-1c"}}, "spec": {"awsElasticBlockStore": {"volumeID": "aws://us-east-1c/vol-abc123"}}}`, + expectError: false, + expectExcluded: false, + expectedTarHeaderName: "resources/persistentvolumes/cluster/mypv.json", + groupResource: "persistentvolumes", }, { - name: "takePVSnapshot is invoked for PVs when blockStore != nil", + name: "takePVSnapshot is invoked for PVs when blockStore != nil", namespaceIncludesExcludes: collections.NewIncludesExcludes().Includes("*"), - item: `{"apiVersion": "v1", "kind": "PersistentVolume", "metadata": {"name": "mypv", "labels": {"failure-domain.beta.kubernetes.io/zone": "us-east-1c"}}, "spec": {"awsElasticBlockStore": {"volumeID": "aws://us-east-1c/vol-abc123"}}}`, - expectError: false, - expectExcluded: false, - expectedTarHeaderName: "resources/persistentvolumes/cluster/mypv.json", - groupResource: "persistentvolumes", + item: `{"apiVersion": "v1", "kind": "PersistentVolume", "metadata": {"name": "mypv", "labels": {"failure-domain.beta.kubernetes.io/zone": "us-east-1c"}}, "spec": {"awsElasticBlockStore": {"volumeID": "aws://us-east-1c/vol-abc123"}}}`, + expectError: false, + expectExcluded: false, + expectedTarHeaderName: "resources/persistentvolumes/cluster/mypv.json", + groupResource: "persistentvolumes", snapshottableVolumes: map[string]api.VolumeBackupInfo{ "vol-abc123": {SnapshotID: "snapshot-1", AvailabilityZone: "us-east-1c"}, }, }, { - name: "takePVSnapshot is not invoked for PVs when their claim is tracked in the restic PVC tracker", + name: "takePVSnapshot is not invoked for PVs when their claim is tracked in the restic PVC tracker", namespaceIncludesExcludes: collections.NewIncludesExcludes().Includes("*"), - item: `{"apiVersion": "v1", "kind": "PersistentVolume", "metadata": {"name": "mypv", "labels": {"failure-domain.beta.kubernetes.io/zone": "us-east-1c"}}, "spec": {"claimRef": {"namespace": "pvc-ns", "name": "pvc"}, "awsElasticBlockStore": {"volumeID": "aws://us-east-1c/vol-abc123"}}}`, - expectError: false, - expectExcluded: false, - expectedTarHeaderName: "resources/persistentvolumes/cluster/mypv.json", - groupResource: "persistentvolumes", + item: `{"apiVersion": "v1", "kind": "PersistentVolume", "metadata": {"name": "mypv", "labels": {"failure-domain.beta.kubernetes.io/zone": "us-east-1c"}}, "spec": {"claimRef": {"namespace": "pvc-ns", "name": "pvc"}, "awsElasticBlockStore": {"volumeID": "aws://us-east-1c/vol-abc123"}}}`, + expectError: false, + expectExcluded: false, + expectedTarHeaderName: "resources/persistentvolumes/cluster/mypv.json", + groupResource: "persistentvolumes", // empty snapshottableVolumes causes a blockStore to be created, but no // snapshots are expected to be taken. snapshottableVolumes: map[string]api.VolumeBackupInfo{}, trackedPVCs: sets.NewString(key("pvc-ns", "pvc"), key("another-pvc-ns", "another-pvc")), }, { - name: "takePVSnapshot is invoked for PVs when their claim is not tracked in the restic PVC tracker", + name: "takePVSnapshot is invoked for PVs when their claim is not tracked in the restic PVC tracker", namespaceIncludesExcludes: collections.NewIncludesExcludes().Includes("*"), - item: `{"apiVersion": "v1", "kind": "PersistentVolume", "metadata": {"name": "mypv", "labels": {"failure-domain.beta.kubernetes.io/zone": "us-east-1c"}}, "spec": {"claimRef": {"namespace": "pvc-ns", "name": "pvc"}, "awsElasticBlockStore": {"volumeID": "aws://us-east-1c/vol-abc123"}}}`, - expectError: false, - expectExcluded: false, - expectedTarHeaderName: "resources/persistentvolumes/cluster/mypv.json", - groupResource: "persistentvolumes", + item: `{"apiVersion": "v1", "kind": "PersistentVolume", "metadata": {"name": "mypv", "labels": {"failure-domain.beta.kubernetes.io/zone": "us-east-1c"}}, "spec": {"claimRef": {"namespace": "pvc-ns", "name": "pvc"}, "awsElasticBlockStore": {"volumeID": "aws://us-east-1c/vol-abc123"}}}`, + expectError: false, + expectExcluded: false, + expectedTarHeaderName: "resources/persistentvolumes/cluster/mypv.json", + groupResource: "persistentvolumes", snapshottableVolumes: map[string]api.VolumeBackupInfo{ "vol-abc123": {SnapshotID: "snapshot-1", AvailabilityZone: "us-east-1c"}, }, trackedPVCs: sets.NewString(key("another-pvc-ns", "another-pvc")), }, { - name: "backup fails when takePVSnapshot fails", + name: "backup fails when takePVSnapshot fails", namespaceIncludesExcludes: collections.NewIncludesExcludes().Includes("*"), - item: `{"apiVersion": "v1", "kind": "PersistentVolume", "metadata": {"name": "mypv", "labels": {"failure-domain.beta.kubernetes.io/zone": "us-east-1c"}}, "spec": {"awsElasticBlockStore": {"volumeID": "aws://us-east-1c/vol-abc123"}}}`, - expectError: true, - groupResource: "persistentvolumes", + item: `{"apiVersion": "v1", "kind": "PersistentVolume", "metadata": {"name": "mypv", "labels": {"failure-domain.beta.kubernetes.io/zone": "us-east-1c"}}, "spec": {"awsElasticBlockStore": {"volumeID": "aws://us-east-1c/vol-abc123"}}}`, + expectError: true, + groupResource: "persistentvolumes", snapshottableVolumes: map[string]api.VolumeBackupInfo{ "vol-abc123": {SnapshotID: "snapshot-1", AvailabilityZone: "us-east-1c"}, }, snapshotError: fmt.Errorf("failure"), }, { - name: "pod's restic PVC volume backups (only) are tracked", - item: `{"apiVersion": "v1", "kind": "Pod", "spec": {"volumes": [{"name": "volume-1", "persistentVolumeClaim": {"claimName": "bar"}},{"name": "volume-2", "persistentVolumeClaim": {"claimName": "baz"}},{"name": "volume-1", "emptyDir": {}}]}, "metadata":{"namespace":"foo","name":"bar", "annotations": {"backup.ark.heptio.com/backup-volumes": "volume-1,volume-2"}}}`, + name: "pod's restic PVC volume backups (only) are tracked", + item: `{"apiVersion": "v1", "kind": "Pod", "spec": {"volumes": [{"name": "volume-1", "persistentVolumeClaim": {"claimName": "bar"}},{"name": "volume-2", "persistentVolumeClaim": {"claimName": "baz"}},{"name": "volume-1", "emptyDir": {}}]}, "metadata":{"namespace":"foo","name":"bar", "annotations": {"backup.ark.heptio.com/backup-volumes": "volume-1,volume-2"}}}`, namespaceIncludesExcludes: collections.NewIncludesExcludes().Includes("*"), groupResource: "pods", expectError: false, diff --git a/pkg/backup/rbac.go b/pkg/backup/rbac.go index d8d82c34e..3505b01f8 100644 --- a/pkg/backup/rbac.go +++ b/pkg/backup/rbac.go @@ -81,7 +81,7 @@ func NewClusterRoleBindingListerMap(clientset kubernetes.Interface) map[string]C return map[string]ClusterRoleBindingLister{ rbac.SchemeGroupVersion.Version: v1ClusterRoleBindingLister{client: clientset.RbacV1().ClusterRoleBindings()}, rbacbeta.SchemeGroupVersion.Version: v1beta1ClusterRoleBindingLister{client: clientset.RbacV1beta1().ClusterRoleBindings()}, - "": noopClusterRoleBindingLister{}, + "": noopClusterRoleBindingLister{}, } } diff --git a/pkg/backup/resource_backupper_test.go b/pkg/backup/resource_backupper_test.go index dbf8c426f..f27fec9ee 100644 --- a/pkg/backup/resource_backupper_test.go +++ b/pkg/backup/resource_backupper_test.go @@ -472,7 +472,7 @@ func TestBackupResourceCohabitation(t *testing.T) { func TestBackupResourceOnlyIncludesSpecifiedNamespaces(t *testing.T) { req := &Request{ - Backup: &v1.Backup{}, + Backup: &v1.Backup{}, NamespaceIncludesExcludes: collections.NewIncludesExcludes().Includes("ns-1"), ResourceIncludesExcludes: collections.NewIncludesExcludes().Includes("*"), } diff --git a/pkg/backup/service_account_action_test.go b/pkg/backup/service_account_action_test.go index bb33185ff..5053c6330 100644 --- a/pkg/backup/service_account_action_test.go +++ b/pkg/backup/service_account_action_test.go @@ -173,7 +173,7 @@ func TestNewServiceAccountAction(t *testing.T) { clusterRoleBindingListers := map[string]ClusterRoleBindingLister{ rbac.SchemeGroupVersion.Version: FakeV1ClusterRoleBindingLister{v1crbs: v1crbs}, rbacbeta.SchemeGroupVersion.Version: FakeV1beta1ClusterRoleBindingLister{v1beta1crbs: v1beta1crbs}, - "": noopClusterRoleBindingLister{}, + "": noopClusterRoleBindingLister{}, } for _, test := range tests { @@ -215,7 +215,7 @@ func TestServiceAccountActionExecute(t *testing.T) { } } `), - crbs: nil, + crbs: nil, expectedAdditionalItems: nil, }, { @@ -423,7 +423,7 @@ func TestServiceAccountActionExecuteOnBeta1(t *testing.T) { } } `), - crbs: nil, + crbs: nil, expectedAdditionalItems: nil, }, { diff --git a/pkg/cmd/cli/backup/create.go b/pkg/cmd/cli/backup/create.go index 5dda4edd9..1b9597be9 100644 --- a/pkg/cmd/cli/backup/create.go +++ b/pkg/cmd/cli/backup/create.go @@ -147,13 +147,13 @@ func (o *CreateOptions) Run(c *cobra.Command, f client.Factory) error { Labels: o.Labels.Data(), }, Spec: api.BackupSpec{ - IncludedNamespaces: o.IncludeNamespaces, - ExcludedNamespaces: o.ExcludeNamespaces, - IncludedResources: o.IncludeResources, - ExcludedResources: o.ExcludeResources, - LabelSelector: o.Selector.LabelSelector, - SnapshotVolumes: o.SnapshotVolumes.Value, - TTL: metav1.Duration{Duration: o.TTL}, + IncludedNamespaces: o.IncludeNamespaces, + ExcludedNamespaces: o.ExcludeNamespaces, + IncludedResources: o.IncludeResources, + ExcludedResources: o.ExcludeResources, + LabelSelector: o.Selector.LabelSelector, + SnapshotVolumes: o.SnapshotVolumes.Value, + TTL: metav1.Duration{Duration: o.TTL}, IncludeClusterResources: o.IncludeClusterResources.Value, StorageLocation: o.StorageLocation, VolumeSnapshotLocations: o.SnapshotLocations, diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go index a280772c2..d9dfe807d 100644 --- a/pkg/cmd/server/server.go +++ b/pkg/cmd/server/server.go @@ -251,13 +251,13 @@ func newServer(namespace, baseName string, config serverConfig, logger *logrus.L discoveryClient: arkClient.Discovery(), dynamicClient: dynamicClient, sharedInformerFactory: informers.NewSharedInformerFactoryWithOptions(arkClient, 0, informers.WithNamespace(namespace)), - ctx: ctx, - cancelFunc: cancelFunc, - logger: logger, - logLevel: logger.Level, - pluginRegistry: pluginRegistry, - pluginManager: pluginManager, - config: config, + ctx: ctx, + cancelFunc: cancelFunc, + logger: logger, + logLevel: logger.Level, + pluginRegistry: pluginRegistry, + pluginManager: pluginManager, + config: config, } return s, nil diff --git a/pkg/cmd/util/output/backup_describer.go b/pkg/cmd/util/output/backup_describer.go index b3c566fd1..a2e471527 100644 --- a/pkg/cmd/util/output/backup_describer.go +++ b/pkg/cmd/util/output/backup_describer.go @@ -350,7 +350,7 @@ func groupByPhase(backups []arkv1api.PodVolumeBackup) map[string][]arkv1api.PodV arkv1api.PodVolumeBackupPhaseFailed: string(arkv1api.PodVolumeBackupPhaseFailed), arkv1api.PodVolumeBackupPhaseInProgress: "In Progress", arkv1api.PodVolumeBackupPhaseNew: string(arkv1api.PodVolumeBackupPhaseNew), - "": string(arkv1api.PodVolumeBackupPhaseNew), + "": string(arkv1api.PodVolumeBackupPhaseNew), } for _, backup := range backups { diff --git a/pkg/cmd/util/output/restore_describer.go b/pkg/cmd/util/output/restore_describer.go index 3c30d2f76..ba8f631db 100644 --- a/pkg/cmd/util/output/restore_describer.go +++ b/pkg/cmd/util/output/restore_describer.go @@ -196,7 +196,7 @@ func groupRestoresByPhase(restores []v1.PodVolumeRestore) map[string][]v1.PodVol v1.PodVolumeRestorePhaseFailed: string(v1.PodVolumeRestorePhaseFailed), v1.PodVolumeRestorePhaseInProgress: "In Progress", v1.PodVolumeRestorePhaseNew: string(v1.PodVolumeRestorePhaseNew), - "": string(v1.PodVolumeRestorePhaseNew), + "": string(v1.PodVolumeRestorePhaseNew), } for _, restore := range restores { diff --git a/pkg/controller/pod_volume_restore_controller_test.go b/pkg/controller/pod_volume_restore_controller_test.go index e731dd77a..9a3ee3a19 100644 --- a/pkg/controller/pod_volume_restore_controller_test.go +++ b/pkg/controller/pod_volume_restore_controller_test.go @@ -424,7 +424,7 @@ func TestIsPVRNew(t *testing.T) { pvr := &arkv1api.PodVolumeRestore{} expectationByStatus := map[arkv1api.PodVolumeRestorePhase]bool{ - "": true, + "": true, arkv1api.PodVolumeRestorePhaseNew: true, arkv1api.PodVolumeRestorePhaseInProgress: false, arkv1api.PodVolumeRestorePhaseCompleted: false, diff --git a/pkg/controller/restore_controller_test.go b/pkg/controller/restore_controller_test.go index 606c34123..f51c5627c 100644 --- a/pkg/controller/restore_controller_test.go +++ b/pkg/controller/restore_controller_test.go @@ -377,7 +377,7 @@ func TestProcessRestore(t *testing.T) { expectedPhase: string(api.RestorePhaseInProgress), expectedFinalPhase: string(api.RestorePhaseFailed), backupStoreGetBackupContentsErr: errors.New("Couldn't download backup"), - backup: arktest.NewTestBackup().WithName("backup-1").WithStorageLocation("default").Backup, + backup: arktest.NewTestBackup().WithName("backup-1").WithStorageLocation("default").Backup, }, } diff --git a/pkg/plugin/manager_test.go b/pkg/plugin/manager_test.go index 524888eae..8b2c6b55a 100644 --- a/pkg/plugin/manager_test.go +++ b/pkg/plugin/manager_test.go @@ -303,8 +303,8 @@ func TestGetBackupItemActions(t *testing.T) { names: []string{}, }, { - name: "Error getting restartable process", - names: []string{"a", "b", "c"}, + name: "Error getting restartable process", + names: []string{"a", "b", "c"}, newRestartableProcessError: errors.Errorf("newRestartableProcess"), expectedError: "newRestartableProcess", }, @@ -395,8 +395,8 @@ func TestGetRestoreItemActions(t *testing.T) { names: []string{}, }, { - name: "Error getting restartable process", - names: []string{"a", "b", "c"}, + name: "Error getting restartable process", + names: []string{"a", "b", "c"}, newRestartableProcessError: errors.Errorf("newRestartableProcess"), expectedError: "newRestartableProcess", }, diff --git a/pkg/restic/repository_manager.go b/pkg/restic/repository_manager.go index 2505de20e..65e307d68 100644 --- a/pkg/restic/repository_manager.go +++ b/pkg/restic/repository_manager.go @@ -105,8 +105,8 @@ func NewRepositoryManager( repoInformerSynced: repoInformer.Informer().HasSynced, backupLocationLister: backupLocationInformer.Lister(), backupLocationInformerSynced: backupLocationInformer.Informer().HasSynced, - log: log, - ctx: ctx, + log: log, + ctx: ctx, repoLocker: newRepoLocker(), repoEnsurer: newRepositoryEnsurer(repoInformer, repoClient, log),