cheshire
/
hscloud
forked from hswaw/hscloud
1
0
Fork 0
Code Pull Requests Activity

Revert "app/matrix make cas deployment configurable" 

This reverts commit 014c9cd018.

Reason for revert:

When applying app/matrix/matrix.hackerspace.pl.jsonnet:

ERROR Error in deployments matrix.oauth2-cas-proxy: ValidationError(v1.Deployment.spec.template.spec.containers[0].env[4].valueFrom): unknown field "secretkeyref" in io.k8s.api.core.v1.EnvVarSource

Change-Id: I833f8a7d7174632b2edffe2f6a9b3e9bb55eebb9
master
q3k 2020-11-10 21:01:58 +00:00
parent 014c9cd018
commit f164c2d4bd
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/matrix/lib/matrix.libsonnet
View File

@ -54,15 +54,6 @@ local postgres = import "../../../kube/postgres.libsonnet";
cas: {
# whether to enable the CAS proxy (ie. connect to hswaw sso via OAuth)
enable: false,
# generate client ID and secret in with your OAuth2 provider, refer to https://www.oauth.com/oauth2-servers/client-registration/client-id-secret/
oauth2: {
clientID: error "cas.oauth2.clientID must be set",
clientSecret: error "cas.oauth2.clientSecret must be set",
scope: error "cas.oauth2.scope must be set",
authorizeURL: error "cas.oauth2.authorizeURL must be set",
tokenURL: error "cas.oauth2.tokenURL must be set",
userinfoURL: error "cas.oauth2.userinfoURL must be set",
},
},
},
@ -147,12 +138,8 @@ local postgres = import "../../../kube/postgres.libsonnet";
env_: {
BASE_URL: "https://%s" % [cfg.webDomain],
SERVICE_URL: "https://%s" % [cfg.webDomain],
OAUTH2_CLIENT: cfg.cas.oauth2.clientID,
OAUTH2_SECRET: cfg.cas.oauth2.clientSecret,
OAUTH2_SCOPE: cfg.cas.oauth2.scope,
OAUTH2_AUTHORIZE: cfg.cas.oauth2.authorizeURL,
OAUTH2_TOKEN: cfg.cas.oauth2.tokenURL,
OAUTH2_USERINFO: cfg.cas.oauth2.userinfoURL,
OAUTH2_CLIENT: "matrix",
OAUTH2_SECRET: { secretKeyRef: { name: "oauth2-cas-proxy", key: "oauth2_secret" } },
},
},
},

8
app/matrix/matrix.hackerspace.pl.jsonnet
View File

@ -11,14 +11,6 @@ matrix {
serverName: "hackerspace.pl",
cas: {
enable: true,
oauth2: {
clientID: "matrix",
clientSecret: { secretkeyref: { name: "oauth2-cas-proxy", key: "oauth2_secret" } },
scope: "profile:read",
authorizeURL: "https://sso.hackerspace.pl/oauth/authorize",
tokenURL: "https://sso.hackerspace.pl/oauth/token",
userinfoURL: "https://sso.hackerspace.pl/api/1/profile",
},
},
},