mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-07 13:55:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename Ark to Velero!!!

Browse Source 
Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
This commit is contained in:
Nolan Brubaker
2019-01-24 22:33:07 -05:00
committed by Andy Goldstein
parent bbc6caf7fe
commit 43714caaec
411 changed files with 12857 additions and 3522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/serverstatusrequest/builder.go
View File

@@ -21,25 +21,25 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
arkv1api "github.com/heptio/ark/pkg/apis/ark/v1"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1"
)
type Builder struct {
serverStatusRequest arkv1api.ServerStatusRequest
serverStatusRequest velerov1api.ServerStatusRequest
}
func NewBuilder() *Builder {
return &Builder{
serverStatusRequest: arkv1api.ServerStatusRequest{
serverStatusRequest: velerov1api.ServerStatusRequest{
TypeMeta: metav1.TypeMeta{
APIVersion: arkv1api.SchemeGroupVersion.String(),
APIVersion: velerov1api.SchemeGroupVersion.String(),
Kind: "ServerStatusRequest",
},
},
}
}
func (b *Builder) Build() *arkv1api.ServerStatusRequest {
func (b *Builder) Build() *velerov1api.ServerStatusRequest {
return &b.serverStatusRequest
}
@@ -58,7 +58,7 @@ func (b *Builder) GenerateName(name string) *Builder {
return b
}
func (b *Builder) Phase(phase arkv1api.ServerStatusRequestPhase) *Builder {
func (b *Builder) Phase(phase velerov1api.ServerStatusRequestPhase) *Builder {
b.serverStatusRequest.Status.Phase = phase
return b
}

18
pkg/serverstatusrequest/process.go
View File

@@ -26,25 +26,25 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/clock"
arkv1api "github.com/heptio/ark/pkg/apis/ark/v1"
"github.com/heptio/ark/pkg/buildinfo"
arkv1client "github.com/heptio/ark/pkg/generated/clientset/versioned/typed/ark/v1"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/buildinfo"
velerov1client "github.com/heptio/velero/pkg/generated/clientset/versioned/typed/velero/v1"
)
const ttl = time.Minute
// Process fills out new ServerStatusRequest objects and deletes processed ones
// that have expired.
func Process(req *arkv1api.ServerStatusRequest, client arkv1client.ServerStatusRequestsGetter, clock clock.Clock, log logrus.FieldLogger) error {
func Process(req *velerov1api.ServerStatusRequest, client velerov1client.ServerStatusRequestsGetter, clock clock.Clock, log logrus.FieldLogger) error {
switch req.Status.Phase {
case "", arkv1api.ServerStatusRequestPhaseNew:
case "", velerov1api.ServerStatusRequestPhaseNew:
log.Info("Processing new ServerStatusRequest")
return errors.WithStack(patch(client, req, func(req *arkv1api.ServerStatusRequest) {
return errors.WithStack(patch(client, req, func(req *velerov1api.ServerStatusRequest) {
req.Status.ServerVersion = buildinfo.Version
req.Status.ProcessedTimestamp.Time = clock.Now()
req.Status.Phase = arkv1api.ServerStatusRequestPhaseProcessed
req.Status.Phase = velerov1api.ServerStatusRequestPhaseProcessed
}))
case arkv1api.ServerStatusRequestPhaseProcessed:
case velerov1api.ServerStatusRequestPhaseProcessed:
log.Debug("Checking whether ServerStatusRequest has expired")
expiration := req.Status.ProcessedTimestamp.Add(ttl)
if expiration.After(clock.Now()) {
@@ -63,7 +63,7 @@ func Process(req *arkv1api.ServerStatusRequest, client arkv1client.ServerStatusR
}
}
func patch(client arkv1client.ServerStatusRequestsGetter, req *arkv1api.ServerStatusRequest, updateFunc func(*arkv1api.ServerStatusRequest)) error {
func patch(client velerov1client.ServerStatusRequestsGetter, req *velerov1api.ServerStatusRequest, updateFunc func(*velerov1api.ServerStatusRequest)) error {
originalJSON, err := json.Marshal(req)
if err != nil {
return errors.WithStack(err)

32
pkg/serverstatusrequest/process_test.go
View File

@@ -27,13 +27,13 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/clock"
arkv1api "github.com/heptio/ark/pkg/apis/ark/v1"
"github.com/heptio/ark/pkg/buildinfo"
"github.com/heptio/ark/pkg/generated/clientset/versioned/fake"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/buildinfo"
"github.com/heptio/velero/pkg/generated/clientset/versioned/fake"
)
func statusRequestBuilder() *Builder {
return NewBuilder().Namespace(arkv1api.DefaultNamespace).Name("sr-1")
return NewBuilder().Namespace(velerov1api.DefaultNamespace).Name("sr-1")
}
func TestProcess(t *testing.T) {
@@ -47,8 +47,8 @@ func TestProcess(t *testing.T) {
tests := []struct {
name string
req *arkv1api.ServerStatusRequest
expected *arkv1api.ServerStatusRequest
req *velerov1api.ServerStatusRequest
expected *velerov1api.ServerStatusRequest
expectedErrMsg string
}{
{
@@ -56,25 +56,25 @@ func TestProcess(t *testing.T) {
req: statusRequestBuilder().Build(),
expected: statusRequestBuilder().
ServerVersion(buildinfo.Version).
Phase(arkv1api.ServerStatusRequestPhaseProcessed).
Phase(velerov1api.ServerStatusRequestPhaseProcessed).
ProcessedTimestamp(now).
Build(),
},
{
name: "server status request with phase=New gets processed",
req: statusRequestBuilder().
Phase(arkv1api.ServerStatusRequestPhaseNew).
Phase(velerov1api.ServerStatusRequestPhaseNew).
Build(),
expected: statusRequestBuilder().
ServerVersion(buildinfo.Version).
Phase(arkv1api.ServerStatusRequestPhaseProcessed).
Phase(velerov1api.ServerStatusRequestPhaseProcessed).
ProcessedTimestamp(now).
Build(),
},
{
name: "server status request with phase=Processed gets deleted if expired",
req: statusRequestBuilder().
Phase(arkv1api.ServerStatusRequestPhaseProcessed).
Phase(velerov1api.ServerStatusRequestPhaseProcessed).
ProcessedTimestamp(now.Add(-61 * time.Second)).
Build(),
expected: nil,
@@ -82,21 +82,21 @@ func TestProcess(t *testing.T) {
{
name: "server status request with phase=Processed does not get deleted if not expired",
req: statusRequestBuilder().
Phase(arkv1api.ServerStatusRequestPhaseProcessed).
Phase(velerov1api.ServerStatusRequestPhaseProcessed).
ProcessedTimestamp(now.Add(-59 * time.Second)).
Build(),
expected: statusRequestBuilder().
Phase(arkv1api.ServerStatusRequestPhaseProcessed).
Phase(velerov1api.ServerStatusRequestPhaseProcessed).
ProcessedTimestamp(now.Add(-59 * time.Second)).
Build(),
},
{
name: "server status request with invalid phase returns an error",
req: statusRequestBuilder().
Phase(arkv1api.ServerStatusRequestPhase("an-invalid-phase")).
Phase(velerov1api.ServerStatusRequestPhase("an-invalid-phase")).
Build(),
expected: statusRequestBuilder().
Phase(arkv1api.ServerStatusRequestPhase("an-invalid-phase")).
Phase(velerov1api.ServerStatusRequestPhase("an-invalid-phase")).
Build(),
expectedErrMsg: "unexpected ServerStatusRequest phase \"an-invalid-phase\"",
},
@@ -106,14 +106,14 @@ func TestProcess(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
client := fake.NewSimpleClientset(tc.req)
err := Process(tc.req, client.ArkV1(), clock.NewFakeClock(now), logrus.StandardLogger())
err := Process(tc.req, client.VeleroV1(), clock.NewFakeClock(now), logrus.StandardLogger())
if tc.expectedErrMsg == "" {
assert.Nil(t, err)
} else {
assert.EqualError(t, err, tc.expectedErrMsg)
}
res, err := client.ArkV1().ServerStatusRequests(tc.req.Namespace).Get(tc.req.Name, metav1.GetOptions{})
res, err := client.VeleroV1().ServerStatusRequests(tc.req.Namespace).Get(tc.req.Name, metav1.GetOptions{})
if tc.expected == nil {
assert.Nil(t, res)
assert.True(t, apierrors.IsNotFound(err))