Skip to content

Commit

Permalink
Update emissary from 3.6.0 to 3.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
vivek-koppuru committed Oct 11, 2023
1 parent a8d8e87 commit d0eae5f
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion projects/emissary-ingress/emissary/GIT_TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v3.6.0
v3.8.1
2 changes: 1 addition & 1 deletion projects/emissary-ingress/emissary/GOLANG_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.17
1.20
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
From 1d07dfb1dbdfc9df153c84e185758df4c03b7d49 Mon Sep 17 00:00:00 2001
From: jonahjon <jonahjones094@gmail.com>
Date: Tue, 27 Jun 2023 11:18:23 -0500
From 2ab92eec6d5d986d0c921b3721801955a686d4a6 Mon Sep 17 00:00:00 2001
From: Vivek Koppuru <koppv@amazon.com>
Date: Tue, 10 Oct 2023 17:38:45 -0700
Subject: [PATCH] patching_helm_charts_packages

Signed-off-by: jonahjon <jonahjones094@gmail.com>
Signed-off-by: vivek-koppuru <koppv@amazon.com>
---
Makefile | 12 +-
build-aux/prelude_go.mk | 2 +-
Expand Down Expand Up @@ -88,7 +88,7 @@ Signed-off-by: jonahjon <[email protected]>
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
Expand Down Expand Up @@ -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 @@
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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 @@
Expand Down Expand Up @@ -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
-
Expand All @@ -6928,5 +6928,5 @@ index 3b7ed1b6b..94e66a04b 100644

# configure docker to pull from private registry
--
2.40.1
2.39.3 (Apple Git-145)

0 comments on commit d0eae5f

Please sign in to comment.