diff --git a/multidimensional-pod-autoscaler/hack/generate-crd-yaml.sh b/multidimensional-pod-autoscaler/hack/generate-crd-yaml.sh index 6bcff2982020..85d213c9f8e3 100755 --- a/multidimensional-pod-autoscaler/hack/generate-crd-yaml.sh +++ b/multidimensional-pod-autoscaler/hack/generate-crd-yaml.sh @@ -45,12 +45,5 @@ grep -v -e 'map keys must be strings, not int' -e 'not all generators ran succes && { echo "Failed to generate CRD YAMLs."; exit 1; } cd ${WORKSPACE} -cat < kustomization.yaml -resources: -- autoscaling.k8s.io_multidimpodautoscalers.yaml -- autoscaling.k8s.io_multidimpodautoscalercheckpoints.yaml -commonAnnotations: - "api-approved.kubernetes.io": "https://github.com/kubernetes/kubernetes/pull/63797" -EOF -echo --- > ${OUTPUT} -kubectl kustomize . >> ${OUTPUT} +cat "${WORKSPACE}/autoscaling.k8s.io_multidimpodautoscalercheckpoints.yaml" > ${OUTPUT} +cat "${WORKSPACE}/autoscaling.k8s.io_multidimpodautoscalers.yaml" >> ${OUTPUT} diff --git a/multidimensional-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1alpha1/types.go b/multidimensional-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1alpha1/types.go index 2306e092e198..6b8bbafaface 100644 --- a/multidimensional-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1alpha1/types.go +++ b/multidimensional-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1alpha1/types.go @@ -33,6 +33,7 @@ import ( // +kubebuilder:printcolumn:name="Mem",type="string",JSONPath=".status.recommendation.containerRecommendations[0].target.memory" // +kubebuilder:printcolumn:name="Provided",type="string",JSONPath=".status.conditions[?(@.type=='RecommendationProvided')].status" // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp" +// +kubebuilder:metadata:annotations="api-approved.kubernetes.io=https://github.com/kubernetes/kubernetes/pull/63797" // MultidimPodAutoscaler is the configuration for a multidimensional pod autoscaler, // which automatically manages pod resources and number of replicas based on historical and @@ -220,6 +221,7 @@ type MultidimPodAutoscalerCondition struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:storageversion // +kubebuilder:resource:shortName=mpacheckpoint +// +kubebuilder:metadata:annotations="api-approved.kubernetes.io=https://github.com/kubernetes/kubernetes/pull/63797" // MultidimPodAutoscalerCheckpoint is the checkpoint of the internal state of VPA that // is used for recovery after recommender's restart.