Skip to content
This repository was archived by the owner on Jun 24, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions pkg/apis/serving/v1alpha1/knativeserving_lifecycle.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,6 @@ func (ks *KnativeServing) GroupVersionKind() schema.GroupVersionKind {
return SchemeGroupVersion.WithKind(Kind)
}

// GetConditions implements apis.ConditionsAccessor
func (is *KnativeServingStatus) GetConditions() apis.Conditions {
return is.Conditions
}

// SetConditions implements apis.ConditionsAccessor
func (is *KnativeServingStatus) SetConditions(c apis.Conditions) {
is.Conditions = c
}

func (is *KnativeServingStatus) IsReady() bool {
return conditions.Manage(is).IsHappy()
}
Expand Down
9 changes: 4 additions & 5 deletions pkg/apis/serving/v1alpha1/knativeserving_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"
)

// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
Expand Down Expand Up @@ -123,6 +124,8 @@ type KnativeServingSpec struct {
// KnativeServingStatus defines the observed state of KnativeServing
// +k8s:openapi-gen=true
type KnativeServingStatus struct {
duckv1.Status `json:",inline"`

// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
// Important: Run "operator-sdk generate k8s" to regenerate code after modifying this file
// Add custom validation using kubebuilder tags:
Expand All @@ -131,14 +134,10 @@ type KnativeServingStatus struct {
// The version of the installed release
// +optional
Version string `json:"version,omitempty"`
// The latest available observations of a resource's current state.
// +optional
// +patchMergeKey=type
// +patchStrategy=merge
Conditions apis.Conditions `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
}

// +genclient
// +genreconciler
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

// KnativeServing is the Schema for the knativeservings API
Expand Down
9 changes: 1 addition & 8 deletions pkg/apis/serving/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading