Revert "Revert emissary version bump (#2894)" (#2901)

This reverts commit 757bfff.

UPSTREAM_PROJECTS.yaml

@@ -85,8 +85,8 @@ projects:
     repos:
       - name: emissary
         versions:
-          - tag: v3.8.1
-            go_version: "1.20"
+          - tag: v3.9.1
+            go_version: "1.21"
   - org: envoyproxy
     repos:
       - name: envoy

projects/emissary-ingress/emissary/APPMESH_VERSION

@@ -1 +1 @@
-v1.25.4.0-prod
+v1.27.2.0-prod

projects/emissary-ingress/emissary/CHECKSUMS

@@ -1,12 +1,12 @@
-8700c261418bcb4aa0f1dcf5bbf64883c9d95216c3df6a55b12c0a65db70dd9a  _output/bin/emissary/linux-amd64/busyambassador
-81e85c3c1e5a834418a09407d23c72d54f1bb0acaf77ea00b35437618078c017  _output/bin/emissary/linux-amd64/capabilities_wrapper
-e66f34de65c2ce27dba958fe7c30ca28a0962053ec400ae16495f6afa4633735  _output/bin/emissary/linux-amd64/example-envoy-metrics-sink
-ef324e18c925e50a457a3b3d9e4dc22ae67eabce24c79d262153a5e43ba31c06  _output/bin/emissary/linux-amd64/k8sregistryctl
-fbc13d88f54af359f5b2321e403c4e11e1645330c367cabf67311a6b1ee4c017  _output/bin/emissary/linux-amd64/kat-client
-3e2bfe3988ac8a7a2d04c4ba3ace0805c6ebb4ca6977701345f0a1f02fd1647f  _output/bin/emissary/linux-amd64/kat-server
-4979a346230382919e7b5fcf376b6f21cda9f5494f0d3bc41b492eae58ee1b5d  _output/bin/emissary/linux-arm64/busyambassador
-616107fa02546b93f313425002357cef2de01bf0fc05fe618fafb883e683617f  _output/bin/emissary/linux-arm64/capabilities_wrapper
-77df42232aca97c15bb9246c61c4f27b52a742828f06b31004495fec6b160c39  _output/bin/emissary/linux-arm64/example-envoy-metrics-sink
-7bb1b0b3f47fb7caa5dbb1b32841cee479d721dcb1bd3a632f2fd458fe7d0b05  _output/bin/emissary/linux-arm64/k8sregistryctl
-4c96b9c62a01c31093acd8ea18f941efad1884f5a61dd5d9c3e503e1ea03c5fe  _output/bin/emissary/linux-arm64/kat-client
-b5d09b55294f61450d4ad7eafadd7f0b8e62663f4f4f88850b281f5803fdeaeb  _output/bin/emissary/linux-arm64/kat-server
+1e4cf4c97fea1d5eb1f08f39349d5db8369923714211cb10ec49776bea1a509a  _output/bin/emissary/linux-amd64/busyambassador
+1a3fd10fca81cedaff6a53b9c4553d2b723e46df14a225cb2b1f2980437cf336  _output/bin/emissary/linux-amd64/capabilities_wrapper
+d8c7247233e19a30a10d73ef5a22ea6a11c8460e23e970b2ecdb16dece61be00  _output/bin/emissary/linux-amd64/example-envoy-metrics-sink
+07cce236faaabe6d04b0667e68700edd730eee41ecc539a90328435d982e2bf9  _output/bin/emissary/linux-amd64/k8sregistryctl
+7f19b0fdae871fed86dc2b7f1f3c56a63c2ac7e87100ce842da9264c44f2c328  _output/bin/emissary/linux-amd64/kat-client
+259ff148639230a5661ea3d8882dafb58c9f5b44b993d8aa7b47f3f9fc0c9ffd  _output/bin/emissary/linux-amd64/kat-server
+708451a95e6d80414b9be864d808e808f651481e1d176b8c01c57682e0d594ab  _output/bin/emissary/linux-arm64/busyambassador
+6e590968719e00cb26f8ff15bb1edcaf1a663eae79a38429b2ecc2c92fe032c4  _output/bin/emissary/linux-arm64/capabilities_wrapper
+ef0147789693d977b953024195e3716612b9a109e9ee95256da380d53cdc2407  _output/bin/emissary/linux-arm64/example-envoy-metrics-sink
+e8e8dff53621d2bbfc8cee5ac4feb7be35057c32201dc5ea3ceaef880ad4209a  _output/bin/emissary/linux-arm64/k8sregistryctl
+2a54af874afee1ac0a79e67ceb819f8f7500bc39919f3be87538a54ad12d5f49  _output/bin/emissary/linux-arm64/kat-client
+5ccdaf1e150d661d5f75f5c79a5cf7f836787514d24fa1d0dba6518d70c647fa  _output/bin/emissary/linux-arm64/kat-server

projects/emissary-ingress/emissary/GIT_TAG

@@ -1 +1 @@
-v3.8.1
+v3.9.1

projects/emissary-ingress/emissary/GOLANG_VERSION

@@ -1 +1 @@
-1.20
+1.21

projects/emissary-ingress/emissary/README.md

@@ -1,5 +1,5 @@
 ## **Emissary-ingress**
-![Version](https://img.shields.io/badge/version-v3.8.1-blue)
+![Version](https://img.shields.io/badge/version-v3.9.1-blue)
 ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoid2Vla0ZUclhyN0dNN1ZLRnRoV3dBV241UDVVUUNmYUFyWVdDUWg3SUdqcThyblJvZ245cHN0cjFhUGNETDZhUkkySUNDZC9kdVFhemlpUjZGclRibUdnPSIsIml2UGFyYW1ldGVyU3BlYyI6IjRsempqaUZTNlB6TjF0bVQiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)
 
 Official website: https://www.getambassador.io/docs/

projects/emissary-ingress/emissary/patches/0001-patching_helm_charts_packages.patch

@@ -1,9 +1,8 @@
-From 2ab92eec6d5d986d0c921b3721801955a686d4a6 Mon Sep 17 00:00:00 2001
-From: Vivek Koppuru <koppv@amazon.com>
-Date: Tue, 10 Oct 2023 17:38:45 -0700
+From 2fbb944f6705aea7806fc1a689313984dd4d3231 Mon Sep 17 00:00:00 2001
+From: ahreehong <[email protected].com>
+Date: Tue, 30 Jan 2024 17:10:30 -0800
 Subject: [PATCH] patching_helm_charts_packages
 
-Signed-off-by: vivek-koppuru <[email protected]>
 ---
  Makefile                                      |   12 +-
  build-aux/prelude_go.mk                       |    2 +-
@@ -49,14 +48,14 @@ Signed-off-by: vivek-koppuru <[email protected]>
  .../emissary-ingress/templates/namespace.yaml |    2 +-
  charts/emissary-ingress/templates/pdb.yaml    |    2 +-
  .../templates/podsecuritypolicy.yaml          |    2 +-
- charts/emissary-ingress/templates/rbac.yaml   |    8 +-
+ charts/emissary-ingress/templates/rbac.yaml   |   10 +-
  .../emissary-ingress/templates/resolvers.yaml |    4 +-
  .../templates/service-canary.yaml             |    4 +-
  .../emissary-ingress/templates/service.yaml   |    4 +-
  .../templates/serviceaccount.yaml             |    2 +-
  .../templates/servicemonitor.yaml             |    4 +-
  .../{values.yaml.in => values.yaml}           |   51 +-
- 51 files changed, 5573 insertions(+), 724 deletions(-)
+ 51 files changed, 5574 insertions(+), 725 deletions(-)
  create mode 100644 charts/crds/.helmignore
  create mode 100644 charts/crds/Chart.yaml
  create mode 100644 charts/crds/README.md
@@ -85,7 +84,7 @@ Signed-off-by: vivek-koppuru <[email protected]>
  delete mode 100644 charts/emissary-ingress/ci.in/tests/manifests/tls.yaml
  delete mode 100644 charts/emissary-ingress/readme.tpl
  delete mode 100644 charts/emissary-ingress/templates/ambassador-agent.yaml
- rename charts/emissary-ingress/{values.yaml.in => values.yaml} (89%)
+ rename charts/emissary-ingress/{values.yaml.in => values.yaml} (90%)
 
 diff --git a/Makefile b/Makefile
 index 18b45ca1e..87e0153c0 100644
@@ -6547,7 +6546,7 @@ index cd6184dde..4ba1c911a 100644
      app.kubernetes.io/name: {{ include "ambassador.name" . }}
      {{- include "ambassador.labels" . | nindent 4 }}
 diff --git a/charts/emissary-ingress/templates/deployment-canary.yaml b/charts/emissary-ingress/templates/deployment-canary.yaml
-index 4c8094f14..2fa451574 100644
+index e6e8c2775..17ef7852a 100644
 --- a/charts/emissary-ingress/templates/deployment-canary.yaml
 +++ b/charts/emissary-ingress/templates/deployment-canary.yaml
 @@ -8,7 +8,7 @@ metadata:
@@ -6559,7 +6558,7 @@ index 4c8094f14..2fa451574 100644
    labels:
      app.kubernetes.io/name: {{ include "ambassador.name" . }}
      {{- include "ambassador.labels" . | nindent 4 }}
-@@ -138,7 +138,7 @@ spec:
+@@ -182,7 +182,7 @@ spec:
            {{- if ne (include "ambassador.canaryImage" .)  "" }}
            image: {{ include "ambassador.canaryImage" . }}
            {{- else }}
@@ -6569,7 +6568,7 @@ index 4c8094f14..2fa451574 100644
            imagePullPolicy: {{ .Values.image.pullPolicy }}
            ports:
 diff --git a/charts/emissary-ingress/templates/deployment.yaml b/charts/emissary-ingress/templates/deployment.yaml
-index 828da4ef3..95a4be1bb 100644
+index 2c4d17a0a..1a976a852 100644
 --- a/charts/emissary-ingress/templates/deployment.yaml
 +++ b/charts/emissary-ingress/templates/deployment.yaml
 @@ -3,7 +3,7 @@ apiVersion: v1
@@ -6590,7 +6589,7 @@ index 828da4ef3..95a4be1bb 100644
    labels:
      app.kubernetes.io/name: {{ include "ambassador.name" . }}
      {{- include "ambassador.labels" . | nindent 4 }}
-@@ -156,7 +156,7 @@ spec:
+@@ -200,7 +200,7 @@ spec:
              {{- toYaml .Values.prometheusExporter.resources | nindent 12 }}
          {{- end }}
          - name: {{ if .Values.containerNameOverride }}{{ .Values.containerNameOverride }}{{ else }}{{ .Chart.Name }}{{ end }}
@@ -6613,10 +6612,10 @@ index c15802767..633a607ce 100644
      app.kubernetes.io/name: {{ include "ambassador.name" . }}
      {{- include "ambassador.labels" . | nindent 4 }}
 diff --git a/charts/emissary-ingress/templates/hpa.yaml b/charts/emissary-ingress/templates/hpa.yaml
-index a9fdb2ce0..38a6f3f29 100644
+index 61c8f8326..035d48895 100644
 --- a/charts/emissary-ingress/templates/hpa.yaml
 +++ b/charts/emissary-ingress/templates/hpa.yaml
-@@ -3,7 +3,7 @@ apiVersion: autoscaling/v2{{- if semverCompare "<1.23" .Capabilities.KubeVersion
+@@ -3,7 +3,7 @@ apiVersion: autoscaling/v2{{- if not (.Capabilities.APIVersions.Has "autoscaling
  kind: HorizontalPodAutoscaler
  metadata:
    name: {{ include "ambassador.fullname" . }}
@@ -6648,7 +6647,7 @@ index 033051cc8..671c2444e 100644
    port: 8080
    protocol: HTTP
 diff --git a/charts/emissary-ingress/templates/module.yaml b/charts/emissary-ingress/templates/module.yaml
-index 619f9859b..8a66c6a60 100644
+index 828275861..4fc8699cc 100644
 --- a/charts/emissary-ingress/templates/module.yaml
 +++ b/charts/emissary-ingress/templates/module.yaml
 @@ -3,7 +3,7 @@ apiVersion: getambassador.io/v3alpha1
@@ -6698,7 +6697,7 @@ index 7c0a7489f..455fe9d33 100644
      app.kubernetes.io/name: {{ include "ambassador.name" . }}
      {{- include "ambassador.labels" . | nindent 4 }}
 diff --git a/charts/emissary-ingress/templates/rbac.yaml b/charts/emissary-ingress/templates/rbac.yaml
-index 306cae99b..5521b7a4b 100644
+index e36790acd..e44fd61d3 100644
 --- a/charts/emissary-ingress/templates/rbac.yaml
 +++ b/charts/emissary-ingress/templates/rbac.yaml
 @@ -35,7 +35,7 @@ roleRef:
@@ -6736,7 +6735,16 @@ index 306cae99b..5521b7a4b 100644
 +    namespace: {{ .Release.Namespace | default .Values.defaultNamespace | quote }}
      kind: ServiceAccount
  {{- end }}
-
+ {{- if and .Values.waitForApiext (eq .Values.waitForApiext.enabled true) (eq .Values.waitForApiext.createRoles true) }}
+@@ -170,7 +170,7 @@ roleRef:
+   name: {{ include "ambassador.rbacName" . }}-apiext
+ subjects:
+   - name: {{ include "ambassador.serviceAccountName" . }}
+-    namespace: {{ include "ambassador.namespace" . }}
++    namespace: {{ .Release.Namespace | default .Values.defaultNamespace | quote }}
+     kind: ServiceAccount
+ ---
+ apiVersion: rbac.authorization.k8s.io/v1
 diff --git a/charts/emissary-ingress/templates/resolvers.yaml b/charts/emissary-ingress/templates/resolvers.yaml
 index 53633ee88..7ecb2fc97 100644
 --- a/charts/emissary-ingress/templates/resolvers.yaml
@@ -6839,10 +6847,10 @@ index b2c8122a1..8f33136cf 100644
      matchLabels:
        service: ambassador-admin
 diff --git a/charts/emissary-ingress/values.yaml.in b/charts/emissary-ingress/values.yaml
-similarity index 89%
+similarity index 90%
 rename from charts/emissary-ingress/values.yaml.in
 rename to charts/emissary-ingress/values.yaml
-index 2a9bfc491..94e66a04b 100644
+index abe1dcaa2..cf5939e44 100644
 --- a/charts/emissary-ingress/values.yaml.in
 +++ b/charts/emissary-ingress/values.yaml
 @@ -2,11 +2,11 @@
@@ -6860,7 +6868,7 @@ index 2a9bfc491..94e66a04b 100644
  # If true, Create a DaemonSet. By default Deployment controller will be created
  daemonSet: false
  # If true, Create a bare Pod instead of a Deployment or DaemonSet; for
-@@ -148,11 +148,13 @@ security:
+@@ -149,11 +149,13 @@ security:
      #   runAsUser:
      #     rule: MustRunAsNonRoot
 
@@ -6878,15 +6886,15 @@ index 2a9bfc491..94e66a04b 100644
    # Pod container image pull policy
    pullPolicy: IfNotPresent
 
-@@ -357,7 +359,6 @@ resolvers: # +doc-gen:break
+@@ -369,7 +371,6 @@ resolvers: # +doc-gen:break
  module:
    diagnostics:
      enabled: false
 -    allow_non_local: true
 
  # DEPRECATED: Enabling the prometheus exporter creates a sidecar and configures ambassador to use it
  #
-@@ -393,40 +394,6 @@ prometheusExporter: # +doc-gen:break
+@@ -405,40 +406,6 @@ prometheusExporter: # +doc-gen:break
  # securityContext:
  #   runAsUser: 8888
 
@@ -6928,4 +6936,5 @@ index 2a9bfc491..94e66a04b 100644
 
  # configure docker to pull from private registry
 -- 
-2.39.3 (Apple Git-145)
+2.40.0
+