Skip to content

Commit

Permalink
Prepare for the GA release
Browse files Browse the repository at this point in the history 
 - Remove -rc.N from version numbers
 - Fill in the release date
 - Touch up the chart changelog
 - Fix mypy

Signed-off-by: Luke Shumaker <[email protected]>
  • Loading branch information
@LukeShu
LukeShu committed Dec 16, 2021
1 parent 2adb804 commit a3637a8
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/emissary-ingress/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions charts/emissary-ingress/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion charts/emissary-ingress/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand Down
2 changes: 1 addition & 1 deletion charts/emissary-ingress/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/releaseNotes.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion manifests/emissary/emissary-crds.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions manifests/emissary/emissary-defaultns.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions manifests/emissary/emissary-emissaryns.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion python/ambassador/resource.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down

0 comments on commit a3637a8

Please sign in to comment.