From 79e566ea9b36f92a78a2943669e318b03e50ec8e Mon Sep 17 00:00:00 2001 From: Vivek Koppuru Date: Fri, 6 Oct 2023 19:35:32 -0700 Subject: [PATCH] Update emissary from 3.6.0 to 3.8.1 --- UPSTREAM_PROJECTS.yaml | 4 ++-- projects/emissary-ingress/emissary/CHECKSUMS | 24 +++++++++---------- projects/emissary-ingress/emissary/GIT_TAG | 2 +- .../emissary-ingress/emissary/GOLANG_VERSION | 2 +- .../0001-patching_helm_charts_packages.patch | 24 +++++++++---------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml index 72a67599b1..afc2cb3f88 100644 --- a/UPSTREAM_PROJECTS.yaml +++ b/UPSTREAM_PROJECTS.yaml @@ -85,8 +85,8 @@ projects: repos: - name: emissary versions: - - tag: v3.6.0 - go_version: "1.17" + - tag: v3.8.1 + go_version: "1.20" - org: envoyproxy repos: - name: envoy diff --git a/projects/emissary-ingress/emissary/CHECKSUMS b/projects/emissary-ingress/emissary/CHECKSUMS index 895293c9ac..81ae2eea4d 100644 --- a/projects/emissary-ingress/emissary/CHECKSUMS +++ b/projects/emissary-ingress/emissary/CHECKSUMS @@ -1,12 +1,12 @@ -3de3bc52be09333c597762146a57f36f8a225bd7cab62f5a0f9fd550adebea3d _output/bin/emissary/linux-amd64/busyambassador -1c25718677398f05c354baca27affec10b2ae5e310846dc32bd1972254e68f45 _output/bin/emissary/linux-amd64/capabilities_wrapper -bc9be46ccbc2ebe79c1040147d655642495775503620794234ab85a896387b7c _output/bin/emissary/linux-amd64/example-envoy-metrics-sink -1bf1fdaccae1e3255e1ec16ec779870a02238682dc4f55a6ea9087a1cf0dd409 _output/bin/emissary/linux-amd64/k8sregistryctl -11ed84b44f6f5b82d597d5c4e3e791a992258011b29dccc4e52de4c4b89265d1 _output/bin/emissary/linux-amd64/kat-client -1b6f612e694f21c60c61d3607f81a89cf02288ba988c66db404d66d0b565ba00 _output/bin/emissary/linux-amd64/kat-server -5abb84c18f9280243dba08fc00d6cf04b475c1a477e9cd9ca72fc2f7fc39d9fb _output/bin/emissary/linux-arm64/busyambassador -f7b722708763147e1b807b9d25eb5d4d89cb99a80823519ed85308d6e0e36270 _output/bin/emissary/linux-arm64/capabilities_wrapper -2d37f6af7c5a6ad1a1eed92db91a5da0b0a0f4ab2128bf54b311d59efc913911 _output/bin/emissary/linux-arm64/example-envoy-metrics-sink -864afa5ca4f3911d02595b6275cf141c5ff97b57cce39e92d79a519d53be1493 _output/bin/emissary/linux-arm64/k8sregistryctl -475e83c0fa9516b0aeb56ec69e3a509b7deb7b9b1c4f7d825e912c6c5ebf97ec _output/bin/emissary/linux-arm64/kat-client -f6e29cd36ebdf639d44f7ab127141bd73a09120cadd41f50aeaa821b03b5fa13 _output/bin/emissary/linux-arm64/kat-server +98bf462d9317d0c16f4629145918ac498bff5af7229d7f6761ce0ce5642d6095 _output/bin/emissary/linux-amd64/busyambassador +b63c5ce6fd3f2249d4eb15166e09b575aa8b12310e0f4648b4dd231f925b7045 _output/bin/emissary/linux-amd64/capabilities_wrapper +c97931f912acd952650583d71879a79ca08e7d4ce7c619d71de5e85235b14ced _output/bin/emissary/linux-amd64/example-envoy-metrics-sink +93f5f76a7988355a63464ed44a1e28f2a95430a03e65249e72d9f9e6b5711ed7 _output/bin/emissary/linux-amd64/k8sregistryctl +2dc9134ad3dc0880dd3d5d77983fd7d20d239a0127339e769af719c387d44289 _output/bin/emissary/linux-amd64/kat-client +aad3cced36b5e95f4b2c9863537c5453aaf5bb90b6be17ac1ca68bef7b9f69e9 _output/bin/emissary/linux-amd64/kat-server +57f99f6832504cc057b076e855f641c995f9224ddd7d3e69138b669f3ae05d8b _output/bin/emissary/linux-arm64/busyambassador +bd4dcefdde5e7a767e201355d5c30c58ac49578a0f4362a4e109908afff6ddb8 _output/bin/emissary/linux-arm64/capabilities_wrapper +7d14545ceada596b20995b5b81db5a086b3deda5e5f01ff8404f4967776f30ca _output/bin/emissary/linux-arm64/example-envoy-metrics-sink +a4f1c4bfc9da1c2ced539f4922c4a2e9caaea8673f0dfd36ae81204154a933a3 _output/bin/emissary/linux-arm64/k8sregistryctl +03f4b1cb973b0cd62d69927a9bc6aa5a921120d02923885109fd41868c1d37d5 _output/bin/emissary/linux-arm64/kat-client +d1017d65e3b0d806093912f4c34b20413363951a9f663e29a357c5da8b68d5d4 _output/bin/emissary/linux-arm64/kat-server diff --git a/projects/emissary-ingress/emissary/GIT_TAG b/projects/emissary-ingress/emissary/GIT_TAG index 130165bc0a..32f8572eaf 100644 --- a/projects/emissary-ingress/emissary/GIT_TAG +++ b/projects/emissary-ingress/emissary/GIT_TAG @@ -1 +1 @@ -v3.6.0 +v3.8.1 diff --git a/projects/emissary-ingress/emissary/GOLANG_VERSION b/projects/emissary-ingress/emissary/GOLANG_VERSION index b48f322609..5fb5a6b4f5 100644 --- a/projects/emissary-ingress/emissary/GOLANG_VERSION +++ b/projects/emissary-ingress/emissary/GOLANG_VERSION @@ -1 +1 @@ -1.17 +1.20 diff --git a/projects/emissary-ingress/emissary/patches/0001-patching_helm_charts_packages.patch b/projects/emissary-ingress/emissary/patches/0001-patching_helm_charts_packages.patch index b8bb54376a..ad7937162f 100644 --- a/projects/emissary-ingress/emissary/patches/0001-patching_helm_charts_packages.patch +++ b/projects/emissary-ingress/emissary/patches/0001-patching_helm_charts_packages.patch @@ -1,9 +1,9 @@ -From 1d07dfb1dbdfc9df153c84e185758df4c03b7d49 Mon Sep 17 00:00:00 2001 -From: jonahjon -Date: Tue, 27 Jun 2023 11:18:23 -0500 +From 2ab92eec6d5d986d0c921b3721801955a686d4a6 Mon Sep 17 00:00:00 2001 +From: Vivek Koppuru +Date: Tue, 10 Oct 2023 17:38:45 -0700 Subject: [PATCH] patching_helm_charts_packages -Signed-off-by: jonahjon +Signed-off-by: vivek-koppuru --- Makefile | 12 +- build-aux/prelude_go.mk | 2 +- @@ -88,7 +88,7 @@ Signed-off-by: jonahjon rename charts/emissary-ingress/{values.yaml.in => values.yaml} (89%) diff --git a/Makefile b/Makefile -index ba986e954..b0daa056a 100644 +index 18b45ca1e..87e0153c0 100644 --- a/Makefile +++ b/Makefile @@ -19,12 +19,12 @@ _go-version/deps = docker/base-python/Dockerfile @@ -6245,7 +6245,7 @@ index 77f628459..6b32df2e8 100644 {{- include "ambassador.labels" . | nindent 4 }} diff --git a/charts/emissary-ingress/templates/ambassador-agent.yaml b/charts/emissary-ingress/templates/ambassador-agent.yaml deleted file mode 100644 -index 15e1ad4c1..000000000 +index 1eb4dc96c..000000000 --- a/charts/emissary-ingress/templates/ambassador-agent.yaml +++ /dev/null @@ -1,284 +0,0 @@ @@ -6298,7 +6298,7 @@ index 15e1ad4c1..000000000 - verbs: [ "get", "list", "watch" ] -- apiGroups: [""] - resources: [ "secrets"] -- verbs: [ "get", "create", "delete", "patch", "watch"] +- verbs: [ "get", "list", "watch", "create", "delete", "patch" ] ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding @@ -6569,7 +6569,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 6571eef94..e6d6f75d1 100644 +index 828da4ef3..95a4be1bb 100644 --- a/charts/emissary-ingress/templates/deployment.yaml +++ b/charts/emissary-ingress/templates/deployment.yaml @@ -3,7 +3,7 @@ apiVersion: v1 @@ -6698,7 +6698,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 b177db0d7..cdcf282ca 100644 +index 306cae99b..5521b7a4b 100644 --- a/charts/emissary-ingress/templates/rbac.yaml +++ b/charts/emissary-ingress/templates/rbac.yaml @@ -35,7 +35,7 @@ roleRef: @@ -6842,7 +6842,7 @@ diff --git a/charts/emissary-ingress/values.yaml.in b/charts/emissary-ingress/va similarity index 89% rename from charts/emissary-ingress/values.yaml.in rename to charts/emissary-ingress/values.yaml -index 3b7ed1b6b..94e66a04b 100644 +index 2a9bfc491..94e66a04b 100644 --- a/charts/emissary-ingress/values.yaml.in +++ b/charts/emissary-ingress/values.yaml @@ -2,11 +2,11 @@ @@ -6907,7 +6907,7 @@ index 3b7ed1b6b..94e66a04b 100644 - createArgoRBAC: true - image: - # Leave blank to use image.repository and image.tag -- tag: 1.0.3 +- tag: 1.0.14 - repository: docker.io/ambassador/ambassador-agent - pullPolicy: IfNotPresent - @@ -6928,5 +6928,5 @@ index 3b7ed1b6b..94e66a04b 100644 # configure docker to pull from private registry -- -2.40.1 +2.39.3 (Apple Git-145)