Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions bindata/etcd/etcd-backup-cr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
apiVersion: operator.openshift.io/v1alpha1
kind: EtcdBackup
metadata:
name: templated
namespace: openshift-etcd
ownerReferences:
- apiVersion: batch/v1
kind: Job
name: templated
uid: templated
spec:
pvcName: templated
9 changes: 2 additions & 7 deletions cmd/cluster-etcd-operator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ import (
"context"
goflag "flag"
"fmt"
"io/ioutil"
"math/rand"
"io"
"os"
"time"

prune_backups "github.com/openshift/cluster-etcd-operator/pkg/cmd/prune-backups"

Expand Down Expand Up @@ -36,9 +34,7 @@ func main() {
// overwrite gRPC logger, to discard all gRPC info-level logging
// https://github.com/kubernetes/kubernetes/issues/80741
// https://github.com/kubernetes/kubernetes/pull/84061
grpclog.SetLoggerV2(grpclog.NewLoggerV2(ioutil.Discard, os.Stderr, os.Stderr))

rand.Seed(time.Now().UTC().UnixNano())
grpclog.SetLoggerV2(grpclog.NewLoggerV2(io.Discard, os.Stderr, os.Stderr))

pflag.CommandLine.SetNormalizeFunc(utilflag.WordSepNormalizeFunc)
pflag.CommandLine.AddGoFlagSet(goflag.CommandLine)
Expand Down Expand Up @@ -78,7 +74,6 @@ func NewSSCSCommand(ctx context.Context) *cobra.Command {
cmd.AddCommand(prune_backups.NewPruneCommand())
cmd.AddCommand(requestbackup.NewRequestBackupCommand(ctx))
cmd.AddCommand(rev.NewRevCommand(ctx))
cmd.AddCommand(backuprestore.NewBackupServer(ctx))
cmd.AddCommand(ensureenv.NewEnsureEnvCommand())

return cmd
Expand Down
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ require (
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.23.2
github.com/prometheus/common v0.66.1
github.com/robfig/cron v1.2.0
github.com/robfig/cron/v3 v3.0.1
github.com/spf13/cobra v1.10.0
github.com/spf13/pflag v1.0.9
github.com/stretchr/testify v1.11.1
Expand Down Expand Up @@ -103,6 +101,7 @@ require (
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/robfig/cron v1.2.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/soheilhy/cmux v0.1.5 // indirect
github.com/stoewer/go-strcase v1.3.0 // indirect
Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,6 @@ github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
Expand Down
122 changes: 0 additions & 122 deletions pkg/backuphelpers/backupvars.go

This file was deleted.

161 changes: 0 additions & 161 deletions pkg/backuphelpers/backupvars_test.go

This file was deleted.

Loading