From a3637a83ff04fd80a401d90300468815e3963eeb Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 16 Dec 2021 08:45:13 -0700 Subject: [PATCH] Prepare for the GA release - Remove -rc.N from version numbers - Fill in the release date - Touch up the chart changelog - Fix mypy Signed-off-by: Luke Shumaker --- CHANGELOG.md | 2 +- charts/emissary-ingress/CHANGELOG.md | 3 ++- charts/emissary-ingress/Chart.yaml | 4 ++-- charts/emissary-ingress/README.md | 2 +- charts/emissary-ingress/values.yaml | 2 +- docs/releaseNotes.yml | 2 +- manifests/emissary/emissary-crds.yaml | 2 +- manifests/emissary/emissary-defaultns.yaml | 4 ++-- manifests/emissary/emissary-emissaryns.yaml | 4 ++-- python/ambassador/resource.py | 3 ++- 10 files changed, 15 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 089860da22..29f76e1d41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -80,7 +80,7 @@ Please see the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest ## RELEASE NOTES -## [2.1.0] TBD +## [2.1.0] December 16, 2021 [2.1.0]: https://github.com/emissary-ingress/emissary/compare/v2.0.5...v2.1.0 ### Emissary-ingress and Ambassador Edge Stack diff --git a/charts/emissary-ingress/CHANGELOG.md b/charts/emissary-ingress/CHANGELOG.md index 2f76f873a3..f915702e47 100644 --- a/charts/emissary-ingress/CHANGELOG.md +++ b/charts/emissary-ingress/CHANGELOG.md @@ -9,7 +9,8 @@ numbering uses [semantic versioning](http://semver.org). ## v7.2.0 -- Update Ambassador chart image to version v2.1.0-rc.1: [CHANGELOG](https://github.com/emissary-ingress/emissary/blob/master/CHANGELOG.md) +- Update Emissary chart image to version v2.1.0: [CHANGELOG](https://github.com/emissary-ingress/emissary/blob/master/CHANGELOG.md) +- Change: It is now *always* nescessary to manually apply `emissary-crds.yaml` before applying the chart. - Bugfix: When setting `adminService.snapshotPort`, it now points at the correct port on the Pod. ## v7.1.10 diff --git a/charts/emissary-ingress/Chart.yaml b/charts/emissary-ingress/Chart.yaml index 4a2f8e42bf..2064b24e92 100644 --- a/charts/emissary-ingress/Chart.yaml +++ b/charts/emissary-ingress/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: 2.1.0-rc.2 +appVersion: 2.1.0 description: A Helm chart for Emissary Ingress name: emissary-ingress -version: 7.2.0-rc.2 +version: 7.2.0 icon: https://www.getambassador.io/images/logo.png home: https://www.getambassador.io/ sources: diff --git a/charts/emissary-ingress/README.md b/charts/emissary-ingress/README.md index d2522ccf92..5c13d58e39 100644 --- a/charts/emissary-ingress/README.md +++ b/charts/emissary-ingress/README.md @@ -94,7 +94,7 @@ The following table lists the configurable parameters of the `emissary-ingress` | security.containerSecurityContext | Security Context for the Ambassador container specifically https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.18/#securitycontext-v1-core | `{"allowPrivilegeEscalation":false}` | | security.podSecurityPolicy | A basic PodSecurityPolicy to ensure Ambassador is running with appropriate security permissions https://kubernetes.io/docs/concepts/policy/pod-security-policy/ A set of reasonable defaults is outlined below. This is not created by default as it should only be created by a one Release. If you want to use the PodSecurityPolicy in the chart, create it in the "master" Release and then leave it unset in all others. Set the `rbac.podSecurityPolicies` in all non-"master" Releases. | `{}` | | image.repository | Emissary Ingress docker repo | `docker.io/emissaryingress/emissary` | -| image.tag | Emissary Ingress docker tag | `2.1.0-rc.2` | +| image.tag | Emissary Ingress docker tag | `2.1.0` | | image.pullPolicy | Pod container image pull policy | `IfNotPresent` | | dnsPolicy | Dns policy, when hostNetwork set to ClusterFirstWithHostNet | `ClusterFirst` | | hostNetwork | If true, uses the host network, useful for on-premise setups | `false` | diff --git a/charts/emissary-ingress/values.yaml b/charts/emissary-ingress/values.yaml index 9df7be98d5..865fcd0b1a 100644 --- a/charts/emissary-ingress/values.yaml +++ b/charts/emissary-ingress/values.yaml @@ -139,7 +139,7 @@ image: # Emissary Ingress docker repo repository: docker.io/emissaryingress/emissary # Emissary Ingress docker tag - tag: 2.1.0-rc.2 + tag: 2.1.0 # Pod container image pull policy pullPolicy: IfNotPresent diff --git a/docs/releaseNotes.yml b/docs/releaseNotes.yml index 7a41327d6a..ce36feac61 100644 --- a/docs/releaseNotes.yml +++ b/docs/releaseNotes.yml @@ -32,7 +32,7 @@ changelog: https://github.com/emissary-ingress/emissary/blob/$branch$/CHANGELOG.md items: - version: 2.1.0 - date: 'TBD' + date: '2021-12-16' notes: - title: CRD conversions type: feature diff --git a/manifests/emissary/emissary-crds.yaml b/manifests/emissary/emissary-crds.yaml index 5884090a8f..06f2c04f5d 100644 --- a/manifests/emissary/emissary-crds.yaml +++ b/manifests/emissary/emissary-crds.yaml @@ -3273,7 +3273,7 @@ spec: serviceAccountName: emissary-apiext containers: - name: emissary-apiext - image: docker.io/emissaryingress/emissary:2.1.0-rc.2 + image: docker.io/emissaryingress/emissary:2.1.0 imagePullPolicy: IfNotPresent command: [ "apiext", "emissary-apiext" ] ports: diff --git a/manifests/emissary/emissary-defaultns.yaml b/manifests/emissary/emissary-defaultns.yaml index b30307e58f..6541a72558 100644 --- a/manifests/emissary/emissary-defaultns.yaml +++ b/manifests/emissary/emissary-defaultns.yaml @@ -267,7 +267,7 @@ spec: path: labels containers: - name: ambassador - image: docker.io/emissaryingress/emissary:2.1.0-rc.2 + image: docker.io/emissaryingress/emissary:2.1.0 imagePullPolicy: IfNotPresent ports: - name: http @@ -558,7 +558,7 @@ spec: serviceAccountName: emissary-ingress-agent containers: - name: agent - image: docker.io/emissaryingress/emissary:2.1.0-rc.2 + image: docker.io/emissaryingress/emissary:2.1.0 imagePullPolicy: IfNotPresent command: [agent] env: diff --git a/manifests/emissary/emissary-emissaryns.yaml b/manifests/emissary/emissary-emissaryns.yaml index 9f248ca974..a47f89c0fe 100644 --- a/manifests/emissary/emissary-emissaryns.yaml +++ b/manifests/emissary/emissary-emissaryns.yaml @@ -267,7 +267,7 @@ spec: path: labels containers: - name: ambassador - image: docker.io/emissaryingress/emissary:2.1.0-rc.2 + image: docker.io/emissaryingress/emissary:2.1.0 imagePullPolicy: IfNotPresent ports: - name: http @@ -558,7 +558,7 @@ spec: serviceAccountName: emissary-ingress-agent containers: - name: agent - image: docker.io/emissaryingress/emissary:2.1.0-rc.2 + image: docker.io/emissaryingress/emissary:2.1.0 imagePullPolicy: IfNotPresent command: [agent] env: diff --git a/python/ambassador/resource.py b/python/ambassador/resource.py index 01e3b1c483..1e2a7b4a1d 100644 --- a/python/ambassador/resource.py +++ b/python/ambassador/resource.py @@ -181,10 +181,11 @@ def from_dict(cls: Type[R], rkey: str, location: str, serialization: Optional[st # the correct type. ambassador = sys.modules['ambassador'] - resource_class: Type[R] = getattr(ambassador, attrs['kind'], None) + resource_class: Optional[Type[R]] = getattr(ambassador, attrs['kind'], None) if not resource_class: resource_class = getattr(ambassador, 'AC' + attrs[ 'kind' ], cls) + assert resource_class # print("%s.from_dict: %s => %s" % (cls, attrs['kind'], resource_class))