github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #54158 from nikhita/crd-lastTransitionTime

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 49305, 54158). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

apiextensions: fix LastTransitionTime for NamesAccepted condition

Fixes #54148. 

Without this change, `LastTransitionTime` for the NamesAccepted condition for CRDs always showed up as `null`.

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-10-18 16:35:19 -07:00 committed by GitHub
commit 7f26f03b68
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/helpers.go
View File

@ -16,11 +16,18 @@ limitations under the License.
package apiextensions package apiextensions
import (
"time"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
// SetCRDCondition sets the status condition. It either overwrites the existing one or // SetCRDCondition sets the status condition. It either overwrites the existing one or
// creates a new one // creates a new one
func SetCRDCondition(crd *CustomResourceDefinition, newCondition CustomResourceDefinitionCondition) { func SetCRDCondition(crd *CustomResourceDefinition, newCondition CustomResourceDefinitionCondition) {
existingCondition := FindCRDCondition(crd, newCondition.Type) existingCondition := FindCRDCondition(crd, newCondition.Type)
if existingCondition == nil { if existingCondition == nil {
newCondition.LastTransitionTime = metav1.NewTime(time.Now())
crd.Status.Conditions = append(crd.Status.Conditions, newCondition) crd.Status.Conditions = append(crd.Status.Conditions, newCondition)
return return
} }

1
staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status/BUILD
View File

@ -30,7 +30,6 @@ go_library(
"//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion:go_default_library", "//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion:go_default_library", "//vendor/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors: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",
"//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library",

3
staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status/naming_controller.go
View File

@ -25,7 +25,6 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
utilerrors "k8s.io/apimachinery/pkg/util/errors" utilerrors "k8s.io/apimachinery/pkg/util/errors"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@ -196,7 +195,6 @@ func (c *NamingConditionController) calculateNamesAndConditions(in *apiextension
Status: apiextensions.ConditionFalse, Status: apiextensions.ConditionFalse,
Reason: "NotAccepted", Reason: "NotAccepted",
Message: "not all names are accepted", Message: "not all names are accepted",
LastTransitionTime: metav1.NewTime(time.Now()),
} }
if old := apiextensions.FindCRDCondition(in, apiextensions.Established); old != nil { if old := apiextensions.FindCRDCondition(in, apiextensions.Established); old != nil {
establishedCondition = *old establishedCondition = *old
@ -207,7 +205,6 @@ func (c *NamingConditionController) calculateNamesAndConditions(in *apiextension
Status: apiextensions.ConditionTrue, Status: apiextensions.ConditionTrue,
Reason: "InitialNamesAccepted", Reason: "InitialNamesAccepted",
Message: "the initial names have been accepted", Message: "the initial names have been accepted",
LastTransitionTime: metav1.NewTime(time.Now()),
} }
} }