Add next possible schedules and upgrade window metrics

api/v1beta1/upgradeconfig_types.go

@@ -67,6 +67,15 @@ type UpgradeConfigStatus struct {
 	// Also is increased when a job would have been created, but was not created due to the config being suspended.
 	// +optional
 	LastScheduledUpgrade *metav1.Time `json:"lastScheduledUpgrade,omitempty"`
+
+	// NextPossibleSchedules is a list of the next possible schedules for an upgrade.
+	NextPossibleSchedules []NextPossibleSchedule `json:"nextPossibleSchedules"`
+}
+
+// NextPossibleSchedule defines the next possible schedule for an upgrade
+type NextPossibleSchedule struct {
+	// Time is the time of the next possible schedule
+	Time metav1.Time `json:"time"`
 }
 
 //+kubebuilder:object:root=true

api/v1beta1/upgradesuspensionwindow_types.go

@@ -32,6 +32,14 @@ type UpgradeSuspensionWindowSpec struct {
 
 // UpgradeSuspensionWindowStatus defines the observed state of UpgradeSuspensionWindow
 type UpgradeSuspensionWindowStatus struct {
+	// MatchingConfigs are the UpgradeConfigs that are matched by the ConfigSelector.
+	MatchingConfigs []UpgradeSuspensionWindowStatusMatchingObject `json:"matchingConfigs,omitempty"`
+	// MatchingJobs are the UpgradeJobs that are matched by the JobSelector.
+	MatchingJobs []UpgradeSuspensionWindowStatusMatchingObject `json:"matchingJobs,omitempty"`
+}
+
+type UpgradeSuspensionWindowStatusMatchingObject struct {
+	Name string `json:"name"`
 }
 
 //+kubebuilder:object:root=true

config/crd/bases/managedupgrade.appuio.io_upgradeconfigs.yaml

@@ -260,6 +260,23 @@ spec:
                   Also is increased when a job would have been created, but was not created due to the config being suspended.
                 format: date-time
                 type: string
+              nextPossibleSchedules:
+                description: NextPossibleSchedules is a list of the next possible
+                  schedules for an upgrade.
+                items:
+                  description: NextPossibleSchedule defines the next possible schedule
+                    for an upgrade
+                  properties:
+                    time:
+                      description: Time is the time of the next possible schedule
+                      format: date-time
+                      type: string
+                  required:
+                  - time
+                  type: object
+                type: array
+            required:
+            - nextPossibleSchedules
             type: object
         required:
         - spec

config/crd/bases/managedupgrade.appuio.io_upgradesuspensionwindows.yaml

@@ -160,6 +160,29 @@ spec:
           status:
             description: UpgradeSuspensionWindowStatus defines the observed state
               of UpgradeSuspensionWindow
+            properties:
+              matchingConfigs:
+                description: MatchingConfigs are the UpgradeConfigs that are matched
+                  by the ConfigSelector.
+                items:
+                  properties:
+                    name:
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
+              matchingJobs:
+                description: MatchingJobs are the UpgradeJobs that are matched by
+                  the JobSelector.
+                items:
+                  properties:
+                    name:
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
             type: object
         type: object
     served: true

config/rbac/role.yaml

@@ -156,3 +156,5 @@ rules:
   - upgradesuspensionwindows/status
   verbs:
   - get
+  - patch
+  - update