scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12993 from mikedanese/rtexpapi

Browse Source 
fix roundtrip bug and add expapi to round trip serialization tests
This commit is contained in:
Jerzy Szczepkowski
2015-08-21 10:27:17 +02:00
parent 4292df28dd a6d1b87336
commit b337458ab6
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/serialization_test.go
View File

@@ -32,6 +32,9 @@ import (
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
_ "k8s.io/kubernetes/pkg/expapi"
_ "k8s.io/kubernetes/pkg/expapi/v1"
flag "github.com/spf13/pflag" flag "github.com/spf13/pflag"
) )

4
pkg/expapi/types.go
View File

@@ -98,12 +98,12 @@ type HorizontalPodAutoscalerSpec struct {
// HorizontalPodAutoscalerStatus contains the current status of a horizontal pod autoscaler // HorizontalPodAutoscalerStatus contains the current status of a horizontal pod autoscaler
type HorizontalPodAutoscalerStatus struct { type HorizontalPodAutoscalerStatus struct {
// CurrentReplicas is the number of replicas of pods managed by this autoscaler. // CurrentReplicas is the number of replicas of pods managed by this autoscaler.
CurrentReplicas int `json:"replicas"` CurrentReplicas int `json:"currentReplicas"`
// DesiredReplicas is the desired number of replicas of pods managed by this autoscaler. // DesiredReplicas is the desired number of replicas of pods managed by this autoscaler.
// The number may be different because pod downscaling is someteimes delayed to keep the number // The number may be different because pod downscaling is someteimes delayed to keep the number
// of pods stable. // of pods stable.
DesiredReplicas int `json:"replicas"` DesiredReplicas int `json:"desiredReplicas"`
// CurrentConsumption is the current average consumption of the given resource that the autoscaler will // CurrentConsumption is the current average consumption of the given resource that the autoscaler will
// try to maintain by adjusting the desired number of pods. // try to maintain by adjusting the desired number of pods.

4
pkg/expapi/v1/types.go
View File

@@ -86,10 +86,10 @@ type HorizontalPodAutoscalerSpec struct {
// HorizontalPodAutoscalerStatus contains the current status of a horizontal pod autoscaler // HorizontalPodAutoscalerStatus contains the current status of a horizontal pod autoscaler
type HorizontalPodAutoscalerStatus struct { type HorizontalPodAutoscalerStatus struct {
// CurrentReplicas is the number of replicas of pods managed by this autoscaler. // CurrentReplicas is the number of replicas of pods managed by this autoscaler.
CurrentReplicas int `json:"replicas" description:"number of replicas observed by the autoscaler"` CurrentReplicas int `json:"currentReplicas" description:"number of replicas observed by the autoscaler"`
// DesiredReplicas is the desired number of replicas of pods managed by this autoscaler. // DesiredReplicas is the desired number of replicas of pods managed by this autoscaler.
DesiredReplicas int `json:"replicas" description:"number of desired replicas"` DesiredReplicas int `json:"desiredReplicas" description:"number of desired replicas"`
// CurrentConsumption is the current average consumption of the given resource that the autoscaler will // CurrentConsumption is the current average consumption of the given resource that the autoscaler will
// try to maintain by adjusting the desired number of pods. // try to maintain by adjusting the desired number of pods.