Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
c8690f36
Commit
c8690f36
authored
Aug 15, 2017
by
Solly Ross
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move consumers of autoscaling/v2alpha1 to v2beta1
This commit updates consumers (mainly the HPA controller, but also the kubectl printers) of autoscaling/v2alpha1 to autoscaling/v2beta1.
parent
b0af4024
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
20 additions
and
20 deletions
+20
-20
BUILD
pkg/controller/podautoscaler/BUILD
+2
-2
horizontal.go
pkg/controller/podautoscaler/horizontal.go
+1
-1
horizontal_test.go
pkg/controller/podautoscaler/horizontal_test.go
+1
-1
legacy_horizontal_test.go
pkg/controller/podautoscaler/legacy_horizontal_test.go
+1
-1
BUILD
pkg/controller/podautoscaler/metrics/BUILD
+2
-2
interfaces.go
pkg/controller/podautoscaler/metrics/interfaces.go
+1
-1
legacy_metrics_client.go
...controller/podautoscaler/metrics/legacy_metrics_client.go
+1
-1
rest_metrics_client.go
pkg/controller/podautoscaler/metrics/rest_metrics_client.go
+1
-1
rest_metrics_client_test.go
...troller/podautoscaler/metrics/rest_metrics_client_test.go
+1
-1
replica_calculator.go
pkg/controller/podautoscaler/replica_calculator.go
+1
-1
replica_calculator_test.go
pkg/controller/podautoscaler/replica_calculator_test.go
+1
-1
BUILD
pkg/printers/internalversion/BUILD
+1
-1
printers.go
pkg/printers/internalversion/printers.go
+6
-6
No files found.
pkg/controller/podautoscaler/BUILD
View file @
c8690f36
...
@@ -21,7 +21,7 @@ go_library(
...
@@ -21,7 +21,7 @@ go_library(
"//pkg/controller/podautoscaler/metrics:go_default_library",
"//pkg/controller/podautoscaler/metrics:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/api/autoscaling/v1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2
alph
a1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2
bet
a1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
...
@@ -65,7 +65,7 @@ go_test(
...
@@ -65,7 +65,7 @@ go_test(
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/github.com/stretchr/testify/require:go_default_library",
"//vendor/github.com/stretchr/testify/require:go_default_library",
"//vendor/k8s.io/api/autoscaling/v1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2
alph
a1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2
bet
a1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
...
...
pkg/controller/podautoscaler/horizontal.go
View file @
c8690f36
...
@@ -23,7 +23,7 @@ import (
...
@@ -23,7 +23,7 @@ import (
"github.com/golang/glog"
"github.com/golang/glog"
autoscalingv1
"k8s.io/api/autoscaling/v1"
autoscalingv1
"k8s.io/api/autoscaling/v1"
autoscalingv2
"k8s.io/api/autoscaling/v2
alph
a1"
autoscalingv2
"k8s.io/api/autoscaling/v2
bet
a1"
"k8s.io/api/core/v1"
"k8s.io/api/core/v1"
extensions
"k8s.io/api/extensions/v1beta1"
extensions
"k8s.io/api/extensions/v1beta1"
apiequality
"k8s.io/apimachinery/pkg/api/equality"
apiequality
"k8s.io/apimachinery/pkg/api/equality"
...
...
pkg/controller/podautoscaler/horizontal_test.go
View file @
c8690f36
...
@@ -25,7 +25,7 @@ import (
...
@@ -25,7 +25,7 @@ import (
"time"
"time"
autoscalingv1
"k8s.io/api/autoscaling/v1"
autoscalingv1
"k8s.io/api/autoscaling/v1"
autoscalingv2
"k8s.io/api/autoscaling/v2
alph
a1"
autoscalingv2
"k8s.io/api/autoscaling/v2
bet
a1"
"k8s.io/api/core/v1"
"k8s.io/api/core/v1"
extensions
"k8s.io/api/extensions/v1beta1"
extensions
"k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/api/resource"
...
...
pkg/controller/podautoscaler/legacy_horizontal_test.go
View file @
c8690f36
...
@@ -28,7 +28,7 @@ import (
...
@@ -28,7 +28,7 @@ import (
"time"
"time"
autoscalingv1
"k8s.io/api/autoscaling/v1"
autoscalingv1
"k8s.io/api/autoscaling/v1"
autoscalingv2
"k8s.io/api/autoscaling/v2
alph
a1"
autoscalingv2
"k8s.io/api/autoscaling/v2
bet
a1"
"k8s.io/api/core/v1"
"k8s.io/api/core/v1"
extensions
"k8s.io/api/extensions/v1beta1"
extensions
"k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/api/resource"
...
...
pkg/controller/podautoscaler/metrics/BUILD
View file @
c8690f36
...
@@ -16,7 +16,7 @@ go_library(
...
@@ -16,7 +16,7 @@ go_library(
],
],
deps = [
deps = [
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2
alph
a1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2
bet
a1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
...
@@ -42,7 +42,7 @@ go_test(
...
@@ -42,7 +42,7 @@ go_test(
"//pkg/api:go_default_library",
"//pkg/api:go_default_library",
"//pkg/apis/extensions/install:go_default_library",
"//pkg/apis/extensions/install:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2
alph
a1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2
bet
a1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
...
...
pkg/controller/podautoscaler/metrics/interfaces.go
View file @
c8690f36
...
@@ -19,7 +19,7 @@ package metrics
...
@@ -19,7 +19,7 @@ package metrics
import
(
import
(
"time"
"time"
autoscaling
"k8s.io/api/autoscaling/v2
alph
a1"
autoscaling
"k8s.io/api/autoscaling/v2
bet
a1"
"k8s.io/api/core/v1"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/labels"
)
)
...
...
pkg/controller/podautoscaler/metrics/legacy_metrics_client.go
View file @
c8690f36
...
@@ -26,7 +26,7 @@ import (
...
@@ -26,7 +26,7 @@ import (
heapster
"k8s.io/heapster/metrics/api/v1/types"
heapster
"k8s.io/heapster/metrics/api/v1/types"
metricsapi
"k8s.io/metrics/pkg/apis/metrics/v1alpha1"
metricsapi
"k8s.io/metrics/pkg/apis/metrics/v1alpha1"
autoscaling
"k8s.io/api/autoscaling/v2
alph
a1"
autoscaling
"k8s.io/api/autoscaling/v2
bet
a1"
"k8s.io/api/core/v1"
"k8s.io/api/core/v1"
clientgov1
"k8s.io/api/core/v1"
clientgov1
"k8s.io/api/core/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
...
...
pkg/controller/podautoscaler/metrics/rest_metrics_client.go
View file @
c8690f36
...
@@ -22,7 +22,7 @@ import (
...
@@ -22,7 +22,7 @@ import (
"github.com/golang/glog"
"github.com/golang/glog"
autoscaling
"k8s.io/api/autoscaling/v2
alph
a1"
autoscaling
"k8s.io/api/autoscaling/v2
bet
a1"
"k8s.io/api/core/v1"
"k8s.io/api/core/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/labels"
...
...
pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go
View file @
c8690f36
...
@@ -21,7 +21,7 @@ import (
...
@@ -21,7 +21,7 @@ import (
"testing"
"testing"
"time"
"time"
autoscalingapi
"k8s.io/api/autoscaling/v2
alph
a1"
autoscalingapi
"k8s.io/api/autoscaling/v2
bet
a1"
"k8s.io/api/core/v1"
"k8s.io/api/core/v1"
kv1
"k8s.io/api/core/v1"
kv1
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/api/resource"
...
...
pkg/controller/podautoscaler/replica_calculator.go
View file @
c8690f36
...
@@ -21,7 +21,7 @@ import (
...
@@ -21,7 +21,7 @@ import (
"math"
"math"
"time"
"time"
autoscaling
"k8s.io/api/autoscaling/v2
alph
a1"
autoscaling
"k8s.io/api/autoscaling/v2
bet
a1"
"k8s.io/api/core/v1"
"k8s.io/api/core/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/labels"
...
...
pkg/controller/podautoscaler/replica_calculator_test.go
View file @
c8690f36
...
@@ -22,7 +22,7 @@ import (
...
@@ -22,7 +22,7 @@ import (
"testing"
"testing"
"time"
"time"
autoscalingv2
"k8s.io/api/autoscaling/v2
alph
a1"
autoscalingv2
"k8s.io/api/autoscaling/v2
bet
a1"
"k8s.io/api/core/v1"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/api/resource"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
...
...
pkg/printers/internalversion/BUILD
View file @
c8690f36
...
@@ -86,7 +86,7 @@ go_library(
...
@@ -86,7 +86,7 @@ go_library(
"//vendor/github.com/fatih/camelcase:go_default_library",
"//vendor/github.com/fatih/camelcase:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/api/apps/v1beta1:go_default_library",
"//vendor/k8s.io/api/apps/v1beta1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2
alph
a1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2
bet
a1:go_default_library",
"//vendor/k8s.io/api/batch/v1:go_default_library",
"//vendor/k8s.io/api/batch/v1:go_default_library",
"//vendor/k8s.io/api/batch/v1beta1:go_default_library",
"//vendor/k8s.io/api/batch/v1beta1:go_default_library",
"//vendor/k8s.io/api/certificates/v1beta1:go_default_library",
"//vendor/k8s.io/api/certificates/v1beta1:go_default_library",
...
...
pkg/printers/internalversion/printers.go
View file @
c8690f36
...
@@ -27,7 +27,7 @@ import (
...
@@ -27,7 +27,7 @@ import (
"time"
"time"
appsv1beta1
"k8s.io/api/apps/v1beta1"
appsv1beta1
"k8s.io/api/apps/v1beta1"
autoscalingv2
alpha1
"k8s.io/api/autoscaling/v2alph
a1"
autoscalingv2
beta1
"k8s.io/api/autoscaling/v2bet
a1"
batchv1
"k8s.io/api/batch/v1"
batchv1
"k8s.io/api/batch/v1"
batchv1beta1
"k8s.io/api/batch/v1beta1"
batchv1beta1
"k8s.io/api/batch/v1beta1"
certificatesv1beta1
"k8s.io/api/certificates/v1beta1"
certificatesv1beta1
"k8s.io/api/certificates/v1beta1"
...
@@ -329,11 +329,11 @@ func AddHandlers(h printers.PrintHandler) {
...
@@ -329,11 +329,11 @@ func AddHandlers(h printers.PrintHandler) {
horizontalPodAutoscalerColumnDefinitions
:=
[]
metav1alpha1
.
TableColumnDefinition
{
horizontalPodAutoscalerColumnDefinitions
:=
[]
metav1alpha1
.
TableColumnDefinition
{
{
Name
:
"Name"
,
Type
:
"string"
,
Format
:
"name"
,
Description
:
metav1
.
ObjectMeta
{}
.
SwaggerDoc
()[
"name"
]},
{
Name
:
"Name"
,
Type
:
"string"
,
Format
:
"name"
,
Description
:
metav1
.
ObjectMeta
{}
.
SwaggerDoc
()[
"name"
]},
{
Name
:
"Reference"
,
Type
:
"string"
,
Description
:
autoscalingv2
alph
a1
.
HorizontalPodAutoscalerSpec
{}
.
SwaggerDoc
()[
"scaleTargetRef"
]},
{
Name
:
"Reference"
,
Type
:
"string"
,
Description
:
autoscalingv2
bet
a1
.
HorizontalPodAutoscalerSpec
{}
.
SwaggerDoc
()[
"scaleTargetRef"
]},
{
Name
:
"Targets"
,
Type
:
"string"
,
Description
:
autoscalingv2
alph
a1
.
HorizontalPodAutoscalerSpec
{}
.
SwaggerDoc
()[
"metrics"
]},
{
Name
:
"Targets"
,
Type
:
"string"
,
Description
:
autoscalingv2
bet
a1
.
HorizontalPodAutoscalerSpec
{}
.
SwaggerDoc
()[
"metrics"
]},
{
Name
:
"MinPods"
,
Type
:
"string"
,
Description
:
autoscalingv2
alph
a1
.
HorizontalPodAutoscalerSpec
{}
.
SwaggerDoc
()[
"minReplicas"
]},
{
Name
:
"MinPods"
,
Type
:
"string"
,
Description
:
autoscalingv2
bet
a1
.
HorizontalPodAutoscalerSpec
{}
.
SwaggerDoc
()[
"minReplicas"
]},
{
Name
:
"MaxPods"
,
Type
:
"string"
,
Description
:
autoscalingv2
alph
a1
.
HorizontalPodAutoscalerSpec
{}
.
SwaggerDoc
()[
"maxReplicas"
]},
{
Name
:
"MaxPods"
,
Type
:
"string"
,
Description
:
autoscalingv2
bet
a1
.
HorizontalPodAutoscalerSpec
{}
.
SwaggerDoc
()[
"maxReplicas"
]},
{
Name
:
"Replicas"
,
Type
:
"string"
,
Description
:
autoscalingv2
alph
a1
.
HorizontalPodAutoscalerStatus
{}
.
SwaggerDoc
()[
"currentReplicas"
]},
{
Name
:
"Replicas"
,
Type
:
"string"
,
Description
:
autoscalingv2
bet
a1
.
HorizontalPodAutoscalerStatus
{}
.
SwaggerDoc
()[
"currentReplicas"
]},
{
Name
:
"Age"
,
Type
:
"string"
,
Description
:
metav1
.
ObjectMeta
{}
.
SwaggerDoc
()[
"creationTimestamp"
]},
{
Name
:
"Age"
,
Type
:
"string"
,
Description
:
metav1
.
ObjectMeta
{}
.
SwaggerDoc
()[
"creationTimestamp"
]},
}
}
h
.
TableHandler
(
horizontalPodAutoscalerColumnDefinitions
,
printHorizontalPodAutoscaler
)
h
.
TableHandler
(
horizontalPodAutoscalerColumnDefinitions
,
printHorizontalPodAutoscaler
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment