Skip to content

Commit 634d28b

Browse files
Update to wrangler v0.8 (#113)
* Update to new v0.8 wrangler APIs * Update go.mod and generated code to wrangler v0.8
1 parent 063bba3 commit 634d28b

File tree

19 files changed

+230
-768
lines changed

19 files changed

+230
-768
lines changed

go.mod

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ go 1.13
55
require (
66
github.com/docker/distribution v2.7.1+incompatible
77
github.com/onsi/ginkgo v1.11.0
8-
github.com/onsi/gomega v1.7.0
8+
github.com/onsi/gomega v1.8.1
9+
github.com/rancher/lasso v0.0.0-20210408231703-9ddd9378d08d
910
github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0
10-
github.com/rancher/wrangler v0.6.1
11-
github.com/rancher/wrangler-api v0.5.1-0.20200326194427-c13310506d04
11+
github.com/rancher/wrangler v0.8.1-0.20210424045532-c389a3e0ae51
1212
github.com/sirupsen/logrus v1.4.2
1313
github.com/urfave/cli v1.22.2
14-
k8s.io/api v0.18.0
15-
k8s.io/apiextensions-apiserver v0.18.0
16-
k8s.io/apimachinery v0.18.0
14+
k8s.io/api v0.18.8
15+
k8s.io/apimachinery v0.18.8
1716
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
1817
k8s.io/kubectl v0.0.0
1918
k8s.io/kubernetes v1.17.2

go.sum

Lines changed: 103 additions & 22 deletions
Large diffs are not rendered by default.

main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ func Run(_ *cli.Context) {
9494
if err != nil {
9595
logrus.Fatal(err)
9696
}
97-
ctl, err := upgrade.NewController(cfg, namespace, name)
97+
ctl, err := upgrade.NewController(cfg, namespace, name, 2*time.Hour)
9898
if err != nil {
9999
logrus.Fatal(err)
100100
}
101101
ctx := signals.SetupSignalHandler(context.Background())
102-
if err := ctl.Start(ctx, threads, 2*time.Hour); err != nil {
102+
if err := ctl.Start(ctx, threads); err != nil {
103103
logrus.Fatalf("Error starting: %v", err)
104104
}
105105
<-ctx.Done()

pkg/codegen/codegen.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ func main() {
1515
Types: []interface{}{
1616
v1.Plan{},
1717
},
18-
GenerateTypes: true,
18+
GenerateTypes: true,
19+
GenerateClients: true,
1920
},
2021
},
2122
})

pkg/generated/controllers/upgrade.cattle.io/factory.go

Lines changed: 11 additions & 70 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/generated/controllers/upgrade.cattle.io/interface.go

Lines changed: 5 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/generated/controllers/upgrade.cattle.io/v1/interface.go

Lines changed: 11 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)