baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove IngressEndpoint in CRD provider

Browse source
This commit is contained in:
Julien Salleyron 2019-03-18 14:38:04 +01:00 committed by Traefiker Bot
parent 37886892c8
commit 50e24f461c
3 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/anonymize/anonymize_config_test.go
View file

@ -216,7 +216,6 @@ func TestDo_globalConfiguration(t *testing.T) {
Token: "MyToken", Token: "MyToken",
CertAuthFilePath: "MyCertAuthPath", CertAuthFilePath: "MyCertAuthPath",
DisablePassHostHeaders: true, DisablePassHostHeaders: true,
EnablePassTLSCert: true,
Namespaces: []string{"a", "b"}, Namespaces: []string{"a", "b"},
LabelSelector: "myLabelSelector", LabelSelector: "myLabelSelector",
IngressClass: "MyIngressClass", IngressClass: "MyIngressClass",
@ -245,7 +244,6 @@ func TestDo_globalConfiguration(t *testing.T) {
Token: "MyToken", Token: "MyToken",
CertAuthFilePath: "MyCertAuthPath", CertAuthFilePath: "MyCertAuthPath",
DisablePassHostHeaders: true, DisablePassHostHeaders: true,
EnablePassTLSCert: true,
Namespaces: []string{"a", "b"}, Namespaces: []string{"a", "b"},
LabelSelector: "myLabelSelector", LabelSelector: "myLabelSelector",
IngressClass: "MyIngressClass", IngressClass: "MyIngressClass",

23
pkg/provider/kubernetes/crd/kubernetes.go
View file

@ -31,25 +31,16 @@ const (
traefikDefaultIngressClass = "traefik" traefikDefaultIngressClass = "traefik"
) )
// IngressEndpoint holds the endpoint information for the Kubernetes provider.
type IngressEndpoint struct {
IP string `description:"IP used for Kubernetes Ingress endpoints"`
Hostname string `description:"Hostname used for Kubernetes Ingress endpoints"`
PublishedService string `description:"Published Kubernetes Service to copy status from"`
}
// Provider holds configurations of the provider. // Provider holds configurations of the provider.
type Provider struct { type Provider struct {
provider.BaseProvider `mapstructure:",squash" export:"true"` provider.BaseProvider `mapstructure:",squash" export:"true"`
Endpoint string `description:"Kubernetes server endpoint (required for external cluster client)"` Endpoint string `description:"Kubernetes server endpoint (required for external cluster client)"`
Token string `description:"Kubernetes bearer token (not needed for in-cluster client)"` Token string `description:"Kubernetes bearer token (not needed for in-cluster client)"`
CertAuthFilePath string `description:"Kubernetes certificate authority file path (not needed for in-cluster client)"` CertAuthFilePath string `description:"Kubernetes certificate authority file path (not needed for in-cluster client)"`
DisablePassHostHeaders bool `description:"Kubernetes disable PassHost Headers" export:"true"` DisablePassHostHeaders bool `description:"Kubernetes disable PassHost Headers" export:"true"`
EnablePassTLSCert bool `description:"Kubernetes enable Pass TLS Client Certs" export:"true"` // Deprecated Namespaces k8s.Namespaces `description:"Kubernetes namespaces" export:"true"`
Namespaces k8s.Namespaces `description:"Kubernetes namespaces" export:"true"` LabelSelector string `description:"Kubernetes Ingress label selector to use" export:"true"`
LabelSelector string `description:"Kubernetes Ingress label selector to use" export:"true"` IngressClass string `description:"Value of kubernetes.io/ingress.class annotation to watch for" export:"true"`
IngressClass string `description:"Value of kubernetes.io/ingress.class annotation to watch for" export:"true"`
IngressEndpoint *IngressEndpoint `description:"Kubernetes Ingress Endpoint"`
lastConfiguration safe.Safe lastConfiguration safe.Safe
} }

1
pkg/provider/kubernetes/ingress/kubernetes.go
View file

@ -39,7 +39,6 @@ type Provider struct {
Token string `description:"Kubernetes bearer token (not needed for in-cluster client)"` Token string `description:"Kubernetes bearer token (not needed for in-cluster client)"`
CertAuthFilePath string `description:"Kubernetes certificate authority file path (not needed for in-cluster client)"` CertAuthFilePath string `description:"Kubernetes certificate authority file path (not needed for in-cluster client)"`
DisablePassHostHeaders bool `description:"Kubernetes disable PassHost Headers" export:"true"` DisablePassHostHeaders bool `description:"Kubernetes disable PassHost Headers" export:"true"`
EnablePassTLSCert bool `description:"Kubernetes enable Pass TLS Client Certs" export:"true"` // Deprecated
Namespaces k8s.Namespaces `description:"Kubernetes namespaces" export:"true"` Namespaces k8s.Namespaces `description:"Kubernetes namespaces" export:"true"`
LabelSelector string `description:"Kubernetes Ingress label selector to use" export:"true"` LabelSelector string `description:"Kubernetes Ingress label selector to use" export:"true"`
IngressClass string `description:"Value of kubernetes.io/ingress.class annotation to watch for" export:"true"` IngressClass string `description:"Value of kubernetes.io/ingress.class annotation to watch for" export:"true"`