From 88de6b6c81c9caf05a5a188ea7b891882f5ab96a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Tue, 16 Feb 2021 08:11:46 +0100
Subject: [PATCH] remove some occurrences of the old  syntax

---
 app-config.yaml                     |  3 +-
 contrib/chart/backstage/values.yaml | 63 ++++++++++-------------------
 2 files changed, 23 insertions(+), 43 deletions(-)

diff --git a/app-config.yaml b/app-config.yaml
index 9df6540a2c..672ba26cd2 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -167,7 +167,8 @@ catalog:
       #   - target: ldaps://ds.example.net
       #     bind:
       #       dn: uid=ldap-reader-user,ou=people,ou=example,dc=example,dc=net
-      #       secret: { $secret: { env: LDAP_SECRET } }
+      #       secret:
+      #         $env: LDAP_SECRET
       #     users:
       #       dn: ou=people,ou=example,dc=example,dc=net
       #       options:
diff --git a/contrib/chart/backstage/values.yaml b/contrib/chart/backstage/values.yaml
index 261f352f93..7926ebbc0a 100644
--- a/contrib/chart/backstage/values.yaml
+++ b/contrib/chart/backstage/values.yaml
@@ -127,88 +127,67 @@ appConfig:
           appOrigin: 'http://localhost:3000/'
           secure: false
           clientId:
-            $secret:
-              env: AUTH_GOOGLE_CLIENT_ID
+            $env: AUTH_GOOGLE_CLIENT_ID
           clientSecret:
-            $secret:
-              env: AUTH_GOOGLE_CLIENT_SECRET
+            $env: AUTH_GOOGLE_CLIENT_SECRET
       github:
         development:
           appOrigin: 'http://localhost:3000/'
           secure: false
           clientId:
-            $secret:
-              env: AUTH_GITHUB_CLIENT_ID
+            $env: AUTH_GITHUB_CLIENT_ID
           clientSecret:
-            $secret:
-              env: AUTH_GITHUB_CLIENT_SECRET
+            $env: AUTH_GITHUB_CLIENT_SECRET
           enterpriseInstanceUrl:
-            $secret:
-              env: AUTH_GITHUB_ENTERPRISE_INSTANCE_URL
+            $env: AUTH_GITHUB_ENTERPRISE_INSTANCE_URL
       gitlab:
         development:
           appOrigin: 'http://localhost:3000/'
           secure: false
           clientId:
-            $secret:
-              env: AUTH_GITLAB_CLIENT_ID
+            $env: AUTH_GITLAB_CLIENT_ID
           clientSecret:
-            $secret:
-              env: AUTH_GITLAB_CLIENT_SECRET
+            $env: AUTH_GITLAB_CLIENT_SECRET
           audience:
-            $secret:
-              env: GITLAB_BASE_URL
+            $env: GITLAB_BASE_URL
       okta:
         development:
           appOrigin: 'http://localhost:3000/'
           secure: false
           clientId:
-            $secret:
-              env: AUTH_OKTA_CLIENT_ID
+            $env: AUTH_OKTA_CLIENT_ID
           clientSecret:
-            $secret:
-              env: AUTH_OKTA_CLIENT_SECRET
+            $env: AUTH_OKTA_CLIENT_SECRET
           audience:
-            $secret:
-              env: AUTH_OKTA_AUDIENCE
+            $env: AUTH_OKTA_AUDIENCE
       oauth2:
         development:
           appOrigin: 'http://localhost:3000/'
           secure: false
           clientId:
-            $secret:
-              env: AUTH_OAUTH2_CLIENT_ID
+            $env: AUTH_OAUTH2_CLIENT_ID
           clientSecret:
-            $secret:
-              env: AUTH_OAUTH2_CLIENT_SECRET
+            $env: AUTH_OAUTH2_CLIENT_SECRET
           authorizationURL:
-            $secret:
-              env: AUTH_OAUTH2_AUTH_URL
+            $env: AUTH_OAUTH2_AUTH_URL
           tokenURL:
-            $secret:
-              env: AUTH_OAUTH2_TOKEN_URL
+            $env: AUTH_OAUTH2_TOKEN_URL
       auth0:
         development:
           clientId:
-            $secret:
-              env: AUTH_AUTH0_CLIENT_ID
+            $env: AUTH_AUTH0_CLIENT_ID
           clientSecret:
-            $secret:
-              env: AUTH_AUTH0_CLIENT_SECRET
+            $env: AUTH_AUTH0_CLIENT_SECRET
           domain:
-            $secret:
-              env: AUTH_AUTH0_DOMAIN
+            $env: AUTH_AUTH0_DOMAIN
       microsoft:
         development:
           clientId:
-            $secret:
-              env: AUTH_MICROSOFT_CLIENT_ID
+            $env: AUTH_MICROSOFT_CLIENT_ID
           clientSecret:
-            $secret:
-              env: AUTH_MICROSOFT_CLIENT_SECRET
+            $env: AUTH_MICROSOFT_CLIENT_SECRET
           tenantId:
-            $secret:
-              env: AUTH_MICROSOFT_TENANT_ID
+            $env: AUTH_MICROSOFT_TENANT_ID
 
 auth:
   google: