Merge branch 'master' into dependabot/go_modules/google.golang.org/pr…

…otobuf-1.33.0

config/crd/bases/toolchain.dev.openshift.com_usersignups.yaml

@@ -181,6 +181,16 @@ spec:
                   the user immediately after their account is approved. This is used
                   by the proxy when no workspace context is provided.
                 type: string
+              scheduledDeactivationTimestamp:
+                description: ScheduledDeactivationTimestamp is the calculated timestamp
+                  after which the user's account will be deactivated, typically after
+                  the expiry of their trial and based on the term specific by their
+                  UserTier.  This property may be used as a convenience to determine
+                  the amount of time an account has left before deactivation, without
+                  requiring a separate lookup for the UserTier and subsequent calculation.  It
+                  is managed by the Deactivation controller in the host operator.
+                format: date-time
+                type: string
             type: object
         type: object
         x-kubernetes-preserve-unknown-fields: true