Merge pull request #1460 from GeorgianaElena/enable-github-auth-leap

Enable GitHub auth for leap grafana and enable "allow_sign_up" for 2i2c
2i2c-org · Jun 23, 2022 · 8d73d69 · 8d73d69
2 parents d91ac6e + fc8b9b8
commit 8d73d69
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 11 deletions.
diff --git a/config/clusters/2i2c/support.values.yaml b/config/clusters/2i2c/support.values.yaml
@@ -31,7 +31,7 @@ grafana:
       root_url: https://grafana.pilot.2i2c.cloud/
     auth.github:
       enabled: true
-      allow_sign_up: false
+      allow_sign_up: true
       scopes: user:email,read:org
       auth_url: https://github.com/login/oauth/authorize
       token_url: https://github.com/login/oauth/access_token

diff --git a/config/clusters/leap/enc-support.secret.values.yaml b/config/clusters/leap/enc-support.secret.values.yaml
@@ -1,6 +1,11 @@
 prometheusIngressAuthSecret:
     username: ENC[AES256_GCM,data:vJFHpuS+msJqCqbDyLntSlH2uc6hEr5fxCvbBXY/xJA4Lba3CacLR10ELqZ+zA6GsUxsAyuDLQjwIgHzfXu7PQ==,iv:qKFvW2rduXukLinqnu+WYFRENNXGL7K34UeC3PwsEAg=,tag:AG6gAwaPn7Wiksm3vXkrzg==,type:str]
     password: ENC[AES256_GCM,data:I7YGK/Der/R3JvBK2gvnvUgfXacYXniF2spjzIDRGbAr9ilCrky1Vups59VIG4iTIuTbICY4G10O0EhyG+rDRQ==,iv:eFT5ZnzaiqoXmdCHsjw4RaY3ZdqbT8GrU6rd2bcsiLk=,tag:EGNgm1c6ed8tMo2hNNt00A==,type:str]
+grafana:
+    grafana.ini:
+        auth.github:
+            client_id: ENC[AES256_GCM,data:Nxn1V2te3lwn42Gc5aFHWazXBzo=,iv:hLXzAj9gdQ8nsxy1mwUKzATgjxAL6f8dbWIeoPNWoGU=,tag:HV9ShihBwvM04KP2i9xQxw==,type:str]
+            client_secret: ENC[AES256_GCM,data:RNspGnLfxlR2TEHNCYTPWjY2ysFs3euuTKf/+EHo7pfkqAIl/yRlfQ==,iv:FPkFGbjP1qoOS+nDa5JCkSNLrMogHttY8RBiuoZbp+M=,tag:Es68jz2WUPtoFK90CWitUw==,type:str]
 sops:
     kms: []
     gcp_kms:
@@ -10,8 +15,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-05-16T11:18:00Z"
-    mac: ENC[AES256_GCM,data:LW4c7Cb6E/xV6PD2LJPlC8yYvcXGC+2EIu8IsEPzDQsVWPgMXvJXLEyK9WL+3c1Nw8O8bMekTMx8btBH7cQP1rREglFTgqRwHAxNvBAE0y22QG+mZ8n+mRy8r/w6G7rj9VzXf/sGdM4x/xkM0OBgo9ZeVNrRF4G0USpLxSiZZoM=,iv:1uMZBmDBssIw5awlSUPq9zHI5i283PtAGhKj7NAMB00=,tag:iwDaTk9QySUkbHsGOEuTbg==,type:str]
+    lastmodified: "2022-06-23T11:25:22Z"
+    mac: ENC[AES256_GCM,data:km+dfEpnRTkUoc02F0zIUiXh3yYGEFmVc+5rYW66S8J533ZGsaR7GqUOFBXqhzzI9dGniXQ5zFSpNAuAUrVGCgS5ChlwqCqkH/wNeKknxhM54BcjBnyXvdX4e+SUOZYVvJ0xukbqeJdKPwxjeT0D/j9Vguld6bA41g+UZY3azlY=,iv:b/5lUMsbDkksSIutbdusYY13MwwAqsdqkghM5czrrto=,tag:1CYS/vB9FGAwyBRXemuuyw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/config/clusters/leap/support.values.yaml b/config/clusters/leap/support.values.yaml
@@ -5,14 +5,6 @@ nvidiaDevicePlugin:
 prometheusIngressAuthSecret:
   enabled: true
 
-grafana:
-  ingress:
-    hosts:
-      - grafana.leap.2i2c.cloud
-    tls:
-      - secretName: grafana-tls
-        hosts:
-          - grafana.leap.2i2c.cloud
 prometheus:
   server:
     ingress:
@@ -27,3 +19,23 @@ prometheus:
       limits:
         cpu: 2
         memory: 12Gi
+
+grafana:
+  ingress:
+    hosts:
+      - grafana.leap.2i2c.cloud
+    tls:
+      - secretName: grafana-tls
+        hosts:
+          - grafana.leap.2i2c.cloud
+  grafana.ini:
+    server:
+      root_url: https://grafana.leap.2i2c.cloud/
+    auth.github:
+      enabled: true
+      allow_sign_up: true
+      scopes: user:email,read:org
+      auth_url: https://github.com/login/oauth/authorize
+      token_url: https://github.com/login/oauth/access_token
+      api_url: https://api.github.com/user
+      allowed_organizations: 2i2c-org