Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove all remaining legacy Ark references #1415

Merged
merged 1 commit into from Apr 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Expand Up @@ -17,7 +17,7 @@ All authors to the project retain copyright to their work. However, to ensure
that they are only submitting work that they have rights to, we are requiring
everyone to acknowledge this by signing their work.

Any copyright notices in this repo should specify the authors as "the Heptio Ark project contributors".
Any copyright notices in this repo should specify the authors as "the Velero contributors".

To sign your work, just add a line like this at the end of your commit message:

Expand Down
6 changes: 3 additions & 3 deletions docs/debugging-install.md
Expand Up @@ -37,9 +37,9 @@ into the Velero server pod. Ensure the following:
* The `cloud-credentials` secret is being mounted into the Velero server pod at `/credentials`

#### Using kube2iam
This means that Ark can't read the content of the S3 bucket. Ensure the following:
* There is a Trust Policy document allowing the role used by kube2iam to assume Ark's role, as stated in the AWS config documentation.
* The new Ark role has all the permissions listed in the documentation regarding S3.
This means that Velero can't read the content of the S3 bucket. Ensure the following:
* There is a Trust Policy document allowing the role used by kube2iam to assume Velero's role, as stated in the AWS config documentation.
* The new Velero role has all the permissions listed in the documentation regarding S3.


## Azure
Expand Down
16 changes: 8 additions & 8 deletions pkg/apis/velero/v1/restore.go
Expand Up @@ -18,14 +18,14 @@ package v1

import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

// RestoreSpec defines the specification for an Ark restore.
// RestoreSpec defines the specification for a Velero restore.
type RestoreSpec struct {
// BackupName is the unique name of the Ark backup to restore
// BackupName is the unique name of the Velero backup to restore
// from.
BackupName string `json:"backupName"`

// ScheduleName is the unique name of the Ark schedule to restore
// from. If specified, and BackupName is empty, Ark will restore
// ScheduleName is the unique name of the Velero schedule to restore
// from. If specified, and BackupName is empty, Velero will restore
// from the most recent successful backup created from this schedule.
ScheduleName string `json:"scheduleName,omitempty"`

Expand Down Expand Up @@ -67,7 +67,7 @@ type RestoreSpec struct {
}

// RestorePhase is a string representation of the lifecycle phase
// of an Ark restore
// of a Velero restore
type RestorePhase string

const (
Expand Down Expand Up @@ -95,7 +95,7 @@ const (
RestorePhaseFailed RestorePhase = "Failed"
)

// RestoreStatus captures the current status of an Ark restore
// RestoreStatus captures the current status of a Velero restore
type RestoreStatus struct {
// Phase is the current state of the Restore
Phase RestorePhase `json:"phase"`
Expand All @@ -119,8 +119,8 @@ type RestoreStatus struct {
// +genclient
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

// Restore is an Ark resource that represents the application of
// resources from an Ark backup to a target Kubernetes cluster.
// Restore is a Velero resource that represents the application of
// resources from a Velero backup to a target Kubernetes cluster.
type Restore struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata"`
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/cli/client/config/config.go
@@ -1,5 +1,5 @@
/*
Copyright 2017 the Heptio Ark contributors.
Copyright 2017 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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/cli/client/config/get.go
@@ -1,5 +1,5 @@
/*
Copyright 2018 the Heptio Ark 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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/cli/client/config/set.go
@@ -1,5 +1,5 @@
/*
Copyright 2018 the Heptio Ark 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.
Expand Down
3 changes: 0 additions & 3 deletions pkg/controller/restore_controller.go
Expand Up @@ -58,18 +58,15 @@ var nonRestorableResources = []string{

// Don't ever restore backups - if appropriate, they'll be synced in from object storage.
// https://github.com/heptio/velero/issues/622
"backups.ark.heptio.com",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nrb @carlisia I think removing these are fine, since users should've migrated their CRDs, and we won't be processing the *.heptio.com API group anymore - make sense?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree users should have, though I'm unsure that everyone will.

That said, since our controllers won't actually process anything in the old API group, the restored Ark backups will be inert, so it's not going to trigger a cascade.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, that was my thinking.

"backups.velero.io",

// Restores are cluster-specific, and don't have value moving across clusters.
// https://github.com/heptio/velero/issues/622
"restores.ark.heptio.com",
"restores.velero.io",

// Restic repositories are automatically managed by Velero and will be automatically
// created as needed if they don't exist.
// https://github.com/heptio/velero/issues/1113
"resticrepositories.ark.heptio.com",
"resticrepositories.velero.io",
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/velero/restore_item_action.go
Expand Up @@ -45,7 +45,7 @@ type RestoreItemActionExecuteInput struct {
Item runtime.Unstructured
// ItemFromBackup is the item taken from the pristine backed up version of resource.
ItemFromBackup runtime.Unstructured
// Restore is the representation of the restore resource processed by Ark.
// Restore is the representation of the restore resource processed by Velero.
Restore *api.Restore
}

Expand Down