Skip to content

Commit

Permalink
[release-1.20 branch] fix envoy deployment release (#4308)
Browse files Browse the repository at this point in the history
* hack/release: add Envoy deployment files to make-release-tag.sh

Signed-off-by: Steve Kriss <krisss@vmware.com>

* examples: bump Envoy version in Envoy deployment manifest

Signed-off-by: Steve Kriss <krisss@vmware.com>
  • Loading branch information
skriss committed Jan 28, 2022
1 parent d33705a commit 417410a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion examples/deployment/03-envoy-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ spec:
- --log-level info
command:
- envoy
image: docker.io/envoyproxy/envoy:v1.19.1
image: docker.io/envoyproxy/envoy:v1.21.0
imagePullPolicy: IfNotPresent
name: envoy
env:
Expand Down
2 changes: 1 addition & 1 deletion examples/render/contour-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5218,7 +5218,7 @@ spec:
- --log-level info
command:
- envoy
image: docker.io/envoyproxy/envoy:v1.19.1
image: docker.io/envoyproxy/envoy:v1.21.0
imagePullPolicy: IfNotPresent
name: envoy
env:
Expand Down
6 changes: 4 additions & 2 deletions hack/release/make-release-tag.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ run::sed() {
}

# Update the image tags in the Contour, Envoy and certgen manifests to the new version.
for example in examples/contour/03-envoy.yaml examples/contour/03-contour.yaml examples/contour/02-job-certgen.yaml ; do
for example in examples/contour/03-envoy.yaml examples/deployment/03-envoy-deployment.yaml examples/contour/03-contour.yaml examples/contour/02-job-certgen.yaml ; do
# The version might be main or OLDVERS depending on whether we are
# tagging from the release branch or from main.
run::sed \
Expand Down Expand Up @@ -70,8 +70,10 @@ if git status -s examples/contour 2>&1 | grep -E -q '^\s+[MADRCU]'; then
examples/contour/03-contour.yaml \
examples/contour/03-envoy.yaml \
examples/contour/02-job-certgen.yaml \
examples/deployment/03-envoy-deployment.yaml \
examples/render/contour.yaml \
examples/render/contour-gateway.yaml
examples/render/contour-gateway.yaml \
examples/render/contour-deployment.yaml
fi

git tag -F - "$NEWVERS" <<EOF
Expand Down

0 comments on commit 417410a

Please sign in to comment.