From 8f40137c72fa91e120175a505e0b4d9c64e3370a Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 19 Oct 2018 22:46:30 -0700 Subject: [PATCH] vendor: Drop kube-core Catching up with c9b0e2ff (manifests: stop using kube core operator, 2018-10-08, #420). Generated with: $ dep ensure using: $ dep version dep: version : v0.5.0 build date : git hash : 22125cf go version : go1.10.3 go compiler : gc platform : linux/amd64 features : ImportDuringSolve=false --- Gopkg.lock | 4 +- .../config/kube-core/config.go | 64 ------------------- 2 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 vendor/github.com/coreos/tectonic-config/config/kube-core/config.go diff --git a/Gopkg.lock b/Gopkg.lock index 2a369248fda..90d10b400ac 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -111,11 +111,10 @@ [[projects]] branch = "master" - digest = "1:7b66b274b356ceef90428bb165f05f3a04fddd69e0a6c14ef43686ae14e2422e" + digest = "1:3f74b3c0cc3e70631a87355e7265fcf84d0d65f4b75dc6eb9d55e942a5ca0a05" name = "github.com/coreos/tectonic-config" packages = [ "config/kube-addon", - "config/kube-core", "config/tectonic-network", ] pruneopts = "NUT" @@ -485,7 +484,6 @@ "github.com/coreos/ignition/config/util", "github.com/coreos/ignition/config/v2_2/types", "github.com/coreos/tectonic-config/config/kube-addon", - "github.com/coreos/tectonic-config/config/kube-core", "github.com/coreos/tectonic-config/config/tectonic-network", "github.com/ghodss/yaml", "github.com/gregjones/httpcache", diff --git a/vendor/github.com/coreos/tectonic-config/config/kube-core/config.go b/vendor/github.com/coreos/tectonic-config/config/kube-core/config.go deleted file mode 100644 index d9b55d323a4..00000000000 --- a/vendor/github.com/coreos/tectonic-config/config/kube-core/config.go +++ /dev/null @@ -1,64 +0,0 @@ -package kubecore - -import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" -) - -const ( - // Kind is the TypeMeta.Kind for the OperatorConfig. - Kind = "KubeCoreOperatorConfig" - // APIVersion is the TypeMeta.APIVersion for the OperatorConfig. - APIVersion = "v1" -) - -// OperatorConfig holds all configuration needed for the operator to make any install / upgrade time -// decisions. -type OperatorConfig struct { - metav1.TypeMeta `json:",inline"` - ClusterConfig `json:"clusterConfig,omitempty"` - DNSConfig `json:"dnsConfig,omitempty"` - AuthConfig `json:"authConfig,omitempty"` - RoutingConfig `json:"routingConfig,omitempty"` - CloudProviderConfig `json:"cloudProviderConfig,omitempty"` - NetworkConfig `json:"networkConfig,omitempty"` -} - -// AuthConfig holds Authentication related config values. -type AuthConfig struct { - OIDCClientID string `json:"oidc_client_id"` - OIDCIssuerURL string `json:"oidc_issuer_url"` - OIDCGroupsClaim string `json:"oidc_groups_claim"` - OIDCUsernameClaim string `json:"oidc_username_claim"` -} - -// CloudProviderConfig holds information on the cloud provider this cluster is operating in. -type CloudProviderConfig struct { - CloudConfigPath string `json:"cloud_config_path"` - CloudProviderProfile string `json:"cloud_provider_profile"` -} - -// NetworkConfig holds information on cluster networking. -type NetworkConfig struct { - AdvertiseAddress string `json:"advertise_address"` - ClusterCIDR string `json:"cluster_cidr"` - EtcdServers string `json:"etcd_servers"` - ServiceCIDR string `json:"service_cidr"` -} - -// ClusterConfig holds global/general information about the cluster. -type ClusterConfig struct { - APIServerURL string `json:"apiserver_url"` -} - -// DNSConfig options for the dns configuration -type DNSConfig struct { - // ClusterIP ip address of the cluster - ClusterIP string `json:"clusterIP"` -} - -// RoutingConfig holds options for routes. -type RoutingConfig struct { - // Subdomain is the suffix appended to $service.$namespace. to form the default route hostname - // if empty, router.tectonic-ingress.cluster.local - Subdomain string `json:"subdomain"` -}