Add observedGeneration to status and conditions

Author: adrianmoisey

vertical-pod-autoscaler/charts/vertical-pod-autoscaler/crds/vpa-v1-crd-gen.yaml

@@ -625,6 +625,14 @@ spec:
                         message is a human-readable explanation containing details about
                         the transition
                       type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
                     reason:
                       description: reason is the reason for the condition's last transition.
                       type: string
@@ -640,6 +648,11 @@ spec:
                   - type
                   type: object
                 type: array
+              observedGeneration:
+                description: observedGeneration is the most recent generation observed
+                  by this autoscaler.
+                format: int64
+                type: integer
               recommendation:
                 description: |-
                   The most recently computed amount of resources recommended by the

vertical-pod-autoscaler/deploy/vpa-v1-crd-gen.yaml

@@ -625,6 +625,14 @@ spec:
                         message is a human-readable explanation containing details about
                         the transition
                       type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
                     reason:
                       description: reason is the reason for the condition's last transition.
                       type: string
@@ -640,6 +648,11 @@ spec:
                   - type
                   type: object
                 type: array
+              observedGeneration:
+                description: observedGeneration is the most recent generation observed
+                  by this autoscaler.
+                format: int64
+                type: integer
               recommendation:
                 description: |-
                   The most recently computed amount of resources recommended by the

vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1/types.go

@@ -348,6 +348,10 @@ type VerticalPodAutoscalerStatus struct {
 	// +patchMergeKey=type
 	// +patchStrategy=merge
 	Conditions []VerticalPodAutoscalerCondition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,2,rep,name=conditions"`
+
+	// observedGeneration is the most recent generation observed by this autoscaler.
+	// +optional
+	ObservedGeneration *int64 `json:"observedGeneration,omitempty" protobuf:"varint,3,opt,name=observedGeneration"`
 }
 
 // RecommendedPodResources is the recommendation of resources computed by
@@ -429,6 +433,13 @@ type VerticalPodAutoscalerCondition struct {
 	// the transition
 	// +optional
 	Message string `json:"message,omitempty" protobuf:"bytes,5,opt,name=message"`
+
+	// observedGeneration represents the .metadata.generation that the condition was set based upon.
+	// For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+	// with respect to the current state of the instance.
+	// +optional
+	// +kubebuilder:validation:Minimum=0
+	ObservedGeneration int64 `json:"observedGeneration,omitempty" protobuf:"bytes,6,opt,name=observedGeneration"`
 }
 
 // +genclient

vertical-pod-autoscaler/pkg/recommender/model/cluster.go

@@ -312,6 +312,7 @@ func (cluster *clusterState) AddOrUpdateVpa(apiObject *vpa_types.VerticalPodAuto
 	vpa.SetUpdateMode(apiObject.Spec.UpdatePolicy)
 	vpa.SetResourcePolicy(apiObject.Spec.ResourcePolicy)
 	vpa.SetAPIVersion(apiObject.GetObjectKind().GroupVersionKind().Version)
+	vpa.Generation = apiObject.Generation
 	return nil
 }
 

vertical-pod-autoscaler/pkg/recommender/model/vpa.go

@@ -40,12 +40,14 @@ type vpaConditionsMap map[vpa_types.VerticalPodAutoscalerConditionType]vpa_types
 
 func (conditionsMap *vpaConditionsMap) Set(
 	conditionType vpa_types.VerticalPodAutoscalerConditionType,
+	observedGeneration int64,
 	status bool, reason string, message string) *vpaConditionsMap {
 	oldCondition, alreadyPresent := (*conditionsMap)[conditionType]
 	condition := vpa_types.VerticalPodAutoscalerCondition{
-		Type:    conditionType,
-		Reason:  reason,
-		Message: message,
+		Type:               conditionType,
+		Reason:             reason,
+		Message:            message,
+		ObservedGeneration: observedGeneration,
 	}
 	if status {
 		condition.Status = corev1.ConditionTrue
@@ -93,7 +95,7 @@ func (vpa *Vpa) ConditionActive(conditionType vpa_types.VerticalPodAutoscalerCon
 func (vpa *Vpa) SetCondition(conditionType vpa_types.VerticalPodAutoscalerConditionType, status bool, reason string, message string) {
 	vpa.mutex.Lock()
 	defer vpa.mutex.Unlock()
-	vpa.conditions.Set(conditionType, status, reason, message)
+	vpa.conditions.Set(conditionType, vpa.Generation, status, reason, message)
 }
 
 // DeleteCondition deletes a condition in a thread-safe manner.
@@ -142,14 +144,14 @@ func (vpa *Vpa) updateConditionsLocked(podsMatched bool) {
 	} else {
 		reason = "NoPodsMatched"
 		msg = "No pods match this VPA object"
-		vpa.conditions.Set(vpa_types.NoPodsMatched, true, reason, msg)
+		vpa.conditions.Set(vpa_types.NoPodsMatched, vpa.Generation, true, reason, msg)
 	}
 
 	// Can safely call hasRecommendationLocked() - no deadlock risk
 	if vpa.hasRecommendationLocked() {
-		vpa.conditions.Set(vpa_types.RecommendationProvided, true, "", "")
+		vpa.conditions.Set(vpa_types.RecommendationProvided, vpa.Generation, true, "", "")
 	} else {
-		vpa.conditions.Set(vpa_types.RecommendationProvided, false, reason, msg)
+		vpa.conditions.Set(vpa_types.RecommendationProvided, vpa.Generation, false, reason, msg)
 	}
 }
 
@@ -208,6 +210,9 @@ type Vpa struct {
 
 	// mutex protects concurrent access to conditions and recommendation fields
 	mutex sync.RWMutex
+
+	// Generation is the generation of the VPA object observed by the recommender.
+	Generation int64
 }
 
 // NewVpa returns a new Vpa with a given ID and pod selector. Doesn't set the
@@ -228,6 +233,7 @@ func NewVpa(id VpaID, selector labels.Selector, created time.Time) *Vpa {
 		// to the version requested by the client server side.
 		APIVersion: vpa_types.SchemeGroupVersion.Version,
 		PodCount:   0,
+		Generation: 0,
 	}
 	return vpa
 }
@@ -378,6 +384,7 @@ func (vpa *Vpa) AsStatus() *vpa_types.VerticalPodAutoscalerStatus {
 	if vpa.recommendation != nil {
 		status.Recommendation = vpa.recommendation
 	}
+	status.ObservedGeneration = &vpa.Generation
 	return status
 }