Merge pull request #13 from foomo/beam-0.1.1

Add org variable to github provider
foomo · Aug 5, 2024 · 0478487 · 0478487
2 parents 08c0e85 + 5a343e9
commit 0478487
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/charts/beam/Chart.yaml b/charts/beam/Chart.yaml
@@ -21,7 +21,7 @@ dependencies:
     version: 2.2.10
     repository: "oci://registry-1.docker.io/bitnamicharts"
     condition: pinniped.enabled
-version: 0.1.0
-appVersion: 0.1.0
+version: 0.1.1
+appVersion: 0.1.1
 
 
diff --git a/charts/beam/README.md b/charts/beam/README.md
@@ -1,6 +1,6 @@
 # beam
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.1](https://img.shields.io/badge/AppVersion-0.1.1-informational?style=flat-square)
 
 Secure infrastructure access
 
@@ -18,15 +18,16 @@ pinniped:
   supervisor:
     enabled: true
     githubProviders:
-      your-org:
+      provider-name:
+        organization: <YOUR_GITHUB_ORG>
         clientId: <GITHUB_APP_CLIENT_ID>
         clientSecret: <GITHUB_APP_CLIENT_SECRET>
     federationDomains:
-      your-org:
+      domain-name:
         issuer: https://beam.your-domain.com/issuer-path
         tlsSecretName: <TLS_SECRET_NAME>
         identityProviders:
-          your-org:
+          provider-name:
             teams:
               - organization/your-dev-team
               - organization/your-devops-team
@@ -77,7 +78,7 @@ pinniped:
         role: cluster-admin
         team: organization/your-devops-team
     jwtAuths:
-      your-org:
+      domain-name:
         issuer: https://beam.your-domain.com/issuer-path
         audience: arbitrary-but-unique-audience
 ```

diff --git a/charts/beam/README.md.gotmpl b/charts/beam/README.md.gotmpl
@@ -19,15 +19,16 @@ pinniped:
   supervisor:
     enabled: true
     githubProviders:
-      your-org:
+      provider-name:
+        organization: <YOUR_GITHUB_ORG>
         clientId: <GITHUB_APP_CLIENT_ID>
         clientSecret: <GITHUB_APP_CLIENT_SECRET>
     federationDomains:
-      your-org:
+      domain-name:
         issuer: https://beam.your-domain.com/issuer-path
         tlsSecretName: <TLS_SECRET_NAME>
         identityProviders:
-          your-org:
+          provider-name:
             teams:
               - organization/your-dev-team
               - organization/your-devops-team
@@ -79,7 +80,7 @@ pinniped:
         role: cluster-admin
         team: organization/your-devops-team
     jwtAuths:
-      your-org:
+      domain-name:
         issuer: https://beam.your-domain.com/issuer-path
         audience: arbitrary-but-unique-audience
 ```

diff --git a/charts/beam/examples/concierge.yaml b/charts/beam/examples/concierge.yaml
@@ -25,6 +25,6 @@ pinniped:
         role: cluster-admin
         team: organization/your-devops-team
     jwtAuths:
-      your-org:
+      domain-name:
         issuer: https://beam.your-domain.com/issuer-path
         audience: arbitrary-but-unique-audience
diff --git a/charts/beam/examples/supervisor.yaml b/charts/beam/examples/supervisor.yaml
@@ -6,15 +6,15 @@ pinniped:
   supervisor:
     enabled: true
     githubProviders:
-      your-org:
+      provider-name:
         clientId: <GITHUB_APP_CLIENT_ID>
         clientSecret: <GITHUB_APP_CLIENT_SECRET>
     federationDomains:
-      your-org:
+      domain-name:
         issuer: https://beam.your-domain.com/issuer-path
         tlsSecretName: <TLS_SECRET_NAME>
         identityProviders:
-          your-org:
+          provider-name:
             teams:
               - organization/your-dev-team
               - organization/your-devops-team
diff --git a/charts/beam/templates/pinniped-supervisor/github-identity-provider.yaml b/charts/beam/templates/pinniped-supervisor/github-identity-provider.yaml
@@ -15,7 +15,7 @@ spec:
     organizations:
       policy: OnlyUsersFromAllowedOrganizations
       allowed:
-        - {{ $k }}
+        - {{ $v.organization }}
   client:
     secretName: {{ include "beam.pinniped.supervisor.fullname" $ }}-github-{{ $k }}
 {{- end }}