Skip to content
This repository has been archived by the owner on Jun 22, 2021. It is now read-only.

Commit

Permalink
Remove explicit cookieSecret and proxy.secretToken for staging
Browse files Browse the repository at this point in the history
With jupyterhub/zero-to-jupyterhub-k8s#1993,
these are no longer required to be explicitly set. We remove
both just for staging hubs - doing so for production
hubs will cause everyone to be logged out (cookieSecret) and
temporarily disconnected (proxy.secretToken) so we aren't
doing that yet
  • Loading branch information
yuvipanda committed May 5, 2021
1 parent ec82dc6 commit 6a929a1
Show file tree
Hide file tree
Showing 30 changed files with 887 additions and 996 deletions.
22 changes: 11 additions & 11 deletions deployments/biology/secrets/prod.yaml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
jupyterhub:
hub:
cookieSecret: ENC[AES256_GCM,data:cLlXByQz2M7tkfqNB4Ox3g/nB97mRHONJE9pM8rogkehTMVWceoaxFYET0rcJQ3sRPAP0qCg3jLvlcbKThW1tQ==,iv:pzjYjWvKRvuLOpfCRez4XaZaFLWtN3cCzmo93ZXSm8k=,tag:tR0PF06y2WHCRKquOhi0rg==,type:str]
cookieSecret: ENC[AES256_GCM,data:WamCTFap5MW8icnR/XBAWtZe3yiOsKTVX0lJaJMXIEte9qjkVa78OSUnwEARiCO/yiFuPttGN/dcIHt9zD1MDQ==,iv:zyQuDdOR1e8vhCOi9MAAgHKp00CtlPpmQdskRDZOrNs=,tag:NxUrSxsJhAXWr6Yq150xLg==,type:str]
config:
GoogleOAuthenticator:
#ENC[AES256_GCM,data:bjRAiA1ovr9+fizRzqkgc65U,iv:sPVd7KSyB3w4vEwx8IfCnaxXIOzTvh9l3+z94PmMjbU=,tag:VMT9NVnG184YLpMDzAaqnw==,type:comment]
client_id: ENC[AES256_GCM,data:qy/C/F4jCQkPUvwfQ1Pxc/4xQLldW8nmJwPkOvLxHPPWCnpT1Kwvjbhnxi2ASS4TH6HFMzlqVYhpdR87xz4/oxJ2+MdU8SAo,iv:uZJB9QnWcyStbaJo0e8C8xvFUeq5XDrG/gDDb4jLMoU=,tag:UYIQ3T1lT6/KN+MStWXhBw==,type:str]
client_secret: ENC[AES256_GCM,data:o8aF2yeqxoNVSECtn3LeCaG8l71yj2Ge,iv:dfyeWeVHkZzc9kkBQe5+6tsoIS0Mx9Diis4t7qrzbVc=,tag:3T8XHfg0N79JDsFOlQW2ug==,type:str]
callback_url: ENC[AES256_GCM,data:2gHdhcRvKAdetw0tXfhdqBUPPVEhe7qpfCtZjlsdTHu9/IkMOC+Zcv5tzgX671KHHrGZRQlZaw==,iv:Jtk+qcZ0yawKv/33erNh2mQ5Yb+7olNR9RkS4d2Uk8g=,tag:Va2fdnSWlCeWgWt913/Exg==,type:str]
login_dervice: ENC[AES256_GCM,data:yPBi44AE+D3A,iv:Ypa8JU6eYKf2dg53Y+6twcb66NZiAB2aCwtxoyyn3Cg=,tag:/cI0k1z0SQf+9c7WwX5cWQ==,type:str]
#ENC[AES256_GCM,data:DWg5uoYNxXFrzxVbAv2TN73A,iv:YOEpIZe/s5CzuvQdY118VfTVXQcR/JOTKCd+HA4ta3Q=,tag:RTWW1YJXCjBbVuGO3j5PdA==,type:comment]
client_id: ENC[AES256_GCM,data:sFezj+Z8C0X2l5B1v97Fn5vke5+D4cdI4Uc2GVaWFkZid26pkeT4UCj0vs/VDy849T1fTMsVgXlvb9XIPkB862NOaZWurqqr,iv:EooO4YD3r/PqHZjUt2uyKOI7L/riLH1RrdmXVT5HdCE=,tag:xA4zZTTylUBdvpjKmYAeGg==,type:str]
client_secret: ENC[AES256_GCM,data:3GHz2k/raoSiewBbn497JycIJcpFRsOE,iv:dzzWwC/L/CvMJMhdW7so9U0OqnNxGH8zyslizHPa5Io=,tag:N4bloYSoP936rmAohz/mbw==,type:str]
callback_url: ENC[AES256_GCM,data:wbRQeCLfgbqtCo2gV3Ect++tRJl/4RLqSyBbMI+pR6TPSjSCBkZRkFYjYUZdS/jrbrzbxOHiZg==,iv:xC1W6p9sOJplPN5pMt308IIsLWzJUFzYWPAe9MiEMc0=,tag:4drlV0XVdx/xPfgQiKUTJQ==,type:str]
login_dervice: ENC[AES256_GCM,data:K57LSCwfLZct,iv:jigWs9UanUlfci3cUEMX7PoB8UGGYP4ONbf0v1kdlnQ=,tag:Tfb76UrtC6GpB9bOq7N26w==,type:str]
proxy:
secretToken: ENC[AES256_GCM,data:BmZ56bDf1T5Z/2vzQiplmnK97UVrXo3+hVwS8pjk+acsr9twjEFHeaEZgzE0guiVb16slVoCQ8xBvun4hAfzsA==,iv:beQHscilvp0vr/yrGv2V3If3R0J2vW5ycnYu1Tft3GY=,tag:XhcGBgnhdpYS+++sctHilQ==,type:str]
secretToken: ENC[AES256_GCM,data:JuTn/iAwc9zUBmHrSw/z098JlxVS5IIVxveneJabLX719UQx5+SE8pUNzwI5ylEFggmrvCbAvaubV7XYmhROkg==,iv:5mwMHK4/8ANfa+leU0tivyCY+DzsByUnK/l+tFms0N4=,tag:ix+d0rxvJFQAgwb4yQp1oQ==,type:str]
sops:
kms: []
gcp_kms:
- resource_id: projects/ucb-datahub-2018/locations/global/keyRings/datahub/cryptoKeys/sops
created_at: "2021-05-05T06:45:07Z"
enc: CiQA67O9AJtOQq3hR4NloMhMWd3PLclvFbYma7B/83ncdIMLaioSSQDmhpq8vWKYVvICUDnV8siSVxDKc33QfnkjbiZI+TC6KplcltT3pJ7W6B8GQoNouM2h/uhYNoCpq9kKLUTFZHWeRibh99UwhIo=
created_at: "2021-05-05T07:25:22Z"
enc: CiQA67O9AIc5SGnwxEtiviEnmkQSDhSinQqS2avBAtM2tero2joSSQDmhpq8g1BALD5n8vH+qioMdFybDXbqt1kN41kzBC9tQRA261uPR1FfXcvyOXTYOacUEtkx9uy9m3Blb+LFCiCpKg84YmTZSgs=
azure_kv: []
hc_vault: []
age: []
lastmodified: "2021-05-05T06:45:08Z"
mac: ENC[AES256_GCM,data:DCwFzjdsAlFlbHPlXIVcVyo7Asbjc2B4XwtiQsg5oeoU40LUqmumtOFo5hZQPGIuj+CPpxlSOy3N6tEBJeAH9xczKF4Y4lHBxajQgiRxUDSUOIxGwy8HDjGJ1FCyNaheWxjBfZ79KJgqgEl8xMlAoexCXu41QEScBegPacn7WBI=,iv:xh247MxevRdGWjfhlSbRk3eVD+KtZyMX4L6gv6yF96E=,tag:S32aFMZfabZWW0+JD9SvrA==,type:str]
lastmodified: "2021-05-05T07:25:24Z"
mac: ENC[AES256_GCM,data:6HF9wqIo2CDoPPZnLu3ztY/65VcIosvqLNsVN4pSTNtOjEcv8vBwXWeZ4vUz+DXiQXf4fm63p3wvB0fg6TCHCqQvfiYemlVv2hqX2WAN2sIJ6HoxCizZEafcGOsqUqmeRKgOHwj+TqUYsjXGHe6TyI4fzFj4VkRiJFzGfpajyJE=,iv:xMNPJ0XKxQh+jqtpGtU5+ldJwG8M+KdUHnhXkjeZTPs=,tag:XoxedPDoqwXXq0pWrRgBtg==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.1
19 changes: 8 additions & 11 deletions deployments/biology/secrets/staging.yaml
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
jupyterhub:
proxy:
secretToken: ENC[AES256_GCM,data:heC66fPDtNI/B0gfJxnw1Yeh6CLqJQcNfLZuqBroaPE1DtGdIETbRjbzZhsymBXnJlTc94BMTDMTLRxdDhQLKQ==,iv:DmspLRVyoEtXsf64JZgAKXPb8ve5qnOyX0iTJIWEgy8=,tag:ilIZ0RMZj3jV6P1n4G9hDQ==,type:str]
hub:
cookieSecret: ENC[AES256_GCM,data:sgG4bzxl4TfOLg+3qUbvEAP/e0kwihrZ/8sgTeuMKRNcir80RPwTXl6Ba51xN8ai0TiKuhTVhb6dxBQ7K9TZqA==,iv:q8P0k+vAGjVs6LLcRLpAfKFc5Txis0AITDZrMH3v+2c=,tag:osd+EVOuiOiam/5aXkVYJg==,type:str]
config:
GoogleOAuthenticator:
client_id: ENC[AES256_GCM,data:HTMHGrG6Giyakh+bgK7DfbyyQ+/N6i6C0edkVIpRdV3z2597hzqLsroRJ8+gqKvN7ckl/3o7wYpgNNgoeaL/4KsphS659pqy,iv:GyPh0npVESmCXLrj75fc3qzPOKKWY/aRMUN+1eW5NKs=,tag:7G8xnirhjc12cU6jDzI1aQ==,type:str]
client_secret: ENC[AES256_GCM,data:TM/O16KfrrcuGx5lsrYg8y27RNg8E00R,iv:qIkq9Ti+CIjUN7/JfIT6ECUdgNbzHZ2JzcS+exE/hlM=,tag:ZU8e9i3+/tVZ7VTTeVVukw==,type:str]
callback_url: ENC[AES256_GCM,data:nn/dbshLGeFdPi3/zSPUNCp32jLHShzaPbgAVDE+2ImhLU0+jlFaE7ZOVIbHmm1v7vCMOdho5Ky+AfDwgdyG,iv:PrgAR8pYNMnVMUwBBUmBd/8LBnSA4T6C+dXdvOvsB3w=,tag:pYOvJjAMyXONEm3Vd5heJg==,type:str]
login_service: ENC[AES256_GCM,data:5kZlwPB4gQX0,iv:0kZFdBEggYSl5zLx8WUpwrv5rmlsUp3C+YSevSrTWME=,tag:/MjuDd3qpXsvuPv1SsJ6Gg==,type:str]
client_id: ENC[AES256_GCM,data:Y00qI1rTr7+trskh9jOTfj44ZDllnDZFFhjzX4kNGWRUv827ArNpoaqL6Ras0pdM+N9whg9OGVyhZ3o8WMIm+EXd1APivRI1,iv:IUsFQMtObt1oKvX3lJHlJR/S27zOV83oqiftol2aXPM=,tag:qNmZesUvRkFWSDxclBKTRA==,type:str]
client_secret: ENC[AES256_GCM,data:wiK5Wrt8n6HmrMLy+MJkxAWyVSi+iBf2,iv:Ad6R1661UCGLqa5++yxVWLYlTaN3GThReIIoOrwm48o=,tag:uInk0lBuHQ+SdrfqeOVG/w==,type:str]
callback_url: ENC[AES256_GCM,data:M5Oh5P4OCp9/qU7wriMIc9yFkd8NtppvFerU5nuSq2rPM6EKAJlkVEBjoqJzhACwjy7W0zh/RGTR2vepwCaf,iv:3hwkB3DaXxMClDzYKCHDu5omFibFbsyJq+isH9yJRpM=,tag:1sSAj2u1Rbe+7bsHI+8xXA==,type:str]
login_service: ENC[AES256_GCM,data:WqZIJExc2K75,iv:wwAtPHD4InfPQQeCLUXC0Hi3hlxkMwBwR4OPNtz77ig=,tag:ZYCWrENit46whZuZWFPTVw==,type:str]
sops:
kms: []
gcp_kms:
- resource_id: projects/ucb-datahub-2018/locations/global/keyRings/datahub/cryptoKeys/sops
created_at: "2021-05-05T06:45:07Z"
enc: CiQA67O9AC/+gWmN92p+TPrlSkfobd6Yub93XxX2duLUTbFK5TwSSQDmhpq8a3GRuccBk7vd5m+jxw+CH1isjGjyhKepsbBRiCUXZ6iRdwNblzcr60HDb3ZpiRLx9in2QkLe5ODeraHuE8XcyxmnnLo=
created_at: "2021-05-05T07:25:22Z"
enc: CiQA67O9AMaXOBsTzrX7Sr8iPcRUl5z/6eJAdC21ZYPfoCI+58gSSQDmhpq8TfYxko4g1D54C5QbntgTgnvE6olStgyFeJ9dbTtoqC5SK4YsWf6G5FMXKvC4PX/axLe1kXUjaRcDAPlP0+hgxAzm1Oc=
azure_kv: []
hc_vault: []
age: []
lastmodified: "2021-05-05T06:45:08Z"
mac: ENC[AES256_GCM,data:dSLYrwrd8I5RWD3yYces/rv0Lu//JMz7KszO4M09b14NdKL792+GXW9twtKKU0PUV0WnMUv7BIUcZoJ54SBEX+fYshiRhFLJHzWrLIkosJx0TXpwzxHh7GGvDwF/haaX42LV5aeX2xulRgisGigmIBLXV5Ha9nWjdOcLW6FQqKA=,iv:NjhHGNG+9XquuZ/yGiPkQ6SuGsO68Eui85nSUjer4Xs=,tag:UC9XKuYo2DIkcXbqVIXMVw==,type:str]
lastmodified: "2021-05-05T07:25:25Z"
mac: ENC[AES256_GCM,data:R92nOMWfSIwfrkZPziOQeE4LvUQD6h4rCIjd/ST+A22W82/MVuScyiCQK/hJLy+7dC4fp5SHrs8XK90djg4akVgbIIybKMk37MR+PW92hbe8UnF/9x3KHaxmzQM04yGFZpxtocrNeTjHe2tdkYLKb1ckeNz8JjFc2jmonInq+sA=,iv:8nX0/sgNzAcwXfYpLZ3ll3qsmwXw6P70qPJtNFwzWCY=,tag:9x5HCHMT+b7pq10+0UKjtQ==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.1
14 changes: 7 additions & 7 deletions deployments/cs194/secrets/prod.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
jupyterhub:
proxy:
secretToken: ENC[AES256_GCM,data:P/mftvfhS3gAXCbRppF29dVlzkVBfiFjKVRI97jgND+1PcMuoocLOKLXcGtSgov04OwH7OHxSyjWAgUEOxopSA==,iv:VN0uqXddDiUP/Wr1qCUFVKRt2LNsiwKn0Yi3xMDB7CM=,tag:jXXNNTlmXjc+e1wlvNiCnw==,type:str]
secretToken: ENC[AES256_GCM,data:OTS1aNHdUkHu5+4V8neRCada8MtixVVJIRTl/7JZI9Kl+vmUnxh9SavWBkn6vIv8xrRrDJSy/GqPTpb6vXwPPg==,iv:5qufB4ReUQ7xsB4V5FSI8WHAGdthYWownyqbHDsTZ28=,tag:FiuvcwGrr/IkzIv/lV9SrQ==,type:str]
hub:
config:
CanvasOAuthenticator:
#ENC[AES256_GCM,data:EyGG2Z6i0IkbZmiUMpzUMvRp9YZAXdY=,iv:oTQ7GCcQsO/bq85XpzCDSO7aN7jYqrSI4caEOJwDOFw=,tag:grjjrrTKBlN+SUucRiiTbg==,type:comment]
client_secret: ENC[AES256_GCM,data:P/GKz07RH4KS+qGG+X2oMJTUnYrf/HCExlLYl7pgAaKZOzTCKJMecp6t0wvyPsr41yX/EIp1D1Um5hyiarr5zA==,iv:+eqmXqGZt09r6tm9vBvtr9Vj3/2NN1vPcljuSgIFv2U=,tag:XoLEqSbMzbi/RAF4jamcNQ==,type:str]
#ENC[AES256_GCM,data:SVoZ6qAjchDyekCvJiybXEDRUl4Sx2I=,iv:4pDkVfVEy/xM6v7NMiyVS4EhIJ4mrPYNZ05lDlnoVuY=,tag:nzmPjDxl8RqhSHIwPpYS5A==,type:comment]
client_secret: ENC[AES256_GCM,data:Gt61/j2oHAGWjdRzwR8+lkz11btc97plJdQUR7o8cghejnlyL86tM+zC80wgQtJotSqzf45shbbKpsGhMcbSUw==,iv:lU32BWVTYU+c/PG47As1Gf2k9+SeoUxOQTz2w2okl2w=,tag:mM+NYEsPZpdhnUsaWcJ+fA==,type:str]
sops:
kms: []
gcp_kms:
- resource_id: projects/ucb-datahub-2018/locations/global/keyRings/datahub/cryptoKeys/sops
created_at: "2021-05-05T06:45:06Z"
enc: CiQA67O9ABBxbcCB/8M06UDvP/2GYPWoYK2jicrWAJ7/V8wrjb0SSQDmhpq8ly40ncQvvSKw+r7upK8722H+SF0j8imhlMNGaiJ08ucIeYjAHuVb7YmumyGHWGcDajf3fpnFjaqFzvMfyKxh1O+wALI=
created_at: "2021-05-05T07:25:22Z"
enc: CiQA67O9AGNQTRyJE9Lb9/hgQRYknJyphVkvy9+ST4eEmG/eZIQSSQDmhpq8571wxOluYqvghL/P2vXrl5ZqH+K27srlXM4QLDdsWUo4OFPUL20sgaHucuraI+2HhDzL1C3CEhtgNaiY7ueJF707fBo=
azure_kv: []
hc_vault: []
age: []
lastmodified: "2021-05-05T06:45:08Z"
mac: ENC[AES256_GCM,data:Hlcq3HUj3A+c5u3LxYaZWdYkp8ITjYTUxYupVXkuBLmpIDFJ6Go3AdNtsCVVGHzrOS+EtLimY2Gac8CoBdd5+3GsvLX6t3T56MzIx1/WQMMkG2o3qOFQjeyIWFhKtd55S4a7nU7oSD6qM3N7huwLVLMeT9GZ6B2rPFmzowgugUE=,iv:Igw1gDlhtWi1hCX6QC1NL+1qShdeyspR6jhAkn8Ve+w=,tag:4R2fEUmewJpFP6GTAPjB4Q==,type:str]
lastmodified: "2021-05-05T07:25:24Z"
mac: ENC[AES256_GCM,data:COnidjadob0d8WoVxahDykH8PCdWypwshx+EcyNdWlrHbqMhDJwBwhbPuRSpcYwq5bsOo3PASFTBpWlH4H/nZs9k11qOkP0vzGJl1IQwdmzjfnnGsafWZu8c3XvDIY/4H5SGpyOedB0tnQPwXjz2JFZwAxMP9drwr8QFQ+cYrNU=,iv:4KABjoEyEu56LqjwxoW1zPdkWml5MEyixGiBFDJRe+0=,tag:lyiDKXk0b58KEKzvaGxA7w==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.1
14 changes: 6 additions & 8 deletions deployments/cs194/secrets/staging.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
jupyterhub:
proxy:
secretToken: ENC[AES256_GCM,data:V/nlSiY5gV/Ght8Q2izMBcz55T72Nzb3F02Q/QIxlctbRMNz3CtL9UvBWlCocz0a+9rz1kZl0UiZV48O7UrfOg==,iv:wh27rk0tUNFKllTnutIbagmLmRrnPH/Ni64XhfLsHxE=,tag:rA06xZGgPzAQ5FMXgXea9w==,type:str]
hub:
config:
CanvasOAuthenticator:
#ENC[AES256_GCM,data:0pb3dNCWhFM1Eiwt2/PnbE1GSjWbzJ8=,iv:vftTmk2jRgnfEzb7l20m4d7KmbmAI9jSluYfj5rKiIs=,tag:ARBwJQxw3MgHVDD5TXsqfA==,type:comment]
client_secret: ENC[AES256_GCM,data:fmk6EIRihi5drS0d9FrIkoQcbWAyK/PPQC0xaQzkgGQ82a9bPs9wDjKl7ZlV55CflGictNL+30SGl0ePs2f2tQ==,iv:fh3tXpEefocJ/Ik5oHAH64kMDr1iJTtmXsONu/T0l2Q=,tag:1aHccvhtVbKaK6w10Q5s4w==,type:str]
#ENC[AES256_GCM,data:Z24qiM3XsHT5WRguzgYPjP0QC7Lvgts=,iv:+H/O8YnCrE5UdkHEHElQ82z1vLFT7ccmpfbYZF9nbss=,tag:gBIa8Gsf/q9W6Kov5xbqlg==,type:comment]
client_secret: ENC[AES256_GCM,data:8NRmopqnWTmjeVXqo1dxWz4HLzyeqbmQuU5NXdJapmekAebKS/TWwd+q2KEwFndmtHNQZsiu3JRDIdBzqICRIw==,iv:ddKeqFPKff/m6RajMHFPGRel9jiS9V/NY3iUUV3k9cA=,tag:wcy0wX3rF4KFcm7PXQhf9A==,type:str]
sops:
kms: []
gcp_kms:
- resource_id: projects/ucb-datahub-2018/locations/global/keyRings/datahub/cryptoKeys/sops
created_at: "2021-05-05T06:45:06Z"
enc: CiQA67O9AJXrH859c/y6VaVmzLzPp5buTkUvYn4tQRy2Sz8NuYUSSQDmhpq8uOjQmlo+RYWXNqATL5x1vcUtwZTZbtTV4B+wXmiJiwNbJFOnSCiunJVS/EbsXzcgScxB3DeIcIHpXMyiMMJMRO7Nsv8=
created_at: "2021-05-05T07:25:22Z"
enc: CiQA67O9AM25kdi76UCLY/JNKZPL913Fo0O2/YyRpFaOF+KWHAASSQDmhpq8BFTX4AHngnjXA5bJVGcvOAiBIwtKk4asoqcOMRioR8hb7t0Ux3+bYxqPnGWy2OdzZzl7H1zGt/XUWhb6xhtxbz1KClQ=
azure_kv: []
hc_vault: []
age: []
lastmodified: "2021-05-05T06:45:08Z"
mac: ENC[AES256_GCM,data:APmlRDqCw/8XO/3nGNjFmWbrsU3Xi28DQhGrIeBLTrpMZct5EzrIspEJDWM99AkRH1PgR/ETGcB/JcMtaGIfM9Vb/oDRi8u8LXedYHJMuGDq0ns67EUISrt7fyMtVhyqRRVwzXVAV5OLJUSsxTk081eX+4e1JlKMcB58v5/iwqI=,iv:ETL7BAHKAhXx/knBPApjD34VYmhn2N9mH5kv9xHCMpo=,tag:gkAAx14tnsvouDIsEmWFaA==,type:str]
lastmodified: "2021-05-05T07:25:26Z"
mac: ENC[AES256_GCM,data:6Q2CY8N9r1Mjz/h+T9Dr9/GCuWGmV7r5nzETRlA8LM2fOhBjIKoCBvsSnXLExiOLczQyA9rccdJIxgbW6F6b7CK6hyORC+4SEZUxf0ao8qht3HlP/l6KoRoOd4oxDdIb5cYEmpxUrzP52OJNrtxoaQrfB1sXnaOHaDQ217Wiajs=,iv:8lWgChSq+RGqSfMzJC6utxhJ6id/scXG5T0z8BSdt3k=,tag:CktEWAbosrzLmntW4VKUww==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.1
Loading

0 comments on commit 6a929a1

Please sign in to comment.