Add fallback to no gRPC (#454)

* Add fallback to no gRPC * fix tests * update to use main branch for 1.14 * Fix up namespae setting in exec mode Co-authored-by: sarahalsmiller <100602640+sarahalsmiller@users.noreply.github.com>
hashicorp · Nov 17, 2022 · bd58c9d · bd58c9d
1 parent faa8244
commit bd58c9d
Show file tree

Hide file tree

Showing 15 changed files with 119 additions and 9 deletions.
diff --git a/.github/workflows/conformance_with_build.yml b/.github/workflows/conformance_with_build.yml
@@ -50,7 +50,7 @@ jobs:
             api-gateway-image: "hashicorppreview/consul-api-gateway:0.4-dev"
             consul-image: "hashicorppreview/consul:1.14-dev"
             envoy-image: "envoyproxy/envoy:v1.22-latest"
-            consul-k8s-version: "v0.49.0"
+            consul-k8s-version: "main"
       fail-fast: true
     name: "${{ matrix.config.name }}"
 

diff --git a/internal/commands/exec/command.go b/internal/commands/exec/command.go
@@ -169,12 +169,11 @@ func (c *Command) Run(args []string) (ret int) {
 		bearerToken = strings.TrimSpace(string(data))
 	}
 
-	if c.flagGatewayNamespace != "" {
-		cfg.Namespace = c.flagGatewayNamespace
-	}
-
 	consulClientConfig := consul.ClientConfig{
+		Name:            c.flagGatewayName,
+		Namespace:       c.flagGatewayNamespace,
 		ApiClientConfig: cfg,
+		UseDynamic:      os.Getenv("CONSUL_DYNAMIC_SERVER_DISCOVERY") == "true",
 		Addresses:       c.flagConsulHTTPAddress,
 		HTTPPort:        c.flagConsulHTTPPort,
 		GRPCPort:        c.flagConsulXDSPort,

diff --git a/internal/commands/exec/command_test.go b/internal/commands/exec/command_test.go
@@ -2,6 +2,7 @@ package exec
 
 import (
 	"context"
+	"os"
 	"testing"
 
 	"github.com/mitchellh/cli"
@@ -124,6 +125,7 @@ func TestExec(t *testing.T) {
 		output: "did not get state within time limit",
 	}} {
 		t.Run(test.name, func(t *testing.T) {
+			os.Setenv("CONSUL_DYNAMIC_SERVER_DISCOVERY", "true")
 			ctx := context.Background()
 			ui := cli.NewMockUi()
 			var buffer gwTesting.Buffer

diff --git a/internal/commands/exec/exec_test.go b/internal/commands/exec/exec_test.go
@@ -468,6 +468,7 @@ func runMockConsulServer(t *testing.T, opts mockConsulOptions) *mockConsulServer
 	})
 
 	server.clientConfig = consul.ClientConfig{
+		UseDynamic:      true,
 		Addresses:       serverURL.Hostname(),
 		ApiClientConfig: clientConfig,
 		GRPCPort:        grpcPort,

diff --git a/internal/commands/server/command.go b/internal/commands/server/command.go
@@ -172,11 +172,15 @@ func (c *Command) Run(args []string) int {
 		MirrorKubernetesNamespacePrefix: c.flagMirrorK8SNamespacePrefix,
 	}
 
-	consulHTTPAddressOrCommand, port, err := parseConsulHTTPAddress()
+	consulScheme, consulHTTPAddressOrCommand, port, err := parseConsulHTTPAddress()
 	if err != nil {
 		logger.Error("error reading "+consulHTTPAddressEnvName, "error", err)
 		return 1
 	}
+	if consulCfg.Scheme != "https" {
+		// override only if it needs to be explicitly marked
+		consulCfg.Scheme = consulScheme
+	}
 
 	tlsCfg, err := api.SetupTLSConfig(&consulCfg.TLSConfig)
 	if err != nil {
@@ -201,8 +205,10 @@ func (c *Command) Run(args []string) int {
 	}
 
 	consulClientConfig := consul.ClientConfig{
+		Name:            "api-gateway-controller",
 		ApiClientConfig: consulCfg,
 		Addresses:       consulHTTPAddressOrCommand,
+		UseDynamic:      os.Getenv("CONSUL_DYNAMIC_SERVER_DISCOVERY") == "true",
 		HTTPPort:        port,
 		GRPCPort:        grpcPort(),
 		PlainText:       consulCfg.Scheme == "http",

diff --git a/internal/commands/server/server.go b/internal/commands/server/server.go
@@ -167,14 +167,21 @@ func registerSecretClients(config ServerConfig) (*envoy.MultiSecretClient, error
 	return secretClient, nil
 }
 
-func parseConsulHTTPAddress() (cmd string, port int, err error) {
+func parseConsulHTTPAddress() (scheme string, cmd string, port int, err error) {
 	consulhttpAddress := os.Getenv(consulHTTPAddressEnvName)
+	scheme = "http"
+	if os.Getenv("CONSUL_HTTP_SSL") == "true" || strings.HasPrefix(consulhttpAddress, "https://") {
+		scheme = "https"
+	}
 
+	// (?:http|https|ftp)://)
+	consulhttpAddress = strings.TrimPrefix(consulhttpAddress, "http://")
+	consulhttpAddress = strings.TrimPrefix(consulhttpAddress, "https://")
 	index := strings.LastIndex(consulhttpAddress, ":")
 	cmd, portString := consulhttpAddress[:index], consulhttpAddress[index+1:]
 	port, err = strconv.Atoi(portString)
 	if err != nil {
-		return "", 0, err
+		return "", "", 0, err
 	}
-	return cmd, port, nil
+	return scheme, cmd, port, nil
 }
diff --git a/internal/consul/connection.go b/internal/consul/connection.go
@@ -43,7 +43,10 @@ type Client interface {
 }
 
 type ClientConfig struct {
+	Name            string
+	Namespace       string
 	ApiClientConfig *api.Config
+	UseDynamic      bool
 	PlainText       bool
 	Addresses       string
 	HTTPPort        int
@@ -81,6 +84,53 @@ func (c *client) Wait(until time.Duration) error {
 }
 
 func (c *client) WatchServers(ctx context.Context) error {
+	if !c.config.UseDynamic {
+		cfg := c.config.ApiClientConfig
+		cfg.Address = fmt.Sprintf("%s:%d", c.config.Addresses, c.config.HTTPPort)
+
+		var err error
+		var client *api.Client
+		var token string
+		if c.config.Credentials.Type == discovery.CredentialsTypeLogin {
+			baseClient, err := api.NewClient(cfg)
+			if err != nil {
+				c.initialized <- err
+				return err
+			}
+			if c.config.Namespace != "" {
+				cfg.Namespace = c.config.Namespace
+			}
+			client, token, err = login(ctx, baseClient, cfg, c.config)
+			if err != nil {
+				c.initialized <- err
+				return err
+			}
+			defer logout(baseClient, token, c.config)
+
+		} else {
+			// this might be empty
+			cfg.Token = c.config.Credentials.Static.Token
+			if c.config.Namespace != "" {
+				cfg.Namespace = c.config.Namespace
+			}
+			client, err = api.NewClient(cfg)
+			if err != nil {
+				c.initialized <- err
+				return err
+			}
+		}
+
+		c.mutex.Lock()
+		c.client = client
+		c.token = cfg.Token
+		c.mutex.Unlock()
+
+		close(c.initialized)
+
+		<-ctx.Done()
+		return nil
+	}
+
 	ctx, cancel := context.WithCancel(ctx)
 	c.stop = cancel
 
@@ -124,6 +174,9 @@ func (c *client) WatchServers(ctx context.Context) error {
 	}
 	updateClient := func(s discovery.State) error {
 		cfg := c.config.ApiClientConfig
+		if c.config.Namespace != "" {
+			cfg.Namespace = c.config.Namespace
+		}
 		cfg.Address = fmt.Sprintf("%s:%d", s.Address.IP.String(), c.config.HTTPPort)
 		if static {
 			// This is to fix the fact that s.Address always resolves to an IP, if
@@ -220,3 +273,34 @@ func (c *client) Internal() *api.Client {
 
 	return c.client
 }
+
+func login(ctx context.Context, client *api.Client, cfg *api.Config, config ClientConfig) (*api.Client, string, error) {
+	authenticator := NewAuthenticator(
+		config.Logger.Named("authenticator"),
+		client,
+		config.Credentials.Login.AuthMethod,
+		config.Credentials.Login.Namespace,
+	)
+
+	token, err := authenticator.Authenticate(ctx, config.Name, config.Credentials.Login.BearerToken)
+	if err != nil {
+		return nil, "", fmt.Errorf("error logging in to consul: %w", err)
+	}
+
+	// Now update the client so that it will read the ACL token we just fetched.
+	cfg.Token = token
+	newClient, err := api.NewClient(cfg)
+	if err != nil {
+		return nil, "", fmt.Errorf("error updating client connection with token: %w", err)
+	}
+	return newClient, token, nil
+}
+
+func logout(client *api.Client, token string, config ClientConfig) error {
+	config.Logger.Info("deleting acl token")
+	_, err := client.ACL().Logout(&api.WriteOptions{Token: token})
+	if err != nil {
+		return fmt.Errorf("error deleting acl token: %w", err)
+	}
+	return nil
+}
diff --git a/internal/k8s/builder/gateway.go b/internal/k8s/builder/gateway.go
@@ -296,6 +296,10 @@ func (b *GatewayDeploymentBuilder) envVars() []corev1.EnvVar {
 			Name:  "CONSUL_LOGIN_DATACENTER",
 			Value: os.Getenv("CONSUL_LOGIN_DATACENTER"),
 		},
+		{
+			Name:  "CONSUL_DYNAMIC_SERVER_DISCOVERY",
+			Value: os.Getenv("CONSUL_DYNAMIC_SERVER_DISCOVERY"),
+		},
 		{
 			Name:  "CONSUL_PARTITION",
 			Value: orDefault(b.gwConfig.Spec.ConsulSpec.Partition, defaultPartition),

diff --git a/internal/k8s/builder/testdata/clusterip.deployment.golden.yaml b/internal/k8s/builder/testdata/clusterip.deployment.golden.yaml
@@ -75,6 +75,7 @@ spec:
               fieldPath: status.hostIP
         - name: CONSUL_LOGIN_PARTITION
         - name: CONSUL_LOGIN_DATACENTER
+        - name: CONSUL_DYNAMIC_SERVER_DISCOVERY
         - name: CONSUL_PARTITION
         - name: CONSUL_TLS_SERVER_NAME
         - name: PATH

diff --git a/internal/k8s/builder/testdata/loadbalancer.deployment.golden.yaml b/internal/k8s/builder/testdata/loadbalancer.deployment.golden.yaml
@@ -75,6 +75,7 @@ spec:
               fieldPath: status.hostIP
         - name: CONSUL_LOGIN_PARTITION
         - name: CONSUL_LOGIN_DATACENTER
+        - name: CONSUL_DYNAMIC_SERVER_DISCOVERY
         - name: CONSUL_PARTITION
         - name: CONSUL_TLS_SERVER_NAME
         - name: PATH

diff --git a/internal/k8s/builder/testdata/max-instances.deployment.golden.yaml b/internal/k8s/builder/testdata/max-instances.deployment.golden.yaml
@@ -75,6 +75,7 @@ spec:
               fieldPath: status.hostIP
         - name: CONSUL_LOGIN_PARTITION
         - name: CONSUL_LOGIN_DATACENTER
+        - name: CONSUL_DYNAMIC_SERVER_DISCOVERY
         - name: CONSUL_PARTITION
         - name: CONSUL_TLS_SERVER_NAME
         - name: PATH

diff --git a/internal/k8s/builder/testdata/min-instances.deployment.golden.yaml b/internal/k8s/builder/testdata/min-instances.deployment.golden.yaml
@@ -75,6 +75,7 @@ spec:
               fieldPath: status.hostIP
         - name: CONSUL_LOGIN_PARTITION
         - name: CONSUL_LOGIN_DATACENTER
+        - name: CONSUL_DYNAMIC_SERVER_DISCOVERY
         - name: CONSUL_PARTITION
         - name: CONSUL_TLS_SERVER_NAME
         - name: PATH

diff --git a/internal/k8s/builder/testdata/multiple-instances.deployment.golden.yaml b/internal/k8s/builder/testdata/multiple-instances.deployment.golden.yaml
@@ -75,6 +75,7 @@ spec:
               fieldPath: status.hostIP
         - name: CONSUL_LOGIN_PARTITION
         - name: CONSUL_LOGIN_DATACENTER
+        - name: CONSUL_DYNAMIC_SERVER_DISCOVERY
         - name: CONSUL_PARTITION
         - name: CONSUL_TLS_SERVER_NAME
         - name: PATH

diff --git a/internal/k8s/builder/testdata/static-mapping.deployment.golden.yaml b/internal/k8s/builder/testdata/static-mapping.deployment.golden.yaml
@@ -77,6 +77,7 @@ spec:
               fieldPath: status.hostIP
         - name: CONSUL_LOGIN_PARTITION
         - name: CONSUL_LOGIN_DATACENTER
+        - name: CONSUL_DYNAMIC_SERVER_DISCOVERY
         - name: CONSUL_PARTITION
         - name: CONSUL_TLS_SERVER_NAME
         - name: PATH

diff --git a/internal/k8s/builder/testdata/tls-cert.deployment.golden.yaml b/internal/k8s/builder/testdata/tls-cert.deployment.golden.yaml
@@ -75,6 +75,7 @@ spec:
               fieldPath: status.hostIP
         - name: CONSUL_LOGIN_PARTITION
         - name: CONSUL_LOGIN_DATACENTER
+        - name: CONSUL_DYNAMIC_SERVER_DISCOVERY
         - name: CONSUL_PARTITION
         - name: CONSUL_TLS_SERVER_NAME
         - name: PATH