Merge 1.14 changes that need to be in 2.0

CHANGELOG.md

@@ -95,6 +95,15 @@ feedback!! Join us on <a href="https://a8r.io/slack">Slack</a> and let us know w
   for ease of migration. _Note that `getambassador.io/v3alpha1` is the only supported API version
   for 2.0.4_ &mdash; full support for `getambassador.io/v2` will arrive soon in a later 2.X version.
 
+- Feature: You can now set `dns_type` between `strict_dns` and `logical_dns` in a `Mapping` to configure the
+  Service Discovery Type.
+
+- Feature: You can now set `respect_dns_ttl` to `true` to force the DNS refresh rate for a `Mapping` to be
+  set to the record's TTL obtained from DNS resolution.
+
+- Feature: You can now set `buffer_limit_bytes` in the `ambassador` `Module` to to change the size of the
+  upstream read and write buffers. The default is 1MiB.
+
 - Bugfix: The release now shows its actual released version number, rather than the internal development
   version number. ([#3854])
 
@@ -269,7 +278,7 @@ installations, reduce memory footprint, and improve performance. We welcome feed
   Service Discovery Type.
 
 - Feature: You can now set `buffer_limit_bytes` in the `ambassador` `Module` to to change the size of the
-  upstream read and write buffers. The default is 1MiB. 
+  upstream read and write buffers. The default is 1MiB.
 
 ## [1.14.1] 2021-08-24
 [1.14.1]: https://github.com/emissary-ingress/emissary/releases/v1.14.1

builder/Dockerfile

@@ -66,7 +66,7 @@ ENTRYPOINT [ "/bin/bash" ]
 
 FROM ${builderbase} as golang
 
-ARG version="i-forgot-to-set-version"
+ARG version="i-forgot-to-set-build-arg-version"
 
 WORKDIR /go
 

charts/charts.mk

@@ -36,7 +36,10 @@ release/promote-chart-passed:
 .PHONY: release/promote-chart-passed
 
 chart-push-ci: push-preflight
-	@([ $(IS_PRIVATE) ] && (echo "Private repo, not pushing chart" && exit 1)) || true
+	if [ ! -z $(IS_PRIVATE) ]; then \
+		echo "Private repo, not pushing chart" ;\
+		exit 1 ;\
+	fi;
 	@echo ">>> This will dirty your local tree and should only be run in CI"
 	@echo ">>> If running locally, you'll probably want to run make chart-clean after running this"
 	@[ -n "${CHART_VERSION_SUFFIX}" ] || (echo "CHART_VERSION_SUFFIX must be set for non-GA pushes" && exit 1)

charts/emissary-ingress/CHANGELOG.md

@@ -34,6 +34,33 @@ Emissary Ingress chart v7.0.0-ea provides early access to Emissary 2.0 features.
 - Change: removed helm 2 support
 - Feature: Add an option to create default HTTP and HTTPS listeners
 
+## v6.9.1
+
+- Update Ambassador API Gateway chart image to version v1.14.1: [CHANGELOG](https://github.com/emissary-ingress/emissary/blob/master/CHANGELOG.md)
+- Update Ambassador Edge Stack chart image to version v1.14.1: [CHANGELOG](https://github.com/emissary-ingress/emissary/blob/master/CHANGELOG.md)
+
+## v6.9.0
+
+- Update Ambassador Edge Stack chart image to version v1.14.0: [CHANGELOG](https://github.com/emissary-ingress/emissary/blob/master/CHANGELOG.md)
+
+## v6.8.0
+
+- Update Ambassador API Gateway chart image to version v1.14.0: [CHANGELOG](https://github.com/emissary-ingress/emissary/blob/master/CHANGELOG.md)
+
+## v6.7.14
+
+- Feature: New Values to expose `progressDeadlineSeconds` for the Ambassador and Ambassador-agent Deployments.
+
+## v6.7.13
+
+- Update Ambassador API Gateway chart image to version v1.13.10: [CHANGELOG](https://github.com/emissary-ingress/emissary/blob/master/CHANGELOG.md)
+- Update Ambassador Edge Stack chart image to version v1.13.10: [CHANGELOG](https://github.com/emissary-ingress/emissary/blob/master/CHANGELOG.md)
+
+## v6.7.12
+
+- Update Ambassador API Gateway chart image to version v1.13.9: [CHANGELOG](https://github.com/emissary-ingress/emissary/blob/master/CHANGELOG.md)
+- Update Ambassador Edge Stack chart image to version v1.13.9: [CHANGELOG](https://github.com/emissary-ingress/emissary/blob/master/CHANGELOG.md)
+
 ## v6.7.11
 
 - Update Ambassador API Gateway chart image to version v1.13.8: [CHANGELOG](https://github.com/emissary-ingress/emissary/blob/master/CHANGELOG.md)

charts/emissary-ingress/crds/getambassador.io_devportals.yaml

@@ -61,6 +61,9 @@ spec:
                   service:
                     description: Service is the service being documented
                     type: string
+                  timeout_ms:
+                    description: Timeout specifies the amount of time devportal will wait for the downstream service to report an openapi spec back
+                    type: integer
                   url:
                     description: URL is the URL used for obtaining docs
                     type: string

charts/emissary-ingress/crds/getambassador.io_mappings.yaml

@@ -152,6 +152,8 @@ spec:
                   type: boolean
                 path:
                   type: string
+                timeout_ms:
+                  type: integer
                 url:
                   type: string
               type: object
@@ -356,6 +358,8 @@ spec:
               type: array
             resolver:
               type: string
+            respect_dns_ttl:
+              type: boolean
             retry_policy:
               properties:
                 num_retries:

cmd/ambex/main.go

@@ -70,8 +70,9 @@ import (
 	ecp_v2_server "github.com/datawire/ambassador/v2/pkg/envoy-control-plane/server/v2"
 	ecp_v3_server "github.com/datawire/ambassador/v2/pkg/envoy-control-plane/server/v3"
 
-	// envoy protobuf v2 -- Be sure to import the package of any types that the Python emits a
-	// "@type" of in the generated config, even if that package is otherwise not used by ambex.
+	// Envoy API v2
+	// Be sure to import the package of any types that're referenced with "@type" in our
+	// generated Envoy config, even if that package is otherwise not used by ambex.
 	v2 "github.com/datawire/ambassador/v2/pkg/api/envoy/api/v2"
 	_ "github.com/datawire/ambassador/v2/pkg/api/envoy/api/v2/auth"
 	v2core "github.com/datawire/ambassador/v2/pkg/api/envoy/api/v2/core"

cmd/entrypoint/testutil_fake_mapping_cors_test.go

@@ -0,0 +1,129 @@
+package entrypoint_test
+
+import (
+	"testing"
+
+	"github.com/datawire/ambassador/v2/cmd/entrypoint"
+	bootstrap "github.com/datawire/ambassador/v2/pkg/api/envoy/config/bootstrap/v3"
+	v3listener "github.com/datawire/ambassador/v2/pkg/api/envoy/config/listener/v3"
+	route "github.com/datawire/ambassador/v2/pkg/api/envoy/config/route/v3"
+	http "github.com/datawire/ambassador/v2/pkg/api/envoy/extensions/filters/network/http_connection_manager/v3"
+	"github.com/datawire/ambassador/v2/pkg/envoy-control-plane/resource/v3"
+	"github.com/datawire/ambassador/v2/pkg/envoy-control-plane/wellknown"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMappingCORSOriginsSlice(t *testing.T) {
+	f := entrypoint.RunFake(t, entrypoint.FakeConfig{EnvoyConfig: true}, nil)
+	err := f.UpsertYAML(`
+---
+apiVersion: getambassador.io/v3alpha1
+kind: Listener
+metadata:
+  name: ambassador-listener-8080
+  namespace: default
+spec:
+  port: 8080
+  protocol: HTTP
+  securityModel: XFP
+  hostBinding:
+    namespace:
+      from: ALL
+---
+apiVersion: getambassador.io/v3alpha1
+kind: Host
+metadata:
+  name: test-host
+  namespace: default
+spec:
+  selector:
+    matchLabels:
+      host: minimal
+---
+apiVersion: getambassador.io/v3alpha1
+kind: Mapping
+metadata:
+  name: foo
+  namespace: default
+  labels:
+    host: minimal
+spec:
+  prefix: /foo
+  service: foo.default
+  cors:
+    origins:
+     - foo.example.com
+     - bar.example.com
+`)
+	assert.NoError(t, err)
+
+	err = f.Upsert(makeService("default", "foo"))
+	assert.NoError(t, err)
+
+	f.Flush()
+	snap, err := f.GetSnapshot(HasMapping("default", "foo"))
+	assert.NoError(t, err)
+	assert.NotNil(t, snap)
+
+	config, err := f.GetEnvoyConfig(func(config *bootstrap.Bootstrap) bool {
+		return FindCluster(config, ClusterNameContains("cluster_foo_default_default")) != nil
+	})
+
+	assert.NoError(t, err)
+
+	listener := findListener(config, func(l *v3listener.Listener) bool {
+		return l.Name == "ambassador-listener-8080"
+	})
+
+	assert.NotNil(t, listener)
+
+	routeAction := findVirtualHostRoute(listener, func(r *route.RouteAction) bool {
+		return r.GetCluster() == "cluster_foo_default_default"
+	})
+	assert.NotNil(t, routeAction)
+	assert.NotNil(t, routeAction.Cors)
+	assert.Equal(t, len(routeAction.Cors.AllowOriginStringMatch), 2)
+	for _, m := range routeAction.Cors.AllowOriginStringMatch {
+		assert.Contains(t, []string{"bar.example.com", "foo.example.com"}, m.GetExact())
+
+	}
+}
+
+func findVirtualHostRoute(listener *v3listener.Listener, predicate func(*route.RouteAction) bool) *route.RouteAction {
+	for _, fc := range listener.FilterChains {
+		for _, filter := range fc.Filters {
+			if filter.Name != wellknown.HTTPConnectionManager {
+				continue
+			}
+			hcm := resource.GetHTTPConnectionManager(filter)
+			if hcm != nil {
+				rs, ok := hcm.RouteSpecifier.(*http.HttpConnectionManager_RouteConfig)
+				if ok {
+					for _, vh := range rs.RouteConfig.VirtualHosts {
+						for _, vhr := range vh.Routes {
+							routeAction, ok := vhr.Action.(*route.Route_Route)
+							if ok {
+								if predicate(routeAction.Route) {
+									return routeAction.Route
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+	}
+	return nil
+
+}
+
+func findListener(envoyConfig *bootstrap.Bootstrap, predicate func(*v3listener.Listener) bool) *v3listener.Listener {
+	for _, listener := range envoyConfig.StaticResources.Listeners {
+		if predicate(listener) {
+			return listener
+		}
+	}
+	return nil
+}

cmd/example-envoy-metrics-sink/main.go

@@ -0,0 +1,55 @@
+package main
+
+import (
+	"context"
+	"io"
+	"os"
+
+	"github.com/datawire/dlib/dhttp"
+	"github.com/datawire/dlib/dlog"
+	"google.golang.org/grpc"
+	"google.golang.org/protobuf/encoding/protojson"
+
+	v2_metrics "github.com/datawire/ambassador/v2/pkg/api/envoy/service/metrics/v2"
+)
+
+type server struct{}
+
+var _ v2_metrics.MetricsServiceServer = &server{}
+
+func main() {
+	ctx := context.Background()
+
+	grpcMux := grpc.NewServer()
+	v2_metrics.RegisterMetricsServiceServer(grpcMux, &server{})
+
+	sc := &dhttp.ServerConfig{
+		Handler: grpcMux,
+	}
+
+	dlog.Print(ctx, "starting...")
+
+	if err := sc.ListenAndServe(ctx, ":8123"); err != nil {
+		dlog.Errorf(ctx, "shut down with error: %v", err)
+		os.Exit(1)
+	}
+
+	dlog.Print(ctx, "shut down without error")
+}
+
+func (s *server) StreamMetrics(stream v2_metrics.MetricsService_StreamMetricsServer) error {
+	dlog.Println(stream.Context(), "Started stream")
+	for {
+		in, err := stream.Recv()
+
+		if err == io.EOF {
+			return nil
+		}
+
+		if err != nil {
+			return err
+		}
+
+		dlog.Println(stream.Context(), protojson.Format(in))
+	}
+}

docs/releaseNotes.yml

@@ -55,6 +55,30 @@ items:
           <code>getambassador.io/v2</code> will arrive soon in a later 2.X version.
         docs: about/changes-2.0.0
 
+      - title: Mappings support configuring strict or logical DNS
+        type: feature
+        body: >-
+          You can now set <code>dns_type</code> between <code>strict_dns</code> and
+          <code>logical_dns</code> in a <code>Mapping</code> to configure the Service
+          Discovery Type.
+        docs: topics/using/mappings/#dns-configuration-for-mappings
+
+      - title: Mappings support controlling DNS refresh with DNS TTL
+        type: feature
+        body: >-
+          You can now set <code>respect_dns_ttl</code> to <code>true</code> to force the
+          DNS refresh rate for a <code>Mapping</code> to be set to the record's TTL
+          obtained from DNS resolution.
+        docs: topics/using/mappings/#dns-configuration-for-mappings
+
+      - title: Support configuring upstream buffer sizes
+        type: feature
+        body: >-
+          You can now set <code>buffer_limit_bytes</code> in the <code>ambassador</code>
+          <code>Module</code> to to change the size of the upstream read and write buffers.
+          The default is 1MiB.
+        docs: topics/running/ambassador/#modify-default-buffer-size
+
       - title: Version number reported correctly
         type: bugfix
         body: >-
@@ -303,7 +327,7 @@ items:
         body: >-
           You can now set <code>buffer_limit_bytes</code> in the <code>ambassador</code>
           <code>Module</code> to to change the size of the upstream read and write buffers.
-          The default is 1MiB. 
+          The default is 1MiB.
         docs: topics/running/ambassador/#modify-default-buffer-size
 
   - version: 1.14.1

docs/yaml.mk

@@ -9,7 +9,10 @@ generate-docs-yaml:
 .PHONY: generate-docs-yaml
 
 publish-docs-yaml: generate-docs-yaml
-	@([ "$(IS_PRIVATE)" ] && (echo "Private repo, not pushing manifests" && exit 1)) || true
+	if [ ! -z $(IS_PRIVATE) ]; then \
+		echo "Private repo, not pushing chart" ;\
+		exit 1 ;\
+	fi;
 	@$(OSS_HOME)/docs/publish_yaml_s3.sh $(GENERATED_YAML_DIR)yaml/ $(generate-docs-yaml/files)
 	@rm -rf $(GENERATED_YAML_DIR)
 .PHONY: publish-docs-yaml

docs/yaml/ambassador/ambassador-rbac-prometheus.yaml

@@ -285,6 +285,9 @@ spec:
                   service:
                     description: Service is the service being documented
                     type: string
+                  timeout_ms:
+                    description: Timeout specifies the amount of time devportal will wait for the downstream service to report an openapi spec back
+                    type: integer
                   url:
                     description: URL is the URL used for obtaining docs
                     type: string
@@ -1085,6 +1088,8 @@ spec:
                   type: boolean
                 path:
                   type: string
+                timeout_ms:
+                  type: integer
                 url:
                   type: string
               type: object
@@ -1289,6 +1294,8 @@ spec:
               type: array
             resolver:
               type: string
+            respect_dns_ttl:
+              type: boolean
             retry_policy:
               properties:
                 num_retries: