Skip to content

Expose services publicly. #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jacobstr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Expose services publicly. #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmd/farva-gateway/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ func main() {
fs.BoolVar(&cfg.NGINXDryRun, "nginx-dry-run", false, "Log nginx management commands rather than executing them.")
fs.IntVar(&cfg.NGINXHealthPort, "nginx-health-port", gateway.DefaultNGINXConfig.HealthPort, "Port to listen on for nginx health checks.")
fs.IntVar(&cfg.FarvaHealthPort, "farva-health-port", gateway.DefaultConfig.FarvaHealthPort, "Port to listen on for farva health checks.")
fs.IntVar(&cfg.HTTPListenPort, "http-listen-port", gateway.DefaultConfig.HTTPListenPort, "Port to listen on for HTTP traffic.")
fs.IntVar(&cfg.HTTPPrivateListenPort, "http-private-listen-port", gateway.DefaultConfig.HTTPPrivateListenPort, "Port to listen on for internal HTTP traffic.")
fs.IntVar(&cfg.HTTPPublicListenPort, "http-public-listen-port", gateway.DefaultConfig.HTTPPublicListenPort, "Port to listen on for external HTTP traffic.")
fs.StringVar(&cfg.FifoPath, "fifo-path", gateway.DefaultConfig.FifoPath, "Location of nginx stderr and stdout logging fifo.")
fs.StringVar(&cfg.ClusterZone, "cluster-zone", "", "Use this DNS zone for routing of traffic to Kubernetes")
fs.StringVar(&cfg.AnnotationPrefix, "annotation-prefix", gateway.DefaultKubernetesReverseProxyConfigGetterConfig.AnnotationPrefix, "Forms the lookup key for additional gateway configuration annotations.")
Expand Down
35 changes: 19 additions & 16 deletions pkg/gateway/gateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,23 @@ import (
)

type Config struct {
RefreshInterval time.Duration
KubeconfigFile string
ClusterZone string
NGINXDryRun bool
NGINXHealthPort int
HTTPListenPort int
FarvaHealthPort int
AnnotationPrefix string
FifoPath string
RefreshInterval time.Duration
KubeconfigFile string
ClusterZone string
NGINXDryRun bool
NGINXHealthPort int
HTTPPublicListenPort int
HTTPPrivateListenPort int
FarvaHealthPort int
AnnotationPrefix string
FifoPath string
}

var DefaultConfig = Config{
HTTPListenPort: 7331,
FarvaHealthPort: 7333,
FifoPath: "/nginx.fifo",
HTTPPrivateListenPort: 7331,
HTTPPublicListenPort: 7330,
FarvaHealthPort: 7333,
FifoPath: "/nginx.fifo",
}

func DefaultHTTPReverseProxyServers(cfg *Config) []httpReverseProxyServer {
Expand All @@ -41,7 +43,7 @@ func DefaultHTTPReverseProxyServers(cfg *Config) []httpReverseProxyServer {
},
},
httpReverseProxyServer{
ListenPort: cfg.HTTPListenPort,
ListenPort: cfg.HTTPPrivateListenPort,
DefaultServer: true,
StaticCode: 444,
},
Expand All @@ -61,9 +63,10 @@ func New(cfg Config) (*Gateway, error) {
}

krc := &kubernetesReverseProxyConfigGetterConfig{
AnnotationPrefix: cfg.AnnotationPrefix,
ClusterZone: cfg.ClusterZone,
ListenPort: cfg.HTTPListenPort,
AnnotationPrefix: cfg.AnnotationPrefix,
ClusterZone: cfg.ClusterZone,
PrivateListenPort: cfg.HTTPPrivateListenPort,
PublicListenPort: cfg.HTTPPublicListenPort,
}
rg := newReverseProxyConfigGetter(kc, krc)

Expand Down
31 changes: 27 additions & 4 deletions pkg/gateway/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ import (
)

type kubernetesReverseProxyConfigGetterConfig struct {
AnnotationPrefix string
ClusterZone string
ListenPort int
AnnotationPrefix string
ClusterZone string
PublicListenPort int
PrivateListenPort int
}

const HostnameAliasKey = "hostname-aliases"
const PublicHostnamesKey = "public-hostnames"

func (krc *kubernetesReverseProxyConfigGetterConfig) annotationKey(name string) string {
return fmt.Sprintf("%s/%s", krc.AnnotationPrefix, name)
Expand All @@ -38,6 +40,18 @@ func (krc *kubernetesReverseProxyConfigGetterConfig) getAnnotationStringList(ing
return result
}

// Get a string at a given annotation field.
func (krc *kubernetesReverseProxyConfigGetterConfig) getAnnotationString(ing *kextensions.Ingress, name string) string {
anno := ing.ObjectMeta.GetAnnotations()
annotationKey := krc.annotationKey(name)
for key, val := range anno {
if key == annotationKey {
return val
}
}
return ""
}

var DefaultKubernetesReverseProxyConfigGetterConfig = kubernetesReverseProxyConfigGetterConfig{
AnnotationPrefix: "klondike.gateway",
}
Expand Down Expand Up @@ -189,7 +203,7 @@ func (rcg *kubernetesReverseProxyConfigGetter) addHTTPIngressToReverseProxyConfi
srv := httpReverseProxyServer{
Name: CanonicalHostname(ingName, ingNamespace, rcg.krc.ClusterZone),
AltNames: rcg.krc.getAnnotationStringList(ing, HostnameAliasKey),
ListenPort: rcg.krc.ListenPort,
ListenPort: rcg.krc.PrivateListenPort,
Locations: []httpReverseProxyLocation{},
}

Expand Down Expand Up @@ -238,6 +252,15 @@ func (rcg *kubernetesReverseProxyConfigGetter) addHTTPIngressToReverseProxyConfi
}

rp.HTTPServers = append(rp.HTTPServers, srv)

// If the service has opted to expose all hostnames publically, we copy the
// srv above but replace the ListenPort with our configured
// PublicListenPort.
if rcg.krc.getAnnotationString(ing, PublicHostnamesKey) == "*" {
publicSrv := srv
publicSrv.ListenPort = rcg.krc.PublicListenPort
rp.HTTPServers = append(rp.HTTPServers, publicSrv)
}
}

return nil
Expand Down