Merge pull request #5754 from berkeley-dsep-infra/staging

merging 5753 to prod

deployments/dev/secrets/prod.yaml

@@ -4,7 +4,7 @@ jupyterhub:
             CanvasOAuthenticator:
                 client_id: ENC[AES256_GCM,data:/VedfPLyL+Rj3gciMxQ5H84=,iv:WZsC/06SEfEEeH4/NY+txGypgP/lShrJLc8DVXS7tco=,tag:kdZCzktRscuCYz4nRlkxTA==,type:str]
                 client_secret: ENC[AES256_GCM,data:EqzXDvAIMyGeTnGjUDOg6X6XqSwDmogtz/HXhc2LNYMhoSgg8PSUqvEFNUNG6w59tkRXPerBR6PyOuG31ftYXQ==,iv:D/rf3aWams6O2NcmdjFYxEVV5dQoWv3ubZ1kTN5KMO8=,tag:/LLaEHP/RB17Td0UW1I2bQ==,type:str]
-                oauth_callback_url: ENC[AES256_GCM,data:KJdoG8pSTQGn9xwx7QOvmqmDmgzHLSwNv1rRPh3xJj3RQ/W4rYQGZ2GHe6yu07maFN16Knw=,iv:wWps5n7yL8P8xr6HpM9fD01uaAy+Rh6SaBoZbiQtNxo=,tag:BoTgYOMV7k1BFxB2ILjwBg==,type:str]
+                oauth_callback_url: ENC[AES256_GCM,data:auVkfFZ/6y9scYz06gQTIp3oOitVEo7neSkQMQdD3OovoCzEQkOYNDq4dPGZl/j14aXY,iv:BfXvusdQwPVm3/jjrz+Nd0IpFVFHNgXh9Azf8QaQ0c8=,tag:HftFYWAvHqvd8YxSsJlbEw==,type:str]
 sops:
     kms: []
     gcp_kms:
@@ -14,8 +14,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2023-06-27T22:00:25Z"
-    mac: ENC[AES256_GCM,data:6his+g0+PqOG8qjvQiRJqSo7aZollB9OyWg8osklU77t0DxzyJNzamjm2ByymkJMj54KrPuZe4c+FkgZpV77K8QtOIL91H4ONrgt/JN7Ohhb0f3uacrW8ShmCM3iMUeEH4w6g6qfizDEuArlqc1v/dE93rEhkz0+5sPd4SFCiso=,iv:eXHqYVQw8vHeRoIN7gX2/ZJ2liy8hd5qwtrFEXmOHjQ=,tag:EF0jL1Ak9B7tdb90q0WdgQ==,type:str]
+    lastmodified: "2024-05-21T23:44:32Z"
+    mac: ENC[AES256_GCM,data:2l/eQCPpMy+LtKiZMM7gCo+gAwsKiIwQPzv/5USB6vNU8zLzCRLRyRolGZ2qjY+GzX6qEq1O6MCQrDt0K7dqVjmDZHatvlQfzdp01pXLxId/VzWQB6LoUzf7nU1nx2oWv7eZrx1oqySpU3gWRm541AN8aoTYqqgz6GbQdNsGXYE=,iv:gmPFQbOYG/XWf6XSz6J+ef77v0pKchEkvgmyLUH+E6s=,tag:HAhPlUzHOK6/slKsgMDusw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3

deployments/dev/secrets/staging.yaml

@@ -4,7 +4,7 @@ jupyterhub:
             CanvasOAuthenticator:
                 client_id: ENC[AES256_GCM,data:G0+pIvyOsh+Zj4ZxddKbON4=,iv:iX8jMrXcJvjBi0GKRtuN886bXWFwBfCsaUoH+HRMn6U=,tag:BsyGAveKrd8TvWMuUlw3kw==,type:str]
                 client_secret: ENC[AES256_GCM,data:6mR3zs4jvkVuVwjut56tuW3HIOHcYWRSIJJZiOeC+H82tqgZeuVEe7+/zMxq6J0ba5RMas9npep4svuL+TppcA==,iv:K6/MFusdxnLkrEA5LaXLO8mFm1Xa4U2OmxUBOLqdpJk=,tag:xweE4+/ZCIcXj9CtbFpUSw==,type:str]
-                oauth_callback_url: ENC[AES256_GCM,data:mMk3vZgxwpQK6HoKJiCB2TI3QGLXbwTe2i0zZ9FJiTNPVoo26eysSTuvS26jmDzpDbZ/ijgudEDAAvhfnQ==,iv:e25oY24Qy+G7EysDoaF4bwoMmlddpearrQvetXI2nXw=,tag:qjfCpYCMyQOe/slKBTFXeg==,type:str]
+                oauth_callback_url: ENC[AES256_GCM,data:cJndK25LdBryC5mawf/IjsvU+zWBkHBumYP1n8+H9Tg1TzjpAogjXJBba+l5MjTJNRdEY2r1PuUlMoc=,iv:/AWZocUgQ4hSHfGYMgg5bvDnJffWP9a8ELG4e3V0hpo=,tag:Hc5MNLuEYJn6hk1BmTbnug==,type:str]
 sops:
     kms: []
     gcp_kms:
@@ -14,8 +14,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2023-06-27T22:00:14Z"
-    mac: ENC[AES256_GCM,data:d7kyb0lMBT4B6NITKLTNYcbWOQqERTPPHTIwvkKq8C/euixxEVQXmuzzzffzDz4TZ/rC8iMKDZEhGxOXt0ovbSTkiFSRp9sI3UImla5Q9ePr3qL5ADG0slYvbb+IsgcIb/inqdFYD6xOsOCKxtUhtUSlmcXvLrIVIl6NmDbYG8Q=,iv:5w/8gVVfprKXSVEE3L5HScR6+BCktllhg1mQTxvt5Vc=,tag:4tfgV4O1EYSA20+ecdY0oA==,type:str]
+    lastmodified: "2024-05-21T23:44:18Z"
+    mac: ENC[AES256_GCM,data:u+FmyT6pag8fyOZdxSS1m/Kdb/u0AQQSR2kkWNkgmp+K7i0CtqVcqtkOK4YNGYXdVKSDrbDh6kUbMwF9VaOhS8Y/8PWMVGwaI3wzSYIrUvAYa7om8T4bycRbovoGgaahgA6MPDtvqAtBvGZmB/12HIcEIRYBW14s4uW4VP279M8=,iv:TGiFe8pE7PTQHmRKOqZ/+pYJB6O4OVIYrS923gZ22Wo=,tag:sjlOegcb8n5mOl7YVQ2IhQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3