Skip to content

Commit

Permalink
Drop legacy catalog for tests (#291)
Browse files Browse the repository at this point in the history 
Signed-off-by: David Cassany <dcassany@suse.com>
  • Loading branch information
@davidcassany
davidcassany committed Dec 14, 2022
1 parent 4e31fe2 commit af83eea
Show file tree
Hide file tree
Showing 9 changed files with 102 additions and 213 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Expand Up @@ -39,7 +39,7 @@ require (
github.com/onsi/ginkgo/v2 v2.3.1
github.com/onsi/gomega v1.22.0
github.com/pkg/errors v0.9.1
github.com/rancher-sandbox/ele-testhelpers v0.0.0-20220624082733-2dbd4e2d2b95
github.com/rancher-sandbox/ele-testhelpers v0.0.0-20221213084338-a8ffdd2b87e3
github.com/rancher-sandbox/go-tpm v0.0.0-20220823075603-d273b298fcda
github.com/rancher/fleet/pkg/apis v0.0.0-20220318160658-4dc66c946ca2
github.com/rancher/lasso v0.0.0-20210709145333-6c6cd7fd6607
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Expand Up @@ -1236,8 +1236,8 @@ github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3
github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d/go.mod h1:7DPO4domFU579Ga6E61sB9VFNaniPVwJP5C4bBCu3wA=
github.com/quobyte/api v0.1.8/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
github.com/rackspace/gophercloud v0.0.0-20150408191457-ce0f487f6747/go.mod h1:4bJ1FwuaBZ6dt1VcDX5/O662mwR8GWqS4l68H6hkoYQ=
github.com/rancher-sandbox/ele-testhelpers v0.0.0-20220624082733-2dbd4e2d2b95 h1:cZD7FniYy3X2NUES9SG0JG2ooKFBDn+yt5QgbxjJxFk=
github.com/rancher-sandbox/ele-testhelpers v0.0.0-20220624082733-2dbd4e2d2b95/go.mod h1:rZj2a+V44LvtFVH/vsFXtHYIWMP1Q9aSrl6RGLbk49A=
github.com/rancher-sandbox/ele-testhelpers v0.0.0-20221213084338-a8ffdd2b87e3 h1:rzJkQVjg5FFf9rMR92USGhFIuPGk4slXN+nkPQANxx0=
github.com/rancher-sandbox/ele-testhelpers v0.0.0-20221213084338-a8ffdd2b87e3/go.mod h1:rZj2a+V44LvtFVH/vsFXtHYIWMP1Q9aSrl6RGLbk49A=
github.com/rancher-sandbox/go-tpm v0.0.0-20220823075603-d273b298fcda h1:TMkKDQTmjYpxl8/3XDh0oAJDvjM0C0vtQYdGs2I9MoE=
github.com/rancher-sandbox/go-tpm v0.0.0-20220823075603-d273b298fcda/go.mod h1:cUw+h4wm01VdavMOjUMVQ5m/b2oiOjZ7gweI8AlybO4=
github.com/rancher/aks-operator v1.0.2 h1:R6niUq/IlhzKpzRFmRR9YMiMePJh1flEqFO86us7OMY=
Expand Down
74 changes: 0 additions & 74 deletions tests/catalog/managedosimage.go
View file
Expand Up @@ -17,85 +17,11 @@ limitations under the License.
package catalog

import (
"time"

elementalv1 "github.com/rancher/elemental-operator/api/v1beta1"
upgradev1 "github.com/rancher/system-upgrade-controller/pkg/apis/upgrade.cattle.io/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

type DrainSpec struct {
Timeout *time.Duration `json:"timeout,omitempty" yaml:"timeout"`
GracePeriod *int32 `json:"gracePeriod,omitempty" yaml:"gracePeriod"`
DeleteLocalData *bool `json:"deleteLocalData,omitempty" yaml:"deleteLocalData"`
IgnoreDaemonSets *bool `json:"ignoreDaemonSets,omitempty" yaml:"ignoreDaemonSets"`
Force bool `json:"force,omitempty" yaml:"force"`
DisableEviction bool `json:"disableEviction,omitempty" yaml:"disableEviction"`
SkipWaitForDeleteTimeout int `json:"skipWaitForDeleteTimeout,omitempty" yaml:"skipWaitForDeleteTimeout"`
}

type ManagedOSImage struct {
APIVersion string `json:"apiVersion" yaml:"apiVersion"`
Kind string `json:"kind" yaml:"kind"`
Metadata struct {
Name string `json:"name" yaml:"name"`
} `json:"metadata" yaml:"metadata"`

Spec struct {
Cordon *bool `json:"cordon,omitempty" yaml:"cordon"`
Drain *DrainSpec `json:"drain,omitempty" yaml:"drain"`
OSImage string `json:"osImage" yaml:"osImage"`
ManagedOSVersionName string `json:"managedOSVersionName" yaml:"managedOSVersionName"`
Targets []map[string]interface{} `json:"clusterTargets" yaml:"clusterTargets"`
}
}

func LegacyNewManagedOSImage(name string, targets []map[string]interface{}, mosImage string, mosVersionName string) *ManagedOSImage {
cordon := false

return &ManagedOSImage{
APIVersion: "elemental.cattle.io/v1beta1",
Metadata: struct {
Name string "json:\"name\" yaml:\"name\""
}{Name: name},
Kind: "ManagedOSImage",
Spec: struct {
Cordon *bool `json:"cordon,omitempty" yaml:"cordon"`
Drain *DrainSpec `json:"drain,omitempty" yaml:"drain"`
OSImage string `json:"osImage" yaml:"osImage"`
ManagedOSVersionName string `json:"managedOSVersionName" yaml:"managedOSVersionName"`
Targets []map[string]interface{} `json:"clusterTargets" yaml:"clusterTargets"`
}{
OSImage: mosImage,
ManagedOSVersionName: mosVersionName,
Cordon: &cordon,
Targets: targets,
},
}
}

func LegacyDrainOSImage(name string, managedOSVersion string, drainSpec *DrainSpec) *ManagedOSImage {
cordon := false
return &ManagedOSImage{
APIVersion: "elemental.cattle.io/v1beta1",
Metadata: struct {
Name string "json:\"name\" yaml:\"name\""
}{Name: name},
Kind: "ManagedOSImage",
Spec: struct {
Cordon *bool `json:"cordon,omitempty" yaml:"cordon"`
Drain *DrainSpec `json:"drain,omitempty" yaml:"drain"`
OSImage string `json:"osImage" yaml:"osImage"`
ManagedOSVersionName string `json:"managedOSVersionName" yaml:"managedOSVersionName"`
Targets []map[string]interface{} `json:"clusterTargets" yaml:"clusterTargets"`
}{
Cordon: &cordon,
ManagedOSVersionName: managedOSVersion,
Drain: drainSpec,
},
}
}

func NewManagedOSImage(namespace string, name string, targets []elementalv1.BundleTarget, mosImage string, mosVersionName string) *elementalv1.ManagedOSImage {
cordon := false

Expand Down
40 changes: 0 additions & 40 deletions tests/catalog/managedosversion.go
View file
Expand Up @@ -23,46 +23,6 @@ import (
"k8s.io/apimachinery/pkg/runtime"
)

type ManagedOSVersionSpec struct {
Type string `json:"type" yaml:"type"`
Version string `json:"version" yaml:"version"`
MinVersion string `json:"minVersion" yaml:"minVersion"`
Metadata map[string]interface{} `json:"metadata" yaml:"metadata"`
UpgradeContainer *ContainerSpec `json:"upgradeContainer" yaml:"upgradeContainer"`
}

type ManagedOSVersion struct {
APIVersion string `json:"apiVersion" yaml:"apiVersion"`
Kind string `json:"kind" yaml:"kind"`
Metadata struct {
Name string `json:"name" yaml:"name"`
} `json:"metadata" yaml:"metadata"`
Spec ManagedOSVersionSpec
}

type ContainerSpec struct {
Image string `json:"image,omitempty" yaml:"image,omitempty"`
Command []string `json:"command,omitempty" yaml:"command,omitempty"`
Args []string `json:"args,omitempty" yaml:"args,omitempty"`
}

func LegacyNewManagedOSVersion(name string, version string, minVersion string, metadata map[string]interface{}, upgradeC *ContainerSpec) *ManagedOSVersion {
return &ManagedOSVersion{
APIVersion: "elemental.cattle.io/v1beta1",
Metadata: struct {
Name string "json:\"name\" yaml:\"name\""
}{Name: name},
Kind: "ManagedOSVersion",
Spec: ManagedOSVersionSpec{
Type: "container",
Version: version,
MinVersion: minVersion,
Metadata: metadata,
UpgradeContainer: upgradeC,
},
}
}

func NewManagedOSVersion(namespace string, name string, version string, minVersion string, metadata map[string]runtime.RawExtension, upgradeC *upgradev1.ContainerSpec) *elementalv1.ManagedOSVersion {
return &elementalv1.ManagedOSVersion{
TypeMeta: metav1.TypeMeta{
Expand Down
32 changes: 0 additions & 32 deletions tests/catalog/managedosversionchannel.go
View file
Expand Up @@ -23,22 +23,6 @@ import (
"k8s.io/apimachinery/pkg/runtime"
)

type ManagedOSVersionChannelSpec struct {
Type string `json:"type" yaml:"type"`
Options map[string]interface{} `json:"options" yaml:"options"`
UpgradeContainer *ContainerSpec `json:"upgradeContainer,omitempty" yaml:"upgradeContainer"`
SyncInterval string `json:"syncInterval,omitempty" yaml:"syncInterval"`
}

type ManagedOSVersionChannel struct {
APIVersion string `json:"apiVersion" yaml:"apiVersion"`
Kind string `json:"kind" yaml:"kind"`
Metadata struct {
Name string `json:"name" yaml:"name"`
} `json:"metadata" yaml:"metadata"`
Spec ManagedOSVersionChannelSpec `json:"spec,omitempty"`
}

func NewManagedOSVersionChannel(namespace, name, sType, interval string, options map[string]runtime.RawExtension, upgradeContainer *upgradev1.ContainerSpec) *elementalv1.ManagedOSVersionChannel {
return &elementalv1.ManagedOSVersionChannel{
TypeMeta: metav1.TypeMeta{
Expand All @@ -57,19 +41,3 @@ func NewManagedOSVersionChannel(namespace, name, sType, interval string, options
},
}
}

func LegacyNewManagedOSVersionChannel(name string, t string, interval string, options map[string]interface{}, upgradeContainer *ContainerSpec) *ManagedOSVersionChannel {
return &ManagedOSVersionChannel{
APIVersion: "elemental.cattle.io/v1beta1",
Metadata: struct {
Name string "json:\"name\" yaml:\"name\""
}{Name: name},
Kind: "ManagedOSVersionChannel",
Spec: ManagedOSVersionChannelSpec{
Type: t,
SyncInterval: interval,
Options: options,
UpgradeContainer: upgradeContainer,
},
}
}

0 comments on commit af83eea

Please sign in to comment.