[2.0.1-ea] Changelog update (#14)

* put emissary changes in changelog

* Changelog updates for 2.0.1-ea

* dont apply test-ready pod

* create resources migration and oss-migration

* changelog updates

* commit change

* FORCE yaml

* update edge stack things

* Changelog, manifest and chart updates for 2.0.1-ea

* fix the chart readme

Author: Alix Cook

CHANGELOG.md

@@ -66,15 +66,34 @@ Please see the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest
 
 ## RELEASE NOTES
 
-## [2.0.1-ea] (TBD)
+## Next Release
+
+(no changes yet)
+
+## [2.0.1-ea] August 12, 2021
+[2.0.1-ea]: https://github.com/datawire/edge-stack/compare/v2.0.0-ea...v2.0.1-ea
+
+### Ambassador Edge Stack
 
 We're pleased to introduce Edge Stack 2.0.1 as a developer preview. The 2.X family introduces a number of changes to allow Edge Stack to more gracefully handle larger installations, reduce global configuration to better handle multitenant or multiorganizational installations, reduce memory footprint, and improve performance. We welcome feedback!! Join us on <a href="https://a8r.io/slack">Slack</a> and let us know what you think.
 
 ### Ambassador Edge Stack
 
-- Bugfix: The `AmbassadorMapping` resource can now specify `docs.timeout_ms` to set the timeout when the 
+- Feature: Ambassador Agent reports sidecar process information and Mapping OpenAPI documentation to Ambassador Cloud to provide more visibility into services and clusters.
+- Feature: The optional `stats_prefix` element of the `AmbassadorListener` CRD now determines the prefix of HTTP statistics emitted for a specific `AmbassadorListener`.
+- Feature: The optional `stats_name` element of `AmbassadorMapping`, `AmbassadorTCPMapping`, `AuthService`, `LogService`, `RateLimitService`, and `TracingService` now sets the name under which cluster statistics will be logged. The default is the `service`, with non-alphanumeric characters replaced by underscores.
+- Bugfix: The `AmbassadorMapping` resource can now specify `docs.timeout_ms` to set the timeout when the
   Dev Portal is fetching API specifications.
 - Bugfix: The Dev Portal will now strip HTML tags when displaying search results, showing just
+- Bugfix: Ambassador Edge Stack has updated to `k8s.io/klog/v2` to track upstream and to quiet unnecessary log output.
+- Change: Logs now include subsecond time resolutions, rather than just seconds.
+- Change: Envoy-configuration snapshots get saved (as `ambex-#.json`) in `/ambassador/snapshots`.
+  The number of snapshots is controlled by the `AMBASSADOR_AMBEX_SNAPSHOT_COUNT` environment
+  variable; set it to 0 to disable. The default is 30.
+- Change: Set `AMBASSADOR_AMBEX_NO_RATELIMIT` to `true` to completely disable ratelimiting Envoy
+  reconfiguration under memory pressure. This can help performance with the endpoint or Consul
+  resolvers, but could make OOMkills more likely with large configurations. The default is `false`,
+  meaning that the rate limiter is active.
   the actual content of the search result.
 - Change: Consul certificate-rotation logging now includes the fingerprints and validity
   timestamps of certificates being rotated.

Makefile

@@ -5,8 +5,20 @@ HELM_OUTPUT_DIR := $(EDGE_STACK_HOME)/build/helm/
 
 update-yaml/files += $(EDGE_STACK_HOME)/manifests/edge-stack/aes.yaml
 update-yaml/files += $(EDGE_STACK_HOME)/manifests/edge-stack/aes-crds.yaml
+update-yaml/files += $(EDGE_STACK_HOME)/manifests/edge-stack/oss-migration.yaml
+update-yaml/files += $(EDGE_STACK_HOME)/manifests/edge-stack/resources-migration.yaml
 
-$(EDGE_STACK_HOME)/manifests/edge-stack/aes.yaml: $(wildcard $(EDGE_STACK_HOME)/charts/edge-stack/templates/*.yaml) $(wildcard $(EDGE_STACK_HOME)/charts/edge-stack/charts/*.tgz) $(EDGE_STACK_HOME)/charts/edge-stack/values.yaml $(EDGE_STACK_HOME)/k8s-config/aes/values.yaml
+create-venv:
+	[[ -d $(EDGE_STACK_HOME)/venv ]] || python3 -m venv $(EDGE_STACK_HOME)/venv
+.PHONY: create-venv
+
+python-setup: create-venv
+	$(EDGE_STACK_HOME)/venv/bin/python -m pip install ruamel.yaml
+.PHONY: python-setup
+
+FORCE:
+
+$(EDGE_STACK_HOME)/manifests/edge-stack/aes.yaml: $(wildcard $(EDGE_STACK_HOME)/charts/edge-stack/templates/*.yaml) $(wildcard $(EDGE_STACK_HOME)/charts/edge-stack/charts/*.tgz) $(EDGE_STACK_HOME)/charts/edge-stack/values.yaml $(EDGE_STACK_HOME)/k8s-config/aes/values.yaml FORCE
 	mkdir -p  $(@D)
 	helm template edge-stack -n ambassador -f $(EDGE_STACK_HOME)/k8s-config/aes/values.yaml $(EDGE_STACK_HOME)/charts/edge-stack/ > $@
 
@@ -16,13 +28,31 @@ template-helm:
 	helm template edge-stack --output-dir $(HELM_OUTPUT_DIR) --include-crds -n ambassador $(EDGE_STACK_HOME)/charts/edge-stack
 .PHONY: template-helm
 
-$(EDGE_STACK_HOME)/manifests/edge-stack/aes-crds.yaml: $(wildcard $(EDGE_STACK_HOME)/charts/edge-stack/templates/*.yaml) $(wildcard $(EDGE_STACK_HOME)/charts/edge-stack/charts/*.tgz) template-helm
+$(EDGE_STACK_HOME)/manifests/edge-stack/aes-crds.yaml: $(wildcard $(EDGE_STACK_HOME)/charts/edge-stack/templates/*.yaml) $(wildcard $(EDGE_STACK_HOME)/charts/edge-stack/charts/*.tgz) template-helm FORCE
 	cat $(sort $(wildcard $(HELM_OUTPUT_DIR)/edge-stack/charts/emissary-ingress/crds/*.yaml)) > $@
 	cat $(sort $(wildcard $(HELM_OUTPUT_DIR)/edge-stack/crds/*.yaml)) >> $@
 	rm -rf $(HELM_OUTPUT_DIR)
 
+define generate_yaml_from_helm
+	mkdir -p `dirname $(3)` && \
+	mkdir -p $(EDGE_STACK_HOME)/build/yaml/$(1) && \
+		helm template edge-stack -n $(2) \
+		-f $(EDGE_STACK_HOME)/k8s-config/$(1)/values.yaml \
+		$(EDGE_STACK_HOME)/charts/edge-stack > $(EDGE_STACK_HOME)/build/yaml/$(1)/helm-expanded.yaml
+	$(EDGE_STACK_HOME)/venv/bin/python $(EDGE_STACK_HOME)/k8s-config/create_yaml.py \
+		$(EDGE_STACK_HOME)/build/yaml/$(1)/helm-expanded.yaml $(EDGE_STACK_HOME)/k8s-config/$(1)/require.yaml > $(3)
+endef
+
+$(EDGE_STACK_HOME)/manifests/edge-stack/oss-migration.yaml: $(EDGE_STACK_HOME)/k8s-config/create_yaml.py $(EDGE_STACK_HOME)/k8s-config/oss-migration/require.yaml $(EDGE_STACK_HOME)/k8s-config/oss-migration/values.yaml $(EDGE_STACK_HOME)/charts/edge-stack/templates/*.yaml $(EDGE_STACK_HOME)/charts/edge-stack/values.yaml python-setup FORCE
+	@printf '  $(CYN)$@$(END)\n'
+	$(call generate_yaml_from_helm,oss-migration,default,$@)
+
+$(EDGE_STACK_HOME)/manifests/edge-stack/resources-migration.yaml: $(EDGE_STACK_HOME)/k8s-config/create_yaml.py $(EDGE_STACK_HOME)/k8s-config/resources-migration/require.yaml $(EDGE_STACK_HOME)/k8s-config/resources-migration/values.yaml $(EDGE_STACK_HOME)/charts/edge-stack/templates/*.yaml $(EDGE_STACK_HOME)/charts/edge-stack/values.yaml python-setup FORCE
+	@printf '  $(CYN)$@$(END)\n'
+	$(call generate_yaml_from_helm,resources-migration,default,$@)
+
 update-yaml:
-	@echo '$(MAKE) $$(update-yaml/files)'; $(MAKE) $(update-yaml/files)
+	@echo '$(MAKE) $$(update-yaml/files)'; $(MAKE) $(update-yaml/files) --always-make
 .PHONY: update-yaml
 
 push-manifests:

charts/edge-stack/CHANGELOG.md

@@ -7,6 +7,10 @@ numbering uses [semantic versioning](http://semver.org).
 
 (no changes yet)
 
+## v7.1.1-ea
+
+- Update Edge Stack chart image to version v2.0.1-ea: [CHANGELOG](https://github.com/emissary-ingress/emissary/blob/master/CHANGELOG.md)
+
 ## v7.1.0-ea
 
 - Feature: New canarying features for Ambassador in the chart that allow creation of a secondary deployment/service to test new versions and environment variables.

charts/edge-stack/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 2.0.0-ea
+appVersion: 2.0.1-ea
 description: A Helm chart for Ambassador Edge Stack
 name: edge-stack
-version: 7.1.0-ea
+version: 7.1.1-ea
 # TODO: change these to whatever the appropriate things are
 icon: https://www.getambassador.io/images/logo.png
 home: https://www.getambassador.io/