Skip to content

Commit

Permalink
Kubernetes proxy integration tests.
Browse files Browse the repository at this point in the history
This PR contains Kubernetes proxy
integration tests and associated internal changes.
  • Loading branch information
klizhentas committed Jun 14, 2018
1 parent ff1b444 commit 03069a2
Show file tree
Hide file tree
Showing 147 changed files with 21,530 additions and 73 deletions.
432 changes: 395 additions & 37 deletions Gopkg.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# Naming convention:
# for stable releases we use "1.0.0" format
# for pre-releases, we use "1.0.0-beta.2" format
VERSION=2.7.0-alpha.2
VERSION=2.7.0-alpha.3

# These are standard autotools variables, don't change them please
BUILDDIR ?= build
Expand Down
12 changes: 12 additions & 0 deletions constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,18 @@ const (
// KubeKindCSR is a certificate signing requests
KubeKindCSR = "CertificateSigningRequest"

// KubeKindPod is a kubernetes pod
KubeKindPod = "Pod"

// KubeMetadataNameSelector is a selector for name metadata in API requests
KubeMetadataNameSelector = "metadata.name"

// KubeMetadataLabelSelector is a selector for label
KubeMetadataLabelSelector = "metadata.label"

// KubeRunTests turns on kubernetes tests
KubeRunTests = "TEST_KUBE"

// KubeSystemMasters is a name of the builtin kubernets group for master nodes
KubeSystemMasters = "system:masters"
)
2 changes: 2 additions & 0 deletions integration/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,8 @@ func (i *TeleInstance) GenerateConfig(trustedSecrets []*InstanceSecrets, tconf *
tconf.Auth.SSHAddr.Addr = net.JoinHostPort(i.Hostname, i.GetPortAuth())
tconf.Proxy.SSHAddr.Addr = net.JoinHostPort(i.Hostname, i.GetPortProxy())
tconf.Proxy.WebAddr.Addr = net.JoinHostPort(i.Hostname, i.GetPortWeb())
tconf.Proxy.PublicAddrs = []utils.NetAddr{{Addr: i.Hostname}}

tconf.AuthServers = append(tconf.AuthServers, tconf.Auth.SSHAddr)
tconf.Auth.StorageConfig = backend.Config{
Type: dir.GetName(),
Expand Down
Loading

0 comments on commit 03069a2

Please sign in to comment.