From bdef6ddcebc4cc797ae23fcea07a6b8d040461cf Mon Sep 17 00:00:00 2001 From: Lucas Serven Date: Mon, 11 Jun 2018 16:11:53 +0200 Subject: [PATCH] installer/pkg/config: remove old platforms --- installer/pkg/config/azure/BUILD.bazel | 10 --- installer/pkg/config/azure/azure.go | 60 ----------------- installer/pkg/config/gcp/BUILD.bazel | 10 --- installer/pkg/config/gcp/gcp.go | 33 ---------- installer/pkg/config/metal/BUILD.bazel | 10 --- installer/pkg/config/metal/metal.go | 40 ------------ installer/pkg/config/openstack/BUILD.bazel | 10 --- installer/pkg/config/openstack/openstack.go | 39 ----------- installer/pkg/config/vmware/BUILD.bazel | 10 --- installer/pkg/config/vmware/vmware.go | 71 --------------------- 10 files changed, 293 deletions(-) delete mode 100644 installer/pkg/config/azure/BUILD.bazel delete mode 100644 installer/pkg/config/azure/azure.go delete mode 100644 installer/pkg/config/gcp/BUILD.bazel delete mode 100644 installer/pkg/config/gcp/gcp.go delete mode 100644 installer/pkg/config/metal/BUILD.bazel delete mode 100644 installer/pkg/config/metal/metal.go delete mode 100644 installer/pkg/config/openstack/BUILD.bazel delete mode 100644 installer/pkg/config/openstack/openstack.go delete mode 100644 installer/pkg/config/vmware/BUILD.bazel delete mode 100644 installer/pkg/config/vmware/vmware.go diff --git a/installer/pkg/config/azure/BUILD.bazel b/installer/pkg/config/azure/BUILD.bazel deleted file mode 100644 index 5f7d302497..0000000000 --- a/installer/pkg/config/azure/BUILD.bazel +++ /dev/null @@ -1,10 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "azure.go", - ], - importpath = "github.com/coreos/tectonic-installer/installer/pkg/config/azure", - visibility = ["//visibility:public"], -) diff --git a/installer/pkg/config/azure/azure.go b/installer/pkg/config/azure/azure.go deleted file mode 100644 index 5d0c9afadf..0000000000 --- a/installer/pkg/config/azure/azure.go +++ /dev/null @@ -1,60 +0,0 @@ -package azure - -// Azure converts azure related config. -type Azure struct { - CloudEnvironment string `json:"tectonic_azure_cloud_environment,omitempty" yaml:"cloudEnvironment,omitempty"` - Etcd `json:",inline" yaml:"etcd,omitempty"` - External `json:",inline" yaml:"external,omitempty"` - ExtraTags string `json:"tectonic_azure_extra_tags,omitempty" yaml:"extraTags,omitempty"` - Master `json:",inline" yaml:"master,omitempty"` - PrivateCluster string `json:"tectonic_azure_private_cluster,omitempty" yaml:"privateCluster,omitempty"` - SSH `json:",inline" yaml:"ssh,omitempty"` - VNetCIDRBlock string `json:"tectonic_azure_vnet_cidr_block,omitempty" yaml:"vNetCIDRBlock,omitempty"` - Worker `json:",inline" yaml:"worker,omitempty"` -} - -// Etcd converts etcd related config. -type Etcd struct { - StorageType string `json:"tectonic_azure_etcd_storage_type,omitempty" yaml:"storageType,omitempty"` - VMSize string `json:"tectonic_azure_etcd_vm_size,omitempty" yaml:"vmSize,omitempty"` -} - -// External converts external related config. -type External struct { - DNSZoneID string `json:"tectonic_azure_external_dns_zone_id,omitempty" yaml:"dnsZoneID,omitempty"` - MasterSubnetID string `json:"tectonic_azure_external_master_subnet_id,omitempty" yaml:"masterSubnetID,omitempty"` - NSG `json:",inline" yaml:"nsg,omitempty"` - ResourceGroup string `json:"tectonic_azure_external_resource_group,omitempty" yaml:"resourceGroup,omitempty"` - VNetID string `json:"tectonic_azure_external_vnet_id,omitempty" yaml:"vNetID,omitempty"` - WorkerSubnetID string `json:"tectonic_azure_external_worker_subnet_id,omitempty" yaml:"workerSubnetID,omitempty"` -} - -// Master converts master related config. -type Master struct { - StorageType string `json:"tectonic_azure_master_storage_type,omitempty" yaml:"storageType,omitempty"` - VMSize string `json:"tectonic_azure_master_vm_size,omitempty" yaml:"vmSize,omitempty"` -} - -// Network converts network related config. -type Network struct { - External string `json:"tectonic_azure_ssh_network_external,omitempty" yaml:"external,omitempty"` - Internal string `json:"tectonic_azure_ssh_network_internal,omitempty" yaml:"internal,omitempty"` -} - -// NSG converts nsg related config. -type NSG struct { - MasterID string `json:"tectonic_azure_external_nsg_master_id,omitempty" yaml:"masterID,omitempty"` - WorkerID string `json:"tectonic_azure_external_nsg_worker_id,omitempty" yaml:"workerID,omitempty"` -} - -// SSH converts ssh related config. -type SSH struct { - Key string `json:"tectonic_azure_ssh_key,omitempty" yaml:"key,omitempty"` - Network `json:",inline" yaml:"network,omitempty"` -} - -// Worker converts worker related config. -type Worker struct { - StorageType string `json:"tectonic_azure_worker_storage_type,omitempty" yaml:"storageType,omitempty"` - VMSize string `json:"tectonic_azure_worker_vm_size,omitempty" yaml:"vmSize,omitempty"` -} diff --git a/installer/pkg/config/gcp/BUILD.bazel b/installer/pkg/config/gcp/BUILD.bazel deleted file mode 100644 index a850198db8..0000000000 --- a/installer/pkg/config/gcp/BUILD.bazel +++ /dev/null @@ -1,10 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "gcp.go", - ], - importpath = "github.com/coreos/tectonic-installer/installer/pkg/config/gcp", - visibility = ["//visibility:public"], -) diff --git a/installer/pkg/config/gcp/gcp.go b/installer/pkg/config/gcp/gcp.go deleted file mode 100644 index 04317306b0..0000000000 --- a/installer/pkg/config/gcp/gcp.go +++ /dev/null @@ -1,33 +0,0 @@ -package gcp - -// Etcd converts etcd related config. -type Etcd struct { - DiskSize string `json:"tectonic_gcp_etcd_disk_size,omitempty" yaml:"diskSize,omitempty"` - DiskType string `json:"tectonic_gcp_etcd_disktype,omitempty" yaml:"diskType,omitempty"` - GCEType string `json:"tectonic_gcp_etcd_gce_type,omitempty" yaml:"gceType,omitempty"` -} - -// GCP converts GCP related config. -type GCP struct { - ConfigVersion string `json:"tectonic_gcp_config_version,omitempty" yaml:"configVersion,omitempty"` - Etcd `json:",inline" yaml:"etcd,omitempty"` - ExtGoogleManagedZoneName string `json:"tectonic_gcp_ext_google_managedzone_name,omitempty" yaml:"extGoogleManagedZoneName,omitempty"` - Master `json:",inline" yaml:"master,omitempty"` - Region string `json:"tectonic_gcp_region,omitempty" yaml:"region,omitempty"` - SSHKey string `json:"tectonic_gcp_ssh_key,omitempty" yaml:"sshKey,omitempty"` - Worker `json:",inline" yaml:"worker,omitempty"` -} - -// Master converts master related config. -type Master struct { - DiskSize string `json:"tectonic_gcp_master_disk_size,omitempty" yaml:"diskSize,omitempty"` - DiskType string `json:"tectonic_gcp_master_disktype,omitempty" yaml:"diskType,omitempty"` - GCEType string `json:"tectonic_gcp_master_gce_type,omitempty" yaml:"gceType,omitempty"` -} - -// Worker converts worker related config. -type Worker struct { - DiskSize string `json:"tectonic_gcp_worker_disk_size,omitempty" yaml:"diskSize,omitempty"` - DiskType string `json:"tectonic_gcp_worker_disktype,omitempty" yaml:"diskType,omitempty"` - GCEType string `json:"tectonic_gcp_worker_gce_type,omitempty" yaml:"gceType,omitempty"` -} diff --git a/installer/pkg/config/metal/BUILD.bazel b/installer/pkg/config/metal/BUILD.bazel deleted file mode 100644 index 094d1b0ec0..0000000000 --- a/installer/pkg/config/metal/BUILD.bazel +++ /dev/null @@ -1,10 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "metal.go", - ], - importpath = "github.com/coreos/tectonic-installer/installer/pkg/config/metal", - visibility = ["//visibility:public"], -) diff --git a/installer/pkg/config/metal/metal.go b/installer/pkg/config/metal/metal.go deleted file mode 100644 index 2f400d3d27..0000000000 --- a/installer/pkg/config/metal/metal.go +++ /dev/null @@ -1,40 +0,0 @@ -package metal - -// Client converts client related config. -type Client struct { - Cert string `json:"tectonic_metal_matchbox_client_cert,omitempty" yaml:"cert,omitempty"` - Key string `json:"tectonic_metal_matchbox_client_key,omitempty" yaml:"key,omitempty"` -} - -// Controller converts controller related config. -type Controller struct { - Domain string `json:"tectonic_metal_controller_domain,omitempty" yaml:"domain,omitempty"` - Domains string `json:"tectonic_metal_controller_domains,omitempty" yaml:"domains,omitempty"` - MACs string `json:"tectonic_metal_controller_macs,omitempty" yaml:"macs,omitempty"` - Names string `json:"tectonic_metal_controller_names,omitempty" yaml:"names,omitempty"` -} - -// Matchbox converts matchbox related config. -type Matchbox struct { - CA string `json:"tectonic_metal_matchbox_ca,omitempty" yaml:"ca,omitempty"` - Client `json:",inline" yaml:"client,omitempty"` - HTTPURL string `json:"tectonic_metal_matchbox_http_url,omitempty" yaml:"httpURL,omitempty"` - RPCEndpoint string `json:"tectonic_metal_matchbox_rpc_endpoint,omitempty" yaml:"rpcEndpoint,omitempty"` -} - -// Metal converts metal related config. -type Metal struct { - CalicoMTU string `json:"tectonic_metal_calico_mtu,omitempty" yaml:"calicoMTU,omitempty"` - Controller `json:",inline" yaml:"controller,omitempty"` - IngressDomain string `json:"tectonic_metal_ingress_domain,omitempty" yaml:"ingressDomain,omitempty"` - Matchbox `json:",inline" yaml:"matchbox,omitempty"` - SSHAuthorizedKey string `json:"tectonic_ssh_authorized_key,omitempty" yaml:"sshAuthorizedKey,omitempty"` // TODO:(spangenberg): Prefix with metal. - Worker `json:",inline" yaml:"worker,omitempty"` -} - -// Worker converts worker related config. -type Worker struct { - Domains string `json:"tectonic_metal_worker_domains,omitempty" yaml:"domains,omitempty"` - MACs string `json:"tectonic_metal_worker_macs,omitempty" yaml:"macs,omitempty"` - Names string `json:"tectonic_metal_worker_names,omitempty" yaml:"names,omitempty"` -} diff --git a/installer/pkg/config/openstack/BUILD.bazel b/installer/pkg/config/openstack/BUILD.bazel deleted file mode 100644 index b57d97bf98..0000000000 --- a/installer/pkg/config/openstack/BUILD.bazel +++ /dev/null @@ -1,10 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "openstack.go", - ], - importpath = "github.com/coreos/tectonic-installer/installer/pkg/config/openstack", - visibility = ["//visibility:public"], -) diff --git a/installer/pkg/config/openstack/openstack.go b/installer/pkg/config/openstack/openstack.go deleted file mode 100644 index 93f126ad39..0000000000 --- a/installer/pkg/config/openstack/openstack.go +++ /dev/null @@ -1,39 +0,0 @@ -package openstack - -// EtcdFlavor converts etcd flavor related config. -type EtcdFlavor struct { - ID string `json:"tectonic_openstack_etcd_flavor_id,omitempty" yaml:"id,omitempty"` - Name string `json:"tectonic_openstack_etcd_flavor_name,omitempty" yaml:"name,omitempty"` -} - -// Image converts image related config. -type Image struct { - ID string `json:"tectonic_openstack_image_id,omitempty" yaml:"id,omitempty"` - Name string `json:"tectonic_openstack_image_name,omitempty" yaml:"name,omitempty"` -} - -// MasterFlavor converts master flavor related config. -type MasterFlavor struct { - ID string `json:"tectonic_openstack_master_flavor_id,omitempty" yaml:"id,omitempty"` - Name string `json:"tectonic_openstack_master_flavor_name,omitempty" yaml:"name,omitempty"` -} - -// OpenStack converts OpenStack related config. -type OpenStack struct { - DisableFloatingIP string `json:"tectonic_openstack_disable_floatingip,omitempty" yaml:"disableFloatingIP,omitempty"` - DNSNameservers string `json:"tectonic_openstack_dns_nameservers,omitempty" yaml:"dnsNameservers,omitempty"` - EtcdFlavor `json:",inline" yaml:"etcdFlavor,omitempty"` - ExternalGatewayID string `json:"tectonic_openstack_external_gateway_id,omitempty" yaml:"externalGatewayID,omitempty"` - FloatingIPPool string `json:"tectonic_openstack_floatingip_pool,omitempty" yaml:"floatingIPPool,omitempty"` - Image `json:",inline" yaml:"image,omitempty"` - LBProvider string `json:"tectonic_openstack_lb_provider,omitempty" yaml:"lbProvider,omitempty"` - MasterFlavor `json:",inline" yaml:"masterFlavor,omitempty"` - SubnetCIDR string `json:"tectonic_openstack_subnet_cidr,omitempty" yaml:"subnetCIDR,omitempty"` - WorkerFlavor `json:",inline" yaml:"workerFlavor,omitempty"` -} - -// WorkerFlavor converts worker flavor related config. -type WorkerFlavor struct { - ID string `json:"tectonic_openstack_worker_flavor_id,omitempty" yaml:"id,omitempty"` - Name string `json:"tectonic_openstack_worker_flavor_name,omitempty" yaml:"name,omitempty"` -} diff --git a/installer/pkg/config/vmware/BUILD.bazel b/installer/pkg/config/vmware/BUILD.bazel deleted file mode 100644 index d46c987095..0000000000 --- a/installer/pkg/config/vmware/BUILD.bazel +++ /dev/null @@ -1,10 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "vmware.go", - ], - importpath = "github.com/coreos/tectonic-installer/installer/pkg/config/vmware", - visibility = ["//visibility:public"], -) diff --git a/installer/pkg/config/vmware/vmware.go b/installer/pkg/config/vmware/vmware.go deleted file mode 100644 index 7a5f1eec81..0000000000 --- a/installer/pkg/config/vmware/vmware.go +++ /dev/null @@ -1,71 +0,0 @@ -package vmware - -// Etcd converts etcd related config. -type Etcd struct { - Clusters string `json:"tectonic_vmware_etcd_clusters,omitempty" yaml:"clusters,omitempty"` - Datacenters string `json:"tectonic_vmware_etcd_datacenters,omitempty" yaml:"datacenters,omitempty"` - Datastores string `json:"tectonic_vmware_etcd_datastores,omitempty" yaml:"datastores,omitempty"` - Gateways string `json:"tectonic_vmware_etcd_gateways,omitempty" yaml:"gateways,omitempty"` - Hostnames string `json:"tectonic_vmware_etcd_hostnames,omitempty" yaml:"hostnames,omitempty"` - IP string `json:"tectonic_vmware_etcd_ip,omitempty" yaml:"ip,omitempty"` - Memory string `json:"tectonic_vmware_etcd_memory,omitempty" yaml:"memory,omitempty"` - Networks string `json:"tectonic_vmware_etcd_networks,omitempty" yaml:"networks,omitempty"` - ResourcePool string `json:"tectonic_vmware_etcd_resource_pool,omitempty" yaml:"resourcePool,omitempty"` - VCPU string `json:"tectonic_vmware_etcd_vcpu,omitempty" yaml:"vCPU,omitempty"` -} - -// Master converts master related config. -type Master struct { - Clusters string `json:"tectonic_vmware_master_clusters,omitempty" yaml:"clusters,omitempty"` - Datacenters string `json:"tectonic_vmware_master_datacenters,omitempty" yaml:"datacenters,omitempty"` - Datastores string `json:"tectonic_vmware_master_datastores,omitempty" yaml:"datastores,omitempty"` - Gateways string `json:"tectonic_vmware_master_gateways,omitempty" yaml:"gateways,omitempty"` - Hostnames string `json:"tectonic_vmware_master_hostnames,omitempty" yaml:"hostnames,omitempty"` - IP string `json:"tectonic_vmware_master_ip,omitempty" yaml:"ip,omitempty"` - Memory string `json:"tectonic_vmware_master_memory,omitempty" yaml:"memory,omitempty"` - Networks string `json:"tectonic_vmware_master_networks,omitempty" yaml:"networks,omitempty"` - ResourcePool string `json:"tectonic_vmware_master_resource_pool,omitempty" yaml:"resourcePool,omitempty"` - VCPU string `json:"tectonic_vmware_master_vcpu,omitempty" yaml:"vCPU,omitempty"` -} - -// SSH converts ssh related config. -type SSH struct { - AuthorizedKey string `json:"tectonic_vmware_ssh_authorized_key,omitempty" yaml:"authorizedKey,omitempty"` - PrivateKeyPath string `json:"tectonic_vmware_ssh_private_key_path,omitempty" yaml:"privateKeyPath,omitempty"` -} - -// VM converts vm related config. -type VM struct { - Template string `json:"tectonic_vmware_vm_template,omitempty" yaml:"template,omitempty"` - TemplateFolder string `json:"tectonic_vmware_vm_template_folder,omitempty" yaml:"templateFolder,omitempty"` -} - -// VMware converts VMware related config. -type VMware struct { - ControllerDomain string `json:"tectonic_vmware_controller_domain,omitempty" yaml:"controllerDomain,omitempty"` - Etcd `json:",inline" yaml:"etcd,omitempty"` - Folder string `json:"tectonic_vmware_folder,omitempty" yaml:"folder,omitempty"` - IngressDomain string `json:"tectonic_vmware_ingress_domain,omitempty" yaml:"ingressDomain,omitempty"` - Master `json:",inline" yaml:"master,omitempty"` - NodeDNS string `json:"tectonic_vmware_node_dns,omitempty" yaml:"nodeDNS,omitempty"` - Server string `json:"tectonic_vmware_server,omitempty" yaml:"server,omitempty"` - SSH `json:",inline" yaml:"ssh,omitempty"` - SSLSelfSigned string `json:"tectonic_vmware_sslselfsigned,omitempty" yaml:"sslSelfsigned,omitempty"` - Type string `json:"tectonic_vmware_type,omitempty" yaml:"type,omitempty"` - VM `json:",inline" yaml:"vm,omitempty"` - Worker `json:",inline" yaml:"worker,omitempty"` -} - -// Worker converts worker related config. -type Worker struct { - Clusters string `json:"tectonic_vmware_worker_clusters,omitempty" yaml:"clusters,omitempty"` - Datacenters string `json:"tectonic_vmware_worker_datacenters,omitempty" yaml:"datacenters,omitempty"` - Datastores string `json:"tectonic_vmware_worker_datastores,omitempty" yaml:"datastores,omitempty"` - Gateways string `json:"tectonic_vmware_worker_gateways,omitempty" yaml:"gateways,omitempty"` - Hostnames string `json:"tectonic_vmware_worker_hostnames,omitempty" yaml:"hostnames,omitempty"` - IP string `json:"tectonic_vmware_worker_ip,omitempty" yaml:"ip,omitempty"` - Memory string `json:"tectonic_vmware_worker_memory,omitempty" yaml:"memory,omitempty"` - Networks string `json:"tectonic_vmware_worker_networks,omitempty" yaml:"networks,omitempty"` - ResourcePool string `json:"tectonic_vmware_worker_resource_pool,omitempty" yaml:"resourcePool,omitempty"` - VCPU string `json:"tectonic_vmware_worker_vcpu,omitempty" yaml:"vCPU,omitempty"` -}