Skip to content

Commit

Permalink
Use v1beta1 API in E2E tests
Browse files Browse the repository at this point in the history
  • Loading branch information
xmudrii committed Jun 2, 2020
1 parent 2726211 commit fb4f48b
Showing 1 changed file with 25 additions and 4 deletions.
29 changes: 25 additions & 4 deletions test/e2e/kubeone.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/pkg/errors"
"gopkg.in/yaml.v2"

k1api "github.com/kubermatic/kubeone/pkg/apis/kubeone/v1alpha1"
k1api "github.com/kubermatic/kubeone/pkg/apis/kubeone/v1beta1"
"github.com/kubermatic/kubeone/test/e2e/testutil"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -51,25 +51,46 @@ func NewKubeone(kubeoneDir, configurationFilePath string) *Kubeone {
// CreateConfig creates a KubeOneCluster manifest
func (k1 *Kubeone) CreateConfig(
kubernetesVersion string,
providerName k1api.CloudProviderName,
providerName string,
providerExternal bool,
clusterNetworkPod string,
clusterNetworkService string,
credentialsFile string,
) error {
k1Cluster := k1api.KubeOneCluster{
TypeMeta: metav1.TypeMeta{
APIVersion: "kubeone.io/v1alpha1",
APIVersion: "kubeone.io/v1beta1",
Kind: "KubeOneCluster",
},
}

k1api.SetObjectDefaults_KubeOneCluster(&k1Cluster)

k1Cluster.CloudProvider = k1api.CloudProviderSpec{
Name: providerName,
External: providerExternal,
}
switch providerName {
case "aws":
k1Cluster.CloudProvider.AWS = &k1api.AWSSpec{}
case "azure":
k1Cluster.CloudProvider.Azure = &k1api.AzureSpec{}
case "digitalocean":
k1Cluster.CloudProvider.DigitalOcean = &k1api.DigitalOceanSpec{}
case "gce":
k1Cluster.CloudProvider.GCE = &k1api.GCESpec{}
case "hetzner":
k1Cluster.CloudProvider.Hetzner = &k1api.HetznerSpec{}
case "openstack":
k1Cluster.CloudProvider.Openstack = &k1api.OpenstackSpec{}
case "packet":
k1Cluster.CloudProvider.Packet = &k1api.PacketSpec{}
case "vsphere":
k1Cluster.CloudProvider.Vsphere = &k1api.VsphereSpec{}
case "none":
k1Cluster.CloudProvider.None = &k1api.NoneSpec{}
default:
return errors.Errorf("unknown cloud provider %q", providerName)
}

k1Cluster.Versions = k1api.VersionConfig{
Kubernetes: kubernetesVersion,
Expand Down

0 comments on commit fb4f48b

Please sign in to comment.