github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #71785 from sttts/sttts-aggregator-condition-time

Browse Source 
aggregator: fix available condition transition time
This commit is contained in:
Kubernetes Prow Robot
2018-12-07 07:58:19 -08:00
committed by GitHub
parent 1a82272782 7db6f7a89c
commit 16fb54ef7c
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
staging/src/k8s.io/kube-aggregator/pkg/controllers/status/BUILD
View File

@@ -19,6 +19,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",

6
staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller.go
View File

@@ -29,6 +29,7 @@ import (
"k8s.io/apimachinery/pkg/api/equality"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -151,8 +152,9 @@ func (c *AvailableConditionController) sync(key string) error {
apiService := originalAPIService.DeepCopy()
availableCondition := apiregistration.APIServiceCondition{
Type: apiregistration.Available,
Status: apiregistration.ConditionTrue,
Type: apiregistration.Available,
Status: apiregistration.ConditionTrue,
LastTransitionTime: metav1.Now(),
}
// local API services are always considered available

3
staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller_test.go
View File

@@ -228,6 +228,9 @@ func TestSync(t *testing.T) {
if e, a := tc.expectedAvailability.Message, condition.Message; e != a {
t.Errorf("%v expected %v, got %#v", tc.name, e, condition)
}
if condition.LastTransitionTime.IsZero() {
t.Error("expected lastTransitionTime to be non-zero")
}
}
}