From 80599325feab42bf473925aa9a28a805fc9e1e6e Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Mon, 14 Jun 2021 09:49:16 -0700 Subject: [PATCH 1/3] fix(controller): Performance improvement for Sprig. Fixes #6135 (#6140) --- util/expr/env/env.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/util/expr/env/env.go b/util/expr/env/env.go index 1d8aaee69184..28da2b4fdbde 100644 --- a/util/expr/env/env.go +++ b/util/expr/env/env.go @@ -4,19 +4,25 @@ import ( "encoding/json" "github.com/Masterminds/sprig" + exprpkg "github.com/argoproj/pkg/expr" "github.com/doublerebel/bellows" ) +var sprigFuncMap = sprig.GenericFuncMap() // a singleton for better performance + +func init() { + delete(sprigFuncMap, "env") + delete(sprigFuncMap, "expandenv") +} + func GetFuncMap(m map[string]interface{}) map[string]interface{} { env := bellows.Expand(m) for k, v := range exprpkg.GetExprEnvFunctionMap() { env[k] = v } - delete(env, "env") - delete(env, "expandenv") env["toJson"] = toJson - env["sprig"] = sprig.GenericFuncMap() + env["sprig"] = sprigFuncMap return env } From 0a16a5210f44dcbc81410f69bc3c79d3a933b540 Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Tue, 15 Jun 2021 08:52:35 -0700 Subject: [PATCH 2/3] docs: Fix release-notes.md --- hack/release-notes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/release-notes.md b/hack/release-notes.md index f5dbc8bf2900..747968f7266c 100644 --- a/hack/release-notes.md +++ b/hack/release-notes.md @@ -16,7 +16,7 @@ Available via `curl` ```sh # Download the binary -curl -sLO https://github.com/argoproj/argo/releases/download/${version}/argo-darwin-amd64.gz +curl -sLO https://github.com/argoproj/argo-workflows/releases/download/${version}/argo-darwin-amd64.gz # Unzip gunzip argo-darwin-amd64.gz @@ -37,7 +37,7 @@ Available via `curl` ```sh # Download the binary -curl -sLO https://github.com/argoproj/argo/releases/download/${version}/argo-linux-amd64.gz +curl -sLO https://github.com/argoproj/argo-workflows/releases/download/${version}/argo-linux-amd64.gz # Unzip gunzip argo-linux-amd64.gz From fd6ac088a82002483e74b06e59b1a2792fb77653 Mon Sep 17 00:00:00 2001 From: Caden <32856921+CadenOf@users.noreply.github.com> Date: Wed, 16 Jun 2021 00:17:19 +0800 Subject: [PATCH 3/3] docs: Update Graviti's website link (#6148) --- USERS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/USERS.md b/USERS.md index f1bbf4f5a7ca..89a51974f26f 100644 --- a/USERS.md +++ b/USERS.md @@ -59,7 +59,7 @@ Currently, the following organizations are **officially** using Argo Workflows: 1. [Gladly](https://gladly.com/) 1. [Glovo](https://www.glovoapp.com) 1. [Google](https://www.google.com/intl/en/about/our-company/) -1. [Graviti](https://www.graviti.cn) +1. [Graviti](https://www.graviti.com) 1. [Greenhouse](https://greenhouse.io) 1. [Habx](https://www.habx.com/) 1. [Helio](https://helio.exchange)