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.

Sign up for GitHub

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

Jump to bottom

Prep v20 development #2318

Merged
merged 6 commits into from Jul 13, 2020
Merged

Prep v20 development #2318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8808fcb
Add v19.0 production pluginconfig, start v20
ehashman Jul 8, 2020
e0b8189
Copy v19 -> v20 directories
ehashman Jul 8, 2020
449d540
Wire up v20, unwire v14, 18
ehashman Jul 8, 2020
2bd01f7
Remove v14 and v18 assets
ehashman Jul 8, 2020
802de55
Update hash tests
ehashman Jul 8, 2020
41d6649
Remove old fakerp hack that will fail on v20+
ehashman Jul 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 3 additions & 6 deletions pkg/arm/arm.go
View file
Open in desktop
Expand Up @@ -14,12 +14,11 @@ import (
"github.com/sirupsen/logrus"

"github.com/openshift/openshift-azure/pkg/api"
v14 "github.com/openshift/openshift-azure/pkg/arm/v14"
v15 "github.com/openshift/openshift-azure/pkg/arm/v15"
v16 "github.com/openshift/openshift-azure/pkg/arm/v16"
v17 "github.com/openshift/openshift-azure/pkg/arm/v17"
v18 "github.com/openshift/openshift-azure/pkg/arm/v18"
v19 "github.com/openshift/openshift-azure/pkg/arm/v19"
v20 "github.com/openshift/openshift-azure/pkg/arm/v20"
)

type Interface interface {
Expand All @@ -30,18 +29,16 @@ type Interface interface {

func New(ctx context.Context, log *logrus.Entry, cs *api.OpenShiftManagedCluster, testConfig api.TestConfig) (Interface, error) {
switch cs.Config.PluginVersion {
case "v14.1":
return v14.New(ctx, log, cs, testConfig), nil
case "v15.0":
return v15.New(ctx, log, cs, testConfig), nil
case "v16.0", "v16.1":
return v16.New(ctx, log, cs, testConfig), nil
case "v17.0":
return v17.New(ctx, log, cs, testConfig), nil
case "v18.0":
return v18.New(ctx, log, cs, testConfig), nil
case "v19.0":
return v19.New(ctx, log, cs, testConfig), nil
case "v20.0":
return v20.New(ctx, log, cs, testConfig), nil
}

return nil, fmt.Errorf("version %q not found", cs.Config.PluginVersion)
Expand Down
268 changes: 0 additions & 268 deletions pkg/arm/v14/bindata.go
View file
Open in desktop

This file was deleted.

189 changes: 0 additions & 189 deletions pkg/arm/v14/data/master-startup.sh
View file
Open in desktop

This file was deleted.

113 changes: 0 additions & 113 deletions pkg/arm/v14/data/node-startup.sh
View file
Open in desktop

This file was deleted.